From 089563cb2adfdd8f1a8afeea21178a5cd9c9a028 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 5 Dec 2010 15:54:38 +0900
Subject: [PATCH] Updated po templates.

---
 po/aria2.pot | 455 +++++++++++++++++-----------------------
 po/bg.po     | 553 +++++++++++++++++++++++++------------------------
 po/ca.po     | 511 ++++++++++++++++++++++-----------------------
 po/da.po     | 488 ++++++++++++++++++++-----------------------
 po/de.po     | 551 ++++++++++++++++++++++++++-----------------------
 po/el.po     | 493 +++++++++++++++++++++-----------------------
 po/es.po     | 510 ++++++++++++++++++++++-----------------------
 po/fi.po     | 543 ++++++++++++++++++++++++------------------------
 po/fr.po     | 572 ++++++++++++++++++++++++++++-----------------------
 po/he.po     | 497 +++++++++++++++++++++-----------------------
 po/hu.po     | 479 ++++++++++++++++++++----------------------
 po/id.po     | 542 ++++++++++++++++++++++++------------------------
 po/it.po     | 551 +++++++++++++++++++++++++------------------------
 po/ja.po     | 553 +++++++++++++++++++++++++------------------------
 po/ko.po     | 489 ++++++++++++++++++++-----------------------
 po/nl.po     | 478 ++++++++++++++++++++----------------------
 po/nn.po     | 488 ++++++++++++++++++++-----------------------
 po/pl.po     | 477 +++++++++++++++++++-----------------------
 po/pt.po     | 490 +++++++++++++++++++++----------------------
 po/pt_BR.po  | 488 ++++++++++++++++++++-----------------------
 po/ru.po     | 561 ++++++++++++++++++++++++++------------------------
 po/sk.po     | 510 ++++++++++++++++++++++-----------------------
 po/sr.po     | 510 ++++++++++++++++++++++-----------------------
 po/sv.po     | 525 +++++++++++++++++++++++-----------------------
 po/th.po     | 490 ++++++++++++++++++++-----------------------
 po/tr.po     | 529 ++++++++++++++++++++++++-----------------------
 po/uk.po     | 545 +++++++++++++++++++++++++-----------------------
 po/vi.po     | 459 ++++++++++++++++++-----------------------
 po/zh_CN.po  | 539 +++++++++++++++++++++++++-----------------------
 po/zh_TW.po  | 499 +++++++++++++++++++++-----------------------
 30 files changed, 7496 insertions(+), 7879 deletions(-)

diff --git a/po/aria2.pot b/po/aria2.pot
index 61c9be19..1705c4e6 100644
--- a/po/aria2.pot
+++ b/po/aria2.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: aria2 1.10.5\n"
+"Project-Id-Version: aria2 1.10.7\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+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"
@@ -17,30 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr ""
 
@@ -56,56 +56,6 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr ""
-
-#: src/OptionHandlerImpl.h:529
-msgid "Unrecognized format"
-msgstr ""
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr ""
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -125,7 +75,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -316,7 +266,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -324,12 +274,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -405,7 +356,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -413,7 +364,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -426,7 +377,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -473,7 +424,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -516,12 +467,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -531,7 +476,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -541,7 +486,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -550,13 +495,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -571,7 +516,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -583,15 +528,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -601,19 +546,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -623,15 +568,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -644,20 +590,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -665,14 +611,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -686,34 +632,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -729,9 +675,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -739,11 +686,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -756,23 +703,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -784,30 +731,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -816,7 +763,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -827,7 +774,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -840,7 +787,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -870,7 +817,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -879,7 +826,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -889,7 +836,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -897,7 +844,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -908,7 +855,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -917,14 +864,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -936,14 +883,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -951,25 +898,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -979,7 +926,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -987,15 +934,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1005,7 +952,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1020,7 +967,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1033,7 +980,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1044,7 +991,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1060,47 +1007,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1109,7 +1057,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1117,7 +1065,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1125,7 +1073,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1147,18 +1095,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1175,7 +1123,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1187,7 +1135,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1197,18 +1145,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1218,45 +1166,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1266,7 +1214,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1283,7 +1231,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1296,11 +1244,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1311,11 +1259,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1325,7 +1273,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1337,14 +1285,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1361,7 +1309,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1370,21 +1318,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1393,7 +1341,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1402,7 +1350,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1410,19 +1358,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1433,7 +1381,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1446,7 +1394,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1504,26 +1452,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1537,13 +1485,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2040,199 +1988,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 1ca84466..60957572 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2009-08-25 12:32+0000\n"
 "Last-Translator: Plamen Atanasov <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-09-20 09:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Започване на поредица за изключване... Натиснете Ctrl-C отново за спешно "
 "изключване."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Извънредно започване на поредица за изключване..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 ще продължи даунлоуда ако трансферът е рестартиран."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -41,11 +41,11 @@ msgstr ""
 "Ако има някакви грешки, тогава вижте лог файла. Вижте '-l' опцията в "
 "страницата на помощника/наръчника за подробности."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Резултати от даунлоуда:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Легенда за състоянието:"
 
@@ -61,57 +61,6 @@ msgstr "                              Маркери: "
 msgid "                              Possible Values: "
 msgstr "                              Възможни величини: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "трябва да бъде или \"верен\" или \"неверен\"."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "трябва да е между %s и %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "трябва да бъде по-малък или равен на %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "трябва да бъде по-голям или равен на %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "трябва да бъде число."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "трябва да бъде по-малък или равен на %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "трябва да е между %.1f и %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "трябва да бъде по-голям или равен на %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "трябва да бъде един от следните:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "непознат прокси формат"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "непознат прокси формат"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -135,8 +84,9 @@ msgstr ""
 "                             уточнено, логът се записва в stdout."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -144,6 +94,12 @@ msgid ""
 "to\n"
 "                              \"/dev/null\"."
 msgstr ""
+" --bt-require-crypto=true|false Ако true е дадено, aria2 не приема и\n"
+"                              не установява връзка със завещаното "
+"BitTorrent\n"
+"                              ръкостискане. По този начин aria2 винаги "
+"използва Obfuscation\n"
+"                              ръкостискане."
 
 #: src/usage_text.h:50
 #, fuzzy
@@ -426,7 +382,7 @@ msgstr ""
 #: src/usage_text.h:150
 #, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -440,13 +396,15 @@ msgstr ""
 "renaming."
 
 #: src/usage_text.h:154
+#, fuzzy
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 " --allow-piece-length-change=true|false Ако false е дадено, aria2 спира "
 "даунлоуда\n"
@@ -578,8 +536,9 @@ msgstr ""
 "                              даунлоуди."
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -591,8 +550,9 @@ msgstr ""
 "                              на контролните суми са осигурени."
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -614,7 +574,8 @@ msgstr ""
 "даунлоуди."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc Изключва поддръжката на netrc."
 
 #: src/usage_text.h:213
@@ -690,8 +651,9 @@ msgstr ""
 "                              стойност на изтичане се разглежда като 0."
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -766,15 +728,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-" --direct-file-mapping=true|false Директно четене от и записване във всеки "
-"файл\n"
-"                              споменат в .torrent файла."
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -793,7 +746,7 @@ msgstr ""
 "'-' могат\n"
 "                              да се използват заедно."
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -811,7 +764,7 @@ msgstr ""
 "торент, използвайте\n"
 "                              опцията --max-upload-limit."
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -828,7 +781,7 @@ msgstr ""
 "използвайте\n"
 "                              опцията --max-overall-upload-limit."
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -836,7 +789,7 @@ msgstr ""
 " --seed-time=MINUTES Уточнява време за сийдване в минути. Вижте също\n"
 "                              опцията --seed-ratio."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -865,7 +818,7 @@ msgstr ""
 "от\n"
 "                              условията е изпълнено."
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 #, fuzzy
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
@@ -887,17 +840,17 @@ msgstr ""
 "                              уточнени, произволни букви от азбуката ще\n"
 "                              бъдат добавени за да стане дължината 20 байта."
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 " --enable-peer-exchange[=true|false] Включва разширението Peer Exchange."
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr " --enable-dht[=true|false] Включва DHT функционалността."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 #, fuzzy
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
@@ -916,7 +869,7 @@ msgstr ""
 "'-' могат\n"
 "                              да бъдат използвани заедно."
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -927,13 +880,13 @@ msgstr ""
 "DHT\n"
 "                              мрежата."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 #, fuzzy
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr " --dht-file-path=PATH Сменя DHT файловата таблица за марширути с PATH."
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -950,9 +903,11 @@ msgstr ""
 "удовлетворява\n"
 "                              даденото ниво."
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
+#, fuzzy
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
@@ -964,7 +919,7 @@ msgstr ""
 "използва Obfuscation\n"
 "                              ръкостискане."
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -989,7 +944,7 @@ msgstr ""
 "                              Можете да приложите K или M(1K = 1024, 1M = "
 "1024K)."
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
@@ -999,7 +954,7 @@ msgstr ""
 "във всеки\n"
 "                              BitTorrent даунлоуд."
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
@@ -1008,7 +963,7 @@ msgstr ""
 "без\n"
 "                              проверяване на частта на хеша."
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -1020,7 +975,7 @@ msgstr ""
 "                              Вижте също и опцията --bt-request-peer-speed-"
 "limit."
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 #, fuzzy
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
@@ -1028,7 +983,7 @@ msgid ""
 "                              input from stdin when '-' is specified."
 msgstr " -M, --metalink-file=METALINK_FILE Пътят към .metalink файла."
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -1054,20 +1009,20 @@ msgstr ""
 "NUM_SERVERS.\n"
 "                              Вижте също опциите -s и -j."
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION Версията на файла за даунлоуд."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE Езикът на файла за даунлоуд."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr " --metalink-os=OS Операционнта система на файла за даунлоуд."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
@@ -1079,7 +1034,7 @@ msgstr ""
 "определен със\n"
 "                              запетаи."
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
@@ -1089,7 +1044,7 @@ msgstr ""
 "Уточнете 'none',\n"
 "                              ако нямате предпочитан протокол."
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 #, fuzzy
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
@@ -1119,9 +1074,11 @@ msgstr ""
 "горе,\n"
 "                              няма да бъде извършено."
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
+#, fuzzy
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -1136,11 +1093,11 @@ msgstr ""
 "protocol за да\n"
 "                              уточните предпочитанието си на протокол."
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version Отпечатва номера на версията и излиза."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -1153,16 +1110,17 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr " --no-conf Изключва зареждането на файла aria2.conf."
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr " --conf-path=PATH Промяна на пътя до конфигурационния файл към PATH."
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
@@ -1172,7 +1130,7 @@ msgstr ""
 "                              Ако 0 е дадено, тази характеристика ще бъде "
 "изключена."
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -1192,21 +1150,21 @@ msgstr ""
 "9J1\"\n"
 "                              http://хост/файл"
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr " -q, --quiet[=true|false] Прави aria2 тиха(без конзолно извеждане)."
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr " --async-dns[=true|false] Включва несинхронизиран DNS."
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 " --ftp-reuse-connection[=true|false] Многократно използване на връзката в "
 "FTP."
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
@@ -1215,11 +1173,11 @@ msgstr ""
 " --summary-interval=SEC Определя интервал за извеждане на разюмето за "
 "прогреса на даунлоуда."
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr " --log-level=LEVEL Определя нивото на лога към извеждането на данни."
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -1232,7 +1190,7 @@ msgstr ""
 "                              отдалечения HTTP/FTP сървър и ако е наличен,\n"
 "                              се прилага съм локалния файл."
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -1249,7 +1207,7 @@ msgstr ""
 "                              ефект и --timeout опцията се използва вместо "
 "това."
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -1262,7 +1220,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -1292,7 +1250,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -1306,7 +1264,7 @@ msgstr ""
 "записана информация\n"
 "                              използвайки --server-stat-if опцията."
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -1322,7 +1280,7 @@ msgstr ""
 "                              някои URI селектори като 'feedback'.\n"
 "                              Вижте също --uri-selector опцията"
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -1334,7 +1292,7 @@ msgstr ""
 "направен последният\n"
 "                              контакт с тях."
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1352,7 +1310,7 @@ msgstr ""
 "спре\n"
 "                              независимо от стойността."
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1361,14 +1319,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1380,14 +1338,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1395,25 +1353,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1423,7 +1381,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1431,15 +1389,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1449,7 +1407,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1464,7 +1422,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1477,7 +1435,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1488,7 +1446,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1504,29 +1462,39 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
+#, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --ftp-proxy=PROXY Използване на този прокси сървър за FTP.\n"
+"                              Вижте също опцията --all-proxy.\n"
+"                              Това оказва ефект върху всички URL-и."
 
-#: src/usage_text.h:550
-msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
-msgstr ""
-
-#: src/usage_text.h:554
+#: src/usage_text.h:547
 #, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
+msgstr ""
+" --ftp-proxy=PROXY Използване на този прокси сървър за FTP.\n"
+"                              Вижте също опцията --all-proxy.\n"
+"                              Това оказва ефект върху всички URL-и."
+
+#: src/usage_text.h:552
+#, fuzzy
+msgid ""
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1534,21 +1502,25 @@ msgstr ""
 "                              Вижте също опцията --all-proxy.\n"
 "                              Това оказва ефект върху всички URL-и."
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
+#, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --ftp-proxy=PROXY Използване на този прокси сървър за FTP.\n"
+"                              Вижте също опцията --all-proxy.\n"
+"                              Това оказва ефект върху всички URL-и."
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
+#, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1556,8 +1528,18 @@ msgid ""
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --bt-hash-check-seed[=true|false] Ако true е дадено, след проверката на "
+"хеша използвайки\n"
+"                              опцията --check-integrity и файлът е "
+"завършен,\n"
+"                              се продължава да се сийдва файла. Ако искате "
+"да проверите файла\n"
+"                              и да го даунлоуднете само ако е повреден или\n"
+"                              недовършен, определете тази опция на false.\n"
+"                              Тази опция оказва ефект само върху BitTorrent\n"
+"                              даунлоуди."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1565,7 +1547,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1573,7 +1555,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1595,18 +1577,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 #, fuzzy
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
@@ -1634,7 +1616,7 @@ msgstr ""
 "                              Тази опция оказва ефект само върху BitTorrent\n"
 "                              даунлоуди."
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1646,7 +1628,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 #, fuzzy
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
@@ -1663,19 +1645,19 @@ msgstr ""
 "                              някои URI селектори като 'feedback'.\n"
 "                              Вижте също --uri-selector опцията"
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 #, fuzzy
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr " --enable-dht[=true|false] Включва DHT функционалността."
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 #, fuzzy
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
@@ -1693,7 +1675,7 @@ msgstr ""
 "спре\n"
 "                              независимо от стойността."
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 #, fuzzy
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
@@ -1703,41 +1685,41 @@ msgstr ""
 "без\n"
 "                              проверяване на частта на хеша."
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 #, fuzzy
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr " --ftp-passwd=PASSWD Определя FTP парола. Това засяга всички URL-и."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 #, fuzzy
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr " --ftp-passwd=PASSWD Определя FTP парола. Това засяга всички URL-и."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 #, fuzzy
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
@@ -1756,7 +1738,7 @@ msgstr ""
 "                              но малък прогрес от даунлоуда може да бъде "
 "загубен."
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 #, fuzzy
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
@@ -1786,7 +1768,7 @@ msgstr ""
 "отгоре\n"
 "                              не се извършва."
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1799,12 +1781,12 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 #, fuzzy
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr " -t, --timeout=SEC Определя таймаут в секунди."
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 #, fuzzy
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
@@ -1822,12 +1804,12 @@ msgstr ""
 "                              ефект и --timeout опцията се използва вместо "
 "това."
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 #, fuzzy
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr " -t, --timeout=SEC Определя таймаут в секунди."
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1837,7 +1819,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 #, fuzzy
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
@@ -1856,7 +1838,7 @@ msgstr ""
 "                              ефект и --timeout опцията се използва вместо "
 "това."
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 #, fuzzy
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
@@ -1867,7 +1849,7 @@ msgstr ""
 "във всеки\n"
 "                              BitTorrent даунлоуд."
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 #, fuzzy
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
@@ -1897,7 +1879,7 @@ msgstr ""
 "                              Можете да приложите K или M(1K = 1024, 1M = "
 "1024K)."
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 #, fuzzy
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
@@ -1911,17 +1893,17 @@ msgstr ""
 "                              отдалечения HTTP/FTP сървър и ако е наличен,\n"
 "                              се прилага съм локалния файл."
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 #, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1936,7 +1918,7 @@ msgstr ""
 "                              Тази опция оказва ефект само върху BitTorrent\n"
 "                              даунлоуди."
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 #, fuzzy
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
@@ -1950,7 +1932,7 @@ msgstr ""
 "                              се разпределят файловете.\n"
 "                              Изключете опцията ако срещнете някаква грешка"
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 #, fuzzy
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
@@ -1966,7 +1948,7 @@ msgstr ""
 "използва Obfuscation\n"
 "                              ръкостискане."
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1974,7 +1956,7 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 #, fuzzy
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
@@ -1985,13 +1967,13 @@ msgstr ""
 "DHT\n"
 "                              мрежата."
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 #, fuzzy
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr " --dht-file-path=PATH Сменя DHT файловата таблица за марширути с PATH."
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 #, fuzzy
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
@@ -2009,7 +1991,7 @@ msgstr ""
 "                              ефект и --timeout опцията се използва вместо "
 "това."
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -2022,7 +2004,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -2081,12 +2063,12 @@ msgstr "Опции:"
 msgid "Printing options whose name includes '%s'."
 msgstr "Отпечатване на опциите чието име включва '%s'."
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 #, fuzzy
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
@@ -2097,7 +2079,7 @@ msgstr ""
 "всички URL-и трябва\n"
 " да сочат към същия файл или даунлоуда ще е неуспешен."
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 #, fuzzy
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
@@ -2109,7 +2091,7 @@ msgstr ""
 "разглеждани като\n"
 " отделен даунлоуд."
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -2123,7 +2105,7 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 #, fuzzy
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
@@ -2133,7 +2115,7 @@ msgstr ""
 " съдържа \"&\" или някакви знаци които имат специално значение в текстовата "
 "обвивка."
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "Позовете се на страницата в наръчника за повече информация."
 
@@ -2650,123 +2632,108 @@ msgstr "%s не е директория."
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "Неуспех при създаването на директория %s, причина: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "Неуспех при отварянето на сегментния файл %s, причина: %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "Неуспех при записването в сегментния файл %s, причина: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "Неуспех при четенето от сегментния файл %s, причина: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "Неуспех при отварянето на сокет, причина: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "Неуспех при задаването на опция на сокета, причина: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "Неуспех при задаването на сокет като блокиращ, причина: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "Неуспех при задаването на сокет като неблокиращ, причина: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "Неуспех при свързването със сокета, причина: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Неуспех при вслушването в сокета, причина: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "Неуспех при приемането на връзка от пера, причина: %s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "Неуспех при получаването на името на сокета, причина: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "Неуспех при получаването на името на свързаният пер, причина: %s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "Неуспех при анализирането на името на хоста %s, причина: %s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "Неуспех при свързването към хост %s, причина: %s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "Неуспех при проверката дали в сокета може да се записва, причина: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "Неуспех при проверката дали сокета е четлив, причина: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "Неуспех при изпращането на данни, причина: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "Неуспех при приемането на данни, причина: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "Неуспех при надничането в данните, причина: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Неизвестна грешка в сокета %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "Файлът %s съществува, но %s не съществува."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 "Невалиден размер на полезния товар за %s, размер=%d. Трябва да бъде %d."
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "Невалдно ID=%d за %s. Трябва да бъде %d."
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2775,29 +2742,29 @@ msgstr ""
 "Потвърждението на контролната сума на парчето е неуспешно. Индекс на "
 "контролната сума=%d, офсет%s, очакван хеш=%s, настоящ хеш=%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Даунлоудът е преустановен."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "Файлът %s е даунлоудван от друга команда."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "Недостатъчни контролни суми."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "Тракерът върна неуспех причина: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "Засечено е наводнение."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -2806,52 +2773,52 @@ msgstr ""
 "Отпадане на връзката защото никакви заявени/частни съобщениея не бяха "
 "разменени в определен период(%d секунди)."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 "Информационният хеш в торент файла не съответства на този в .aria2 файла."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "Няма такъв файлов запис %s"
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "Твърде ниска Скорост на даунлоуда: %d <= %d(B/s), хост:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "Не е намерен Http запис за заявка."
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "Получено %d състояние, но никаква местна заглавна част не е доставена."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 "Невалиден обхват на заглавната част. Заявка: %s-%s/%s, Отговор: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "Никакъв файл не съответства с Вашето предпочитание."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "Прихванато е изключение"
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 "Максималната дължина на полезния товар е превишена или невалидна. дължина = "
 "%u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2862,6 +2829,58 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr "Намерени са грешки докато протича приързване към порта.\n"
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "трябва да бъде или \"верен\" или \"неверен\"."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "трябва да е между %s и %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "трябва да бъде по-малък или равен на %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "трябва да бъде по-голям или равен на %s."
+
+#~ msgid "must be a number."
+#~ msgstr "трябва да бъде число."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "трябва да бъде по-малък или равен на %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "трябва да е между %.1f и %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "трябва да бъде по-голям или равен на %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "трябва да бъде един от следните:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "непознат прокси формат"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "непознат прокси формат"
+
+#~ msgid ""
+#~ " --direct-file-mapping=true|false Directly read from and write to each "
+#~ "file\n"
+#~ "                              mentioned in .torrent file."
+#~ msgstr ""
+#~ " --direct-file-mapping=true|false Директно четене от и записване във "
+#~ "всеки файл\n"
+#~ "                              споменат в .torrent файла."
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "Неуспех при отварянето на сегментния файл %s, причина: %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "Неуспех при записването в сегментния файл %s, причина: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "Неуспех при четенето от сегментния файл %s, причина: %s"
+
 #~ msgid "CUID#%d - The download for one segment completed successfully."
 #~ msgstr "CUID#%d - Даунлоуда за един сегмент завършен успешно."
 
diff --git a/po/ca.po b/po/ca.po
index 4d8d7330..14fe19e7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2009-11-02 23:14+0900\n"
 "Last-Translator: Jordi Pujol <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-11-01 09:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Està començant la seqüència d'aturada... Premi Ctrl-C un altre cop per fer "
 "una aturada d'emergència."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Començant la seqüència d'aturada d'emergència."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 continuarà la descàrrega si es torna a arrancar la transferència"
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -41,11 +41,11 @@ msgstr ""
 "Si hi han errors, llavors miri el fitxer d'anotacions. Per més informació "
 "vegi l'opció '-l' en les pàgines help/man."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Resultats de la descàrrega:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "llegenda d'estat:"
 
@@ -64,57 +64,6 @@ msgstr ""
 "representa un espai. Entri un espai en la posició equivalent en la "
 "traducció. "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "ha de ser \"true\" o \"false\""
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "ha de estar entre %s i %s"
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "ha de ser més petit o igual que %s"
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "ha de ser més gran o igual que %s"
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "ha de ser un número."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "ha de ser més petit o igual a %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "ha de estar entre %.1f i %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "ha de ser més gran o igual que %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "ha de ser un dels següents:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "format proxy no reconegut"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "format proxy no reconegut"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -143,7 +92,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -347,21 +296,27 @@ msgstr ""
 "                              Desactiveu-lo si trobeu algún error"
 
 #: src/usage_text.h:150
+#, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
 msgstr ""
+" --enable-direct-io[=true|false] Activa E/S directe, minimitza l'ùs de CPU "
+"quan\n"
+"                              es reserva espai per fitxers.\n"
+"                              Desactiveu-lo si trobeu algún error"
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -438,16 +393,22 @@ msgid ""
 msgstr ""
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
 msgstr ""
+" --enable-direct-io[=true|false] Activa E/S directe, minimitza l'ùs de CPU "
+"quan\n"
+"                              es reserva espai per fitxers.\n"
+"                              Desactiveu-lo si trobeu algún error"
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -472,7 +433,8 @@ msgstr ""
 "http."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc               Desactiva el suport netrc."
 
 #: src/usage_text.h:213
@@ -518,8 +480,9 @@ msgid ""
 msgstr ""
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -566,12 +529,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -581,7 +538,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -591,7 +548,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -600,7 +557,7 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -609,7 +566,7 @@ msgstr ""
 "Mirar també\n"
 "                              la opció --seed-ratio."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -624,7 +581,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -636,18 +593,18 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 " --enable-peer-exchange[=true|false] Activa la extensió d'intercanvi entre "
 "iguals."
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr " --enable-dht[=true|false] Activa la funcionalitat DHT."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -657,7 +614,7 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -667,13 +624,13 @@ msgstr ""
 " --dht-entry-point=HOST:PORT Estableix host i port com el punt d'entrada a \n"
 "                                           una xarxa DHT."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 #, fuzzy
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr " --conf-path=PATH Canvia el camí al fitxer de configuració a PATH."
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -683,15 +640,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -704,7 +662,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
@@ -714,13 +672,13 @@ msgstr ""
 "cada\n"
 "                              descàrrega BitTorrent."
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -728,7 +686,7 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 #, fuzzy
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
@@ -736,7 +694,7 @@ msgid ""
 "                              input from stdin when '-' is specified."
 msgstr " -M, --metalink-file=METALINK_FILE  El camí al fitxer .metalink."
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -750,35 +708,35 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   La versió del fitxer a descarregar."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE L'idioma del fitxer a descarregar."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 " --metalink-os=OS            El Sistema Operatiu del fitxer a descarregar."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -794,9 +752,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -804,11 +763,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Escriure el número de versió i sortir."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -821,16 +780,17 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr " --no-conf Desactiva la càrrega del fitxer de configuració aria2.conf."
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr " --conf-path=PATH Canvia el camí al fitxer de configuració a PATH."
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
@@ -840,7 +800,7 @@ msgstr ""
 "                                                                   Si el "
 "valor és 0, aquesta funcionalitat es desactiva."
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -852,19 +812,19 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr " --async-dns[=true|false] Activa DNS asíncrona."
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr " -ftp-reuse-connection[=true|false] Refusa connexió FTP."
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
@@ -874,11 +834,11 @@ msgstr ""
 "descàrrega.\n"
 "                                     Posant 0 no fa el resum."
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr " --log-level=LEVEL Estableix el nivell d'anotació."
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -887,7 +847,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -898,7 +858,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -911,7 +871,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -941,7 +901,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -950,7 +910,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -960,7 +920,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -968,7 +928,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -979,7 +939,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -988,14 +948,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1007,14 +967,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1022,25 +982,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1050,7 +1010,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1058,15 +1018,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1076,7 +1036,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1091,7 +1051,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1104,7 +1064,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1115,7 +1075,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1131,47 +1091,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1180,7 +1141,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1188,7 +1149,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1196,7 +1157,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1218,18 +1179,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1246,7 +1207,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1258,7 +1219,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1268,19 +1229,19 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 #, fuzzy
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr " --enable-dht[=true|false] Activa la funcionalitat DHT."
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1290,48 +1251,48 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 #, fuzzy
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 " --http-passwd=PASSWD         Estableix el mot de pas HTTP. Això afecta a "
 "totes les URLs."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1341,7 +1302,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1358,7 +1319,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1371,11 +1332,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1386,11 +1347,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1400,7 +1361,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1412,7 +1373,7 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 #, fuzzy
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
@@ -1423,7 +1384,7 @@ msgstr ""
 "cada\n"
 "                              descàrrega BitTorrent."
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1440,7 +1401,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 #, fuzzy
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
@@ -1454,21 +1415,21 @@ msgstr ""
 "                              es reserva espai per fitxers.\n"
 "                              Desactiveu-lo si trobeu algún error"
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 #, fuzzy
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
@@ -1482,7 +1443,7 @@ msgstr ""
 "                              es reserva espai per fitxers.\n"
 "                              Desactiveu-lo si trobeu algún error"
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1491,7 +1452,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1499,7 +1460,7 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 #, fuzzy
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
@@ -1509,13 +1470,13 @@ msgstr ""
 " --dht-entry-point=HOST:PORT Estableix host i port com el punt d'entrada a \n"
 "                                           una xarxa DHT."
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 #, fuzzy
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr " --conf-path=PATH Canvia el camí al fitxer de configuració a PATH."
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1526,7 +1487,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1539,7 +1500,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1598,12 +1559,12 @@ msgstr "Opcions:"
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 #, fuzzy
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
@@ -1614,7 +1575,7 @@ msgstr ""
 "les URLs han\n"
 " d'apuntar al mateix fitxer o la descàrrega fallarà."
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 #, fuzzy
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
@@ -1625,7 +1586,7 @@ msgstr ""
 " emmagatzemats en un disc local. Si us plau, tingui en compte que sempre\n"
 " son tractats com descàrregues separades."
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1639,7 +1600,7 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 #, fuzzy
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
@@ -1648,7 +1609,7 @@ msgstr ""
 " Asseguri's de que la URL és entre simples (') o dobles(\") cometes Si\n"
 "conté \"&\" o altres caràcters que tenen un significat especial en el shell."
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "Per més informació consulti la pàgina man."
 
@@ -2163,124 +2124,109 @@ msgstr "%s no és un directori."
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "Fallo al crear el directori %s, causa: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "Fallo al obrir el fitxer de segments %s, causa: %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "Fallo al escriure en el fitxer de segments %s, causa: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "Fallo al llegir del fitxer de segments %s, causa: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "Fallo al obrir un sòcol, causa: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "Fallo al posar una opció del sòcol, causa: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "Fallo al posar un sòcol com bloquejant, causa: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "Fallo al posar un sòcol com no-bloquejant, causa: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "Fallo al connectar un sòcol, causa: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Fallo escoltant un sòcol, causa: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "Fallo al acceptar una connexió d'igual, causa: %s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "Fallo al agafar el nom del sòcol, causa: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "Fallo al agafar el nom d'un igual connectat, causa: %s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "Fallo al resoldre el nom de host %s,causa: %s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "Fallo al connectar al host %s, causa: %s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "Fallo al comprovar si es pot escriure en un sòcol, causa: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "Fallo al comprovar si es pot llegir un sòcol, causa: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "Fallo al enviar dades, causa: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "Fallo al rebre dades, causa: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "Fallo al agafar dades, causa: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Error desconegut de sòcol %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "Fitxer %s existeix, però %s no existeix."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 "La mida de càrrega útil (payload) és incorrecte per %s, mida=%d. Ha de ser "
 "%d."
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "Incorrecte ID=%d per %s. Ha de ser %d."
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2289,29 +2235,29 @@ msgstr ""
 "Ha fallat la validació de la suma de comprovació del tros. "
 "índexSumaComprovació=%d, desviació=%s, HashEsperat=%s, HashActual=%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Descàrrega cancel·lada."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "El fitxer %s està sent descarregat per una altre ordre."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "No hi ha prou sumes de comprovació."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "El Seguidor ha tornat fallida. Raó: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "Detectat vessament."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -2320,48 +2266,48 @@ msgstr ""
 "Lliberem la connexió degut a que no hem intercanviat missatges de peticions "
 "o peces en el període establert (%d segons)."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr "L' infoHash en el fitxer torrent no concorda amb el del fitxer .aria2."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "No hi ha aquesta entrada a l'arxiu %s"
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "Velocitat de descàrrega massa lenta: %d <= %d(B/s), host:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "No hem trobat HttpRequestEntry."
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "Hem rebut estat %d, però no ens dona la capçalera d'ubicació."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr "Capçalera de rang incorrecte. Petició: %s-%s/%s, Resposta: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "No hi ha cap fitxer que concordi amb la vostre preferència."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "Hem trobat una excepció."
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2372,6 +2318,49 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr "Han ocorregut errors mentre agafàvem el port.\n"
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "ha de ser \"true\" o \"false\""
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "ha de estar entre %s i %s"
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "ha de ser més petit o igual que %s"
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "ha de ser més gran o igual que %s"
+
+#~ msgid "must be a number."
+#~ msgstr "ha de ser un número."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "ha de ser més petit o igual a %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "ha de estar entre %.1f i %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "ha de ser més gran o igual que %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "ha de ser un dels següents:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "format proxy no reconegut"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "format proxy no reconegut"
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "Fallo al obrir el fitxer de segments %s, causa: %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "Fallo al escriure en el fitxer de segments %s, causa: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "Fallo al llegir del fitxer de segments %s, causa: %s"
+
 #~ msgid "CUID#%d - The download for one segment completed successfully."
 #~ msgstr ""
 #~ "CUID#%d - La descàrrega per un segment s'ha completat satisfactòriament."
diff --git a/po/da.po b/po/da.po
index f55213f7..a902b30b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2009-07-01 06:37+0000\n"
 "Last-Translator: FuryFire <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-07-18 09:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr "Afslutningsprocedure i gang... Tryk Ctrl-C igen for nød-afslutning."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Nød-afslutningsprocedure i gang..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 vil forsætte filhentningen hvis overførslen bliver genstartet."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -39,11 +39,11 @@ msgstr ""
 "Hvis der er nogle fejl, så kig i logfilen. Se '-l' flaget i hjælp/man siden "
 "for mere information."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Overførsels resultater:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Status forklaring:"
 
@@ -59,57 +59,6 @@ msgstr "                              Mærker: "
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "skal enten være 'true' (sand) eller 'false' (falsk)"
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "skal være i mellem %s og %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "skal være mindre end eller lig med %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "skal være større end eller lig med %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "skal være et tal."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "skal være mindre end eller lig med %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "skal være i mellem %.1f og %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "skal være større end eller lig med %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "skal være en af de følgende:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "ukendt proxy format"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "ukendt proxy format"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -134,7 +83,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -335,7 +284,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -343,12 +292,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -424,7 +374,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -432,7 +382,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -445,7 +395,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -492,7 +442,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -535,12 +485,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -550,7 +494,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -560,7 +504,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -569,13 +513,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -590,7 +534,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -602,15 +546,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -620,19 +564,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -642,15 +586,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -663,20 +608,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -684,14 +629,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -705,34 +650,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -748,9 +693,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -758,11 +704,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -775,23 +721,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -803,30 +749,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -835,7 +781,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -846,7 +792,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -859,7 +805,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -889,7 +835,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -898,7 +844,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -908,7 +854,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -916,7 +862,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -927,7 +873,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -936,14 +882,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -955,14 +901,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -970,25 +916,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -998,7 +944,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1006,15 +952,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1024,7 +970,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1039,7 +985,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1052,7 +998,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1063,7 +1009,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1079,47 +1025,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1128,7 +1075,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1136,7 +1083,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1144,7 +1091,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1166,18 +1113,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1194,7 +1141,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1206,7 +1153,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1216,18 +1163,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1237,47 +1184,47 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 #, fuzzy
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr " --ftp-passwd=PASSWD Sæt FTP password. Dette påvirker all URLs."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 #, fuzzy
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr " --ftp-passwd=PASSWD Sæt FTP password. Dette påvirker all URLs."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1287,7 +1234,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1304,7 +1251,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1317,12 +1264,12 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 #, fuzzy
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr " -t, --timeout=SEC Sæt timeout i sekunder."
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1333,12 +1280,12 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 #, fuzzy
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr " -t, --timeout=SEC Sæt timeout i sekunder."
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1348,7 +1295,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1360,14 +1307,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1384,7 +1331,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1393,21 +1340,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1416,7 +1363,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1425,7 +1372,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1433,19 +1380,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1456,7 +1403,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1469,7 +1416,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1527,26 +1474,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1560,13 +1507,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2063,199 +2010,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2264,6 +2196,40 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "skal enten være 'true' (sand) eller 'false' (falsk)"
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "skal være i mellem %s og %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "skal være mindre end eller lig med %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "skal være større end eller lig med %s."
+
+#~ msgid "must be a number."
+#~ msgstr "skal være et tal."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "skal være mindre end eller lig med %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "skal være i mellem %.1f og %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "skal være større end eller lig med %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "skal være en af de følgende:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "ukendt proxy format"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "ukendt proxy format"
+
 #~ msgid " -o, --out=FILE               The file name of the downloaded file."
 #~ msgstr " -o, --out=FIL                Filnavnet for den hentede fil."
 
diff --git a/po/de.po b/po/de.po
index 5c18f7c8..934f9cce 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-04-14 23:11+0900\n"
 "Last-Translator: Ulrich Zeller <Unknown>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -18,23 +18,23 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-04-14 13:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Abbruch wurde eingeleitet... Strg-C drücken für sofortige Unterbrechung."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Sofortiger Abbruch wurde eingeleitet..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 "aria2 wird den Download wiederaufnehmen, wenn die Übertragung neugestartet "
 "wird."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -42,11 +42,11 @@ msgstr ""
 "Sollten Fehler aufgetreten sein, bitte die Mitschnitt-Datei beachten. Für "
 "Details hierzu siehe die Option \"-l\" in den Hilfe- und man-Seiten."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Download-Ergebnisse:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Statuserläuterung:"
 
@@ -62,57 +62,6 @@ msgstr "                              Schlagwörter: "
 msgid "                              Possible Values: "
 msgstr "                              Mögliche Werte: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "muss entweder \"true\" (wahr) oder \"false\" (falsch) sein"
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "muss zwischen %s und %s sein"
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "muss kleiner oder gleich %s sein"
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "muss größer oder gleich %s sein"
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "muss eine Zahl sein"
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "muss kleiner oder gleich %.1f sein."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "muss zwischen %.1f und %.1f sein."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "muss größer oder gleich %.1f sein."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "muss eines der folgenden sein:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "unbekanntes Proxy-Format"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "unbekanntes Proxy-Format"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -140,8 +89,9 @@ msgstr ""
 "geschrieben."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -398,21 +348,29 @@ msgstr ""
 "                              auftreten."
 
 #: src/usage_text.h:150
+#, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
 msgstr ""
+" --enable-direct-io[=true|false] Verwendet directI/O, was die CPU-Last\n"
+"                              während der Vorbelegung von "
+"Dateispeicherplatz\n"
+"                              verringert. Abschaltbar, falls dabei Fehler\n"
+"                              auftreten."
 
 #: src/usage_text.h:154
+#, fuzzy
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 " --allow-piece-length-change=true|false  Wenn \"false\" angegeben wird, "
 "bricht\n"
@@ -497,16 +455,23 @@ msgid ""
 msgstr ""
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
 msgstr ""
+" --enable-direct-io[=true|false] Verwendet directI/O, was die CPU-Last\n"
+"                              während der Vorbelegung von "
+"Dateispeicherplatz\n"
+"                              verringert. Abschaltbar, falls dabei Fehler\n"
+"                              auftreten."
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -532,7 +497,8 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr " -U, --user-agent=USER_AGENT  Setze User Agent für http(s) Downloads."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc               Deaktiviert netrc Unterstützung."
 
 #: src/usage_text.h:213
@@ -581,8 +547,9 @@ msgid ""
 msgstr ""
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -644,12 +611,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -669,7 +630,7 @@ msgstr ""
 "                              \",\" und \"-\" können gemeinsam benutzt "
 "werden."
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -679,7 +640,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -688,7 +649,7 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -697,7 +658,7 @@ msgstr ""
 "auch\n"
 "                              die Option \"--seed-ratio\"."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -712,7 +673,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -724,18 +685,18 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 " --enable-dht[=true|false]    Nutzung von DHT (VHT, Verteilte Hash-Tabelle)\n"
 "                              einschalten."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 #, fuzzy
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
@@ -755,7 +716,7 @@ msgstr ""
 "                              \",\" und \"-\" können gemeinsam benutzt "
 "werden."
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -766,7 +727,7 @@ msgstr ""
 "DHT-\n"
 "                              Netzwerk betreten wird."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 #, fuzzy
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
@@ -775,7 +736,7 @@ msgstr ""
 "Konfigurations-\n"
 "                              datei auf VERZEICHNIS."
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -785,9 +746,11 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
+#, fuzzy
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
@@ -800,7 +763,7 @@ msgstr ""
 "ver-\n"
 "                              wendet."
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -813,20 +776,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -834,7 +797,7 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
@@ -844,7 +807,7 @@ msgstr ""
 "Liest\n"
 "                              von stdin, wenn '-' angegeben wird."
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -858,35 +821,35 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   Die Version der Datei zum herunterladen."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE Die Sprache der Datei zum herunterladen."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 " --metalink-os=OS             Das Betriebssystem der Datei zum herunterladen."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -902,9 +865,11 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
+#, fuzzy
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -921,11 +886,11 @@ msgstr ""
 "\"\n"
 "                              zur Festlegung des bevorzugten Protokolls."
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Versionsnummer ausgeben und beenden."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -938,11 +903,12 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr " --no-conf                    Laden der aria2.conf-Datei unterbinden."
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
@@ -950,7 +916,7 @@ msgstr ""
 "Konfigurations-\n"
 "                              datei auf VERZEICHNIS."
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
@@ -960,7 +926,7 @@ msgstr ""
 "anhalten.\n"
 "                              Bei 0 ist diese Funktion ausgeschaltet."
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -972,23 +938,23 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 " -q, --quiet[=true|false]     aria2 lautlos schalten (keine "
 "Konsolenausgaben)."
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr " --async-dns[=true|false]     Asynchrone DNS ermöglichen."
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 " --ftp-reuse-connection[=true|false]  Wiederverwenden bereits aufgebauter\n"
 "                              FTP-Verbindungen."
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
@@ -999,11 +965,11 @@ msgstr ""
 "                              Download-Fortschritts aufgefrischt wird.\n"
 "                              Mit 0 wird die Ausgabe unterbunden."
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr " --log-level=LEVEL  Auszugebende Mitschnittfülle festlegen."
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -1012,7 +978,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -1023,7 +989,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -1036,7 +1002,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -1066,7 +1032,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -1075,7 +1041,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -1085,7 +1051,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -1093,7 +1059,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1104,7 +1070,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1113,14 +1079,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1132,14 +1098,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1147,25 +1113,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1175,7 +1141,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1183,15 +1149,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1201,7 +1167,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1216,7 +1182,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1229,7 +1195,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1240,7 +1206,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1256,47 +1222,67 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
+#, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --max-overall-download-limit=GESCHWINDIGKEIT Setze die maximale "
+"Gesamtdownloadgeschwindigkeit in Bytes/s.\n"
+"                              0 bedeutet unbegrenzt.\n"
+"                              Sie können K oder M (1K = 1024, 1M = 1024K) "
+"anhängen.\n"
+"                              Verwenden Sie --max-download-limit , um die "
+"Downloadgeschwindigkeit\n"
+"                              pro einzelnem Download zu begrenzen."
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
+#, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --max-overall-download-limit=GESCHWINDIGKEIT Setze die maximale "
+"Gesamtdownloadgeschwindigkeit in Bytes/s.\n"
+"                              0 bedeutet unbegrenzt.\n"
+"                              Sie können K oder M (1K = 1024, 1M = 1024K) "
+"anhängen.\n"
+"                              Verwenden Sie --max-download-limit , um die "
+"Downloadgeschwindigkeit\n"
+"                              pro einzelnem Download zu begrenzen."
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
+#, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1304,8 +1290,23 @@ msgid ""
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --follow-torrent=true|false|mem  Für Angabe von \"true\" oder \"mem\" wird "
+"nach\n"
+"                              dem Download einer .torrent-Datei oder einer "
+"Da-\n"
+"                              tei, deren Inhaltstyp \"application/x-"
+"bittorrent\"\n"
+"                              ist, diese Datei als Torrent-Steuerdatei "
+"durch-\n"
+"                              sucht und alle gefundenen Download-Positionen\n"
+"                              heruntergeladen.\n"
+"                              Für \"mem\" wird die .torrent-Datei nicht auf\n"
+"                              der Festplatte gespeichert, sondern nur im \n"
+"                              Speicher gehalten.\n"
+"                              Bei \"false\" wird die .torrent-Datei nicht\n"
+"                              durchsucht."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1313,7 +1314,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1321,7 +1322,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1343,18 +1344,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1371,7 +1372,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1383,7 +1384,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1393,18 +1394,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1414,61 +1415,61 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 " --all-proxy-user=BENUTZER    Lege Benutzernamen für die --all-proxy Option\n"
 "                              fest."
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 " --all-proxy-passwd=PASSWORT  Lege Passwort für die --all-proxy Option fest."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 " --http-proxy-user=BENUTZER   Lege Benutzernamen für die --http-proxy "
 "Option\n"
 "                              fest."
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 " --http-proxy-passwd=PASSWORT Lege Passwort für die --http-proxy Option fest."
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 " --https-proxy-user=BENUTZER  Lege Benutzernamen für die --https-proxy "
 "Option\n"
 "                              fest."
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 " --https-proxy-passwd=PASSWORT Legt das Passwort für die --https-proxy\n"
 "                              Option fest."
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 " --ftp-proxy-user=BENUTZER    Legt den Benutzernamen für die --ftp-proxy\n"
 "                              Option fest."
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 " --ftp-proxy-passwd=PASSWORT  Legt das Passwort für die --ftp-proxy\n"
 "                              Option fest."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1478,7 +1479,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1495,7 +1496,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1508,11 +1509,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1523,11 +1524,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1537,7 +1538,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1549,14 +1550,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1573,7 +1574,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 #, fuzzy
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
@@ -1588,21 +1589,21 @@ msgstr ""
 "                              verringert. Abschaltbar, falls dabei Fehler\n"
 "                              auftreten."
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 #, fuzzy
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
@@ -1617,7 +1618,7 @@ msgstr ""
 "                              verringert. Abschaltbar, falls dabei Fehler\n"
 "                              auftreten."
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 #, fuzzy
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
@@ -1634,7 +1635,7 @@ msgstr ""
 "ver-\n"
 "                              wendet."
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1642,7 +1643,7 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 #, fuzzy
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
@@ -1653,7 +1654,7 @@ msgstr ""
 "DHT-\n"
 "                              Netzwerk betreten wird."
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 #, fuzzy
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
@@ -1662,7 +1663,7 @@ msgstr ""
 "Konfigurations-\n"
 "                              datei auf VERZEICHNIS."
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1673,7 +1674,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1686,7 +1687,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1745,26 +1746,26 @@ msgstr "Optionen:"
 msgid "Printing options whose name includes '%s'."
 msgstr "Zeige Optionen deren Namen \"%s\" beinhalten"
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr "Keine Option mit '%s'."
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1778,13 +1779,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "Für mehr Informationen, sehen Sie bitte in der man page nach."
 
@@ -2304,122 +2305,107 @@ msgstr "%s ist kein Verzeichnis."
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "Konnte Verzeichnis %s nicht erstellen, Ursache: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "Konnte Segmentdatei %s nicht öffnen, Ursache %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "Konnte nicht in Segmentdatei %s schreiben, Ursache: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "Konnte nicht aus Segmentdatei %s lesen, Ursache: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "Konnte Socket nicht öffnen, Ursache: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "Konnte eine Socket-Option nicht setzen, Ursache: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "Socket kann nicht auf blockierend geändert werden, Ursache: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "Socket kann nicht auf nicht-blockierend geändert werden, Ursache: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "Konnte Socket nicht binden, Ursache: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Konnte nicht auf Socket lauschen, Ursache: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "Konnte Peer-Verbindung nicht akzeptieren, Ursache: %s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "Konnte Socketnamen nicht ermitteln, Ursache: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "Konnte Namen der verbundenen Gegenstelle nicht ermitteln, Ursache: %s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "Konnte Rechnername %s nicht auflösen, Ursache: %s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "Konnte nicht zum Rechner %s verbinden, Ursache: %s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "Konnte nicht testen, ob der Socket beschreibbar ist, Ursache: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "Konnte nicht testen, ob der Socket lesbar ist, Ursache: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "Konnte Daten nicht senden, Ursache: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "Konnte Daten nicht erhalten, Ursache: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "Datenermittelung fehlgeschlagen, Ursache: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Unbekannter Socket Fehler %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "Die Datei %s existiert, %s jedoch nicht."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr "Ungültige Payload Grösse %s, size=%d. Sollte %d sein."
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "Ungültige ID=%d für %s. Sollte %d sein."
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2428,29 +2414,29 @@ msgstr ""
 "Chunk Prüfusummenvalidierung nicht bestanden. checksumIndex=%d, offset=%s, "
 "expectedHash=%s, actualHash=%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Download abgebrochen."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "Datei %s wird von einem anderen Befehl heruntergeladen."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "Ungenügende Prüfsummen."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "Der Tracker gab als Grund des Fehlschlags an: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "Flooding entdeckt."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -2459,50 +2445,50 @@ msgstr ""
 "Verbindung abgebrochen da während einer gewissen Zeit (%d Sekunden) keine "
 "Anfragen/Teile übetragen wurden."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 "Der infoHash in der torrent Datei stimmt nicht mit dem in der .aria2 Datei "
 "überein."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "Kein passender Dateieintrag %s"
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "Zu langsame Download Geschwindigkeit: %d <= %d(B/s), host:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "Es wurde kein HttpRequestEntry gefunden."
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "Erhielt %d Status, aber kein Location Header angegeben.."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr "Ungültiger Bereichs Header. Request: %s-%s/%s, Response: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "Keine Datei passt auf ihre Einstellungen."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "Ausnahme aufgetreten"
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr "Maximale Nutzdatenlänge überschritten oder ungültig. Länge = %u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr "Ungültige Dateigrösse. Download abgebrochen %s: local %s, remote %s"
@@ -2511,6 +2497,49 @@ msgstr "Ungültige Dateigrösse. Download abgebrochen %s: local %s, remote %s"
 msgid "Errors occurred while binding port.\n"
 msgstr "Fehler beim Binden an Port aufgetreten.\n"
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "muss entweder \"true\" (wahr) oder \"false\" (falsch) sein"
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "muss zwischen %s und %s sein"
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "muss kleiner oder gleich %s sein"
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "muss größer oder gleich %s sein"
+
+#~ msgid "must be a number."
+#~ msgstr "muss eine Zahl sein"
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "muss kleiner oder gleich %.1f sein."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "muss zwischen %.1f und %.1f sein."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "muss größer oder gleich %.1f sein."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "muss eines der folgenden sein:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "unbekanntes Proxy-Format"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "unbekanntes Proxy-Format"
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "Konnte Segmentdatei %s nicht öffnen, Ursache %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "Konnte nicht in Segmentdatei %s schreiben, Ursache: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "Konnte nicht aus Segmentdatei %s lesen, Ursache: %s"
+
 #~ msgid "Certificate verification failed. Cause: %s"
 #~ msgstr "Zertifikatprüfung fehlgeschlagen. Ursache: %s"
 
diff --git a/po/el.po b/po/el.po
index cd260553..80e30544 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-11-01 20:51+0900\n"
 "Last-Translator: Kostas Milonas <milonas.ko@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
@@ -18,21 +18,21 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-11-01 11:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Η διαδικασία τερματισμού ξεκινά... Πατήστε Ctrl-C ξανά για άμεσο τερματισμό."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Η διαδικασία άμεσου τερματισμού ξεκινά..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "Το aria2 θα συνεχίσει το κατέβασμα εάν η μεταφορά επανεκκινηθεί."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 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 ""
 "Αν υπάρχουν σφάλματα, δείτε το αρχείο καταγραφών (log). Δώστε την παράμετρο -"
 "l στη σελίδα help/man για περαιτέρω λεπτομέρειες."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Αποτελέσματα κατεβάσματος:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Υπόμνημα Κατάστασης:"
 
@@ -60,56 +60,6 @@ msgstr "                              Ετικέττα: "
 msgid "                              Possible Values: "
 msgstr "                              Πιθανές Τιμές: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "πρέπει να είναι \"true\" ή \"false\""
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "πρέπει να είναι μεταξύ %s και %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "πρέπει να είναι μικρότερο ή ίσο με το %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "πρέπει να είναι μεγαλύτερο ή ίσο με %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "πρέπει να είναι αριθμός."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "πρέπει να είναι μικρότερο ή ίσο με %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "πρέπει να είναι μεταξύ %.1f και %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "πρέπει να είναι μεγαλύτερο ή ίσο με το %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "πρέπει να είναι ένα από τα ακόλουθα:"
-
-#: src/OptionHandlerImpl.h:529
-msgid "Unrecognized format"
-msgstr "Μη αναγνωρίσιμος τύπος"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "Μη αναγνωρίσιμο φορμά proxy."
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -133,8 +83,9 @@ msgstr ""
 "                              η καταγραφή γίνετε στο stdout."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -368,7 +319,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -376,12 +327,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -457,7 +409,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -465,7 +417,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -478,7 +430,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -525,7 +477,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -568,12 +520,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -583,7 +529,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -593,7 +539,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -602,13 +548,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -623,7 +569,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -635,15 +581,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -653,19 +599,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -675,15 +621,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -696,20 +643,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -717,14 +664,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -738,34 +685,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -781,9 +728,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -791,11 +739,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -808,23 +756,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -836,30 +784,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -868,7 +816,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -879,7 +827,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -892,7 +840,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -922,7 +870,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -931,7 +879,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -941,7 +889,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -949,7 +897,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -960,7 +908,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -969,14 +917,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -988,14 +936,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1003,25 +951,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1031,7 +979,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1039,15 +987,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1057,7 +1005,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1072,7 +1020,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1085,7 +1033,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1096,7 +1044,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1112,47 +1060,54 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
+#, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --ftp-proxy=PROXY           Χρήση αυτού του διακομιστή proxy για το FTP.\n"
+"                              Για να σβήσετε έναν proxy που ορίσατε\n"
+"                              προηγουμένως, χρησιμοποιήστε \"\".\n"
+"                              Ακόμη, δείτε την επιλογή --all-proxy.\n"
+"                              Αυτή η επιλογή επηρεάζει όλα τα URL."
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1161,7 +1116,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1169,7 +1124,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1177,7 +1132,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1199,18 +1154,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1227,7 +1182,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1239,7 +1194,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1249,18 +1204,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1270,45 +1225,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1318,7 +1273,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1335,7 +1290,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1348,11 +1303,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1363,11 +1318,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1377,7 +1332,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1389,14 +1344,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1413,7 +1368,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1422,21 +1377,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1445,7 +1400,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1454,7 +1409,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1462,19 +1417,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1485,7 +1440,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1498,7 +1453,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1556,26 +1511,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1589,13 +1544,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2092,199 +2047,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2292,3 +2232,36 @@ msgstr ""
 #: src/BtSetup.cc:212
 msgid "Errors occurred while binding port.\n"
 msgstr ""
+
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "πρέπει να είναι \"true\" ή \"false\""
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "πρέπει να είναι μεταξύ %s και %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "πρέπει να είναι μικρότερο ή ίσο με το %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "πρέπει να είναι μεγαλύτερο ή ίσο με %s."
+
+#~ msgid "must be a number."
+#~ msgstr "πρέπει να είναι αριθμός."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "πρέπει να είναι μικρότερο ή ίσο με %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "πρέπει να είναι μεταξύ %.1f και %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "πρέπει να είναι μεγαλύτερο ή ίσο με το %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "πρέπει να είναι ένα από τα ακόλουθα:"
+
+#~ msgid "Unrecognized format"
+#~ msgstr "Μη αναγνωρίσιμος τύπος"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "Μη αναγνωρίσιμο φορμά proxy."
diff --git a/po/es.po b/po/es.po
index 652747ae..643d4d73 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-02-03 23:17+0900\n"
 "Last-Translator: Angel Abad <angelabad@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-02-03 13:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Iniciando secuencia de parada... Pulse Ctrl-C otra vez para efectuar una "
 "parada de urgencia."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Iniciando secuencia de parada de urgencia..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "Si reinicia la transferencia, aria2 continuará con la descarga."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -41,11 +41,11 @@ msgstr ""
 "Compruebe el archivo de registro si se producen errores. Para más "
 "información vea la opción '-l' en las páginas help/man."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Resultados de la descarga:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Leyenda:"
 
@@ -61,57 +61,6 @@ msgstr "                              Etiquetas: "
 msgid "                              Possible Values: "
 msgstr "                              Valores válidos: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "ha de ser «true» (verdadero) o «false» (falso)"
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "ha de estar entre %s y %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "ha de ser menor o igual que %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "ha de ser mayor o igual que %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "ha de ser un número."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "ha de ser menor o igual que %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "ha de estar entre %.1f y %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "ha de ser mayor o igual que %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "ha de ser uno de los siguientes:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "formato proxy no reconocido"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "formato proxy no reconocido"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -135,7 +84,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -364,21 +313,27 @@ msgstr ""
 "                               Desactivelo si encuentra algún error."
 
 #: src/usage_text.h:150
+#, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
 msgstr ""
+" --enable-direct-io[=true|false] Acivar E/S directa, que minimiza el uso de "
+"CPU cuando\n"
+"                               se reserva espacio para los archivos.\n"
+"                               Desactivelo si encuentra algún error."
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -456,16 +411,22 @@ msgid ""
 msgstr ""
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
 msgstr ""
+" --enable-direct-io[=true|false] Acivar E/S directa, que minimiza el uso de "
+"CPU cuando\n"
+"                               se reserva espacio para los archivos.\n"
+"                               Desactivelo si encuentra algún error."
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -489,7 +450,8 @@ msgstr ""
 "http."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc             Desactiva el soporte netrc."
 
 #: src/usage_text.h:213
@@ -535,8 +497,9 @@ msgid ""
 msgstr ""
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -583,12 +546,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -603,7 +560,7 @@ msgstr ""
 "para especificar un rango de puertos: \"6881-6999\" ',' y '-'  pueden \n"
 "ser usados juntos."
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -613,7 +570,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -622,7 +579,7 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -631,7 +588,7 @@ msgstr ""
 "Mirar también\n"
 "                              la opción --seed-ratio."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -646,7 +603,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -658,16 +615,16 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr " --enable-dht[=true|false]    Habilitar funcionanlidad DHT."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 #, fuzzy
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
@@ -683,7 +640,7 @@ msgstr ""
 "para especificar un rango de puertos: \"6881-6999\" ',' y '-'  pueden \n"
 "ser usados juntos."
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -693,12 +650,12 @@ msgstr ""
 " --retry-wait=SEG             Establecer los segundos para el siguiente \n"
 "                              intento tras un error."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -708,15 +665,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -729,7 +687,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
@@ -739,13 +697,13 @@ msgstr ""
 "abrir en cada \n"
 "descarga Bittorrent."
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -753,14 +711,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -774,35 +732,35 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   La versión del fichero a descargar."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE El idioma del fichero a descargar."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 " --metalink-os=OS            El Sistema Operativo del fichero a descargar."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -818,9 +776,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -828,11 +787,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Escribir el número de versión y salir."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -845,23 +804,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -873,30 +832,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -905,7 +864,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -916,7 +875,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -929,7 +888,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -959,7 +918,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -968,7 +927,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -978,7 +937,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -986,7 +945,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -997,7 +956,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1006,14 +965,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1025,14 +984,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1040,25 +999,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1068,7 +1027,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1076,15 +1035,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1094,7 +1053,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1109,7 +1068,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1122,7 +1081,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1133,7 +1092,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1149,47 +1108,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1198,7 +1158,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1206,7 +1166,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1214,7 +1174,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1236,18 +1196,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1264,7 +1224,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1276,7 +1236,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1286,19 +1246,19 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 #, fuzzy
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr " --enable-dht[=true|false]    Habilitar funcionanlidad DHT."
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1308,51 +1268,51 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 #, fuzzy
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 " --ftp-passwd=PASSWD Establece la contraseña FTP. Esto afecta a todas las "
 "URLs."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 #, fuzzy
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 " --ftp-passwd=PASSWD Establece la contraseña FTP. Esto afecta a todas las "
 "URLs."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1362,7 +1322,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1379,7 +1339,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1392,14 +1352,14 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 #, fuzzy
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 " -t, --timeout=SEG            Establecer el tiempo de espera máximo\n"
 "                              en segundos."
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1410,14 +1370,14 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 #, fuzzy
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 " -t, --timeout=SEG            Establecer el tiempo de espera máximo\n"
 "                              en segundos."
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1427,7 +1387,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1439,7 +1399,7 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 #, fuzzy
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
@@ -1450,7 +1410,7 @@ msgstr ""
 "abrir en cada \n"
 "descarga Bittorrent."
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1467,7 +1427,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 #, fuzzy
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
@@ -1481,21 +1441,21 @@ msgstr ""
 "                               se reserva espacio para los archivos.\n"
 "                               Desactivelo si encuentra algún error."
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 #, fuzzy
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
@@ -1509,7 +1469,7 @@ msgstr ""
 "                               se reserva espacio para los archivos.\n"
 "                               Desactivelo si encuentra algún error."
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1518,7 +1478,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1526,19 +1486,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1549,7 +1509,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1562,7 +1522,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1620,26 +1580,26 @@ msgstr "Opciones:"
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1653,13 +1613,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "Para más información consulte la página man."
 
@@ -2170,124 +2130,109 @@ msgstr "%s no es un directorio."
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "Fallo al crear el directorio %s, causa: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "Fallo al abrir el fichero de segmentos %s, causa: %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "Fallo al escribir en el fichero de segmentos %s, causa: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "Fallo al leer del fichero de segmentos %s, causa: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "Fallo al abrir un zócalo, causa: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "Fallo al poner una opción del zócalo, causa: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "Fallo al poner un zócalo como bloqueante, causa: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "Fallo al poner un zócalo como no-bloqueante, causa: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "Fallo al conectar un zócalo, causa: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Fallo escuchando un zócalo, causa: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "Fallo al aceptar una conexión de igual, causa: %s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "Fallo al coger el nombre del zócalo, causa: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "Fallo al coger el nombre de un igual conectado, causa: %s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "Fallo al resolver el nombre de host %s,causa: %s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "Fallo al conectar al host %s, causa: %s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "Fallo al comprobar si se puede escribir en un zócalo, causa: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "Fallo al comprovar si se puede leer un zócalo, causa: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "Fallo al enviar datos, causa: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "Fallo al recibir datos, causa: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "Fallo al revisar datos, causa: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Error desconocido de zócalo %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "fichero %s existe, pero %s no existe."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 "La Medida de carga útil (payload) es incorrecta para %s, medida=%d. Ha de "
 "ser %d."
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "Incorrecto ID=%d para %s. Ha de ser %d."
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2296,29 +2241,29 @@ msgstr ""
 "Ha fallado la validación de la suma de comprobación del trozo. "
 "índiceSumacomprobación=%d, desviación=%s, HashEsperado=%s, HashActual=%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Descarga abortada."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "El fichero %s està siendo descargado por otra orden."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "No hay bastantes sumas de comprobación."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "El Seguidor ha devuelto fallo. razón: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "Detectado sobrepasamiento."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -2327,49 +2272,49 @@ msgstr ""
 "Liberamos la conexión debido a que no hemos intercambiado mensajes de "
 "peticiones o piezas en el periodo establecido (%d seg.)."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 "El infoHash en el fichero torrent no concuerda con el del fichero .aria2."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "No hay esta entrada en el fichero %s"
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "Velocidad de descarga demasiado lenta: %d <= %d(B/s), host:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "No hemos encontrado HttpRequestEntry."
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "Hemos recibido estado %d, pero no nos da la cabecera de ubicación."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr "Cabecera de rango incorrecta. Petición: %s-%s/%s, Respuesta: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "No hay ningún fichero que concuerde con vuestra preferencia."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "Excepcion capturada"
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr "Longitud de carga ulti excedida o es invalida,  longitud   = %u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2380,6 +2325,49 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr "Han ocurrido errores mientras cogíamos el puerto.\n"
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "ha de ser «true» (verdadero) o «false» (falso)"
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "ha de estar entre %s y %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "ha de ser menor o igual que %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "ha de ser mayor o igual que %s."
+
+#~ msgid "must be a number."
+#~ msgstr "ha de ser un número."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "ha de ser menor o igual que %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "ha de estar entre %.1f y %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "ha de ser mayor o igual que %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "ha de ser uno de los siguientes:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "formato proxy no reconocido"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "formato proxy no reconocido"
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "Fallo al abrir el fichero de segmentos %s, causa: %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "Fallo al escribir en el fichero de segmentos %s, causa: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "Fallo al leer del fichero de segmentos %s, causa: %s"
+
 #~ msgid "CUID#%d - The download for one segment completed successfully."
 #~ msgstr ""
 #~ "CUID#%d - Se ha completado satisfactoriamente la descarga de un segmento."
diff --git a/po/fi.po b/po/fi.po
index 273de197..c1bf62cc 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2008-01-27 16:49+0000\n"
 "Last-Translator: Curaga <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr "Sammutus alkaa... Paina Ctrl-C uudestaan hätäsammutukselle."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Hätäsammutus alkaa..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 jatkaa latausta, jos siirto käynnistetään uudelleen."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -39,11 +39,11 @@ msgstr ""
 "Jos virheitä tapahtuu, katso lokitiedostoa. Ks. '-l' parametri ohjeessa/man-"
 "sivulla."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Lataustulokset:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Tilalegenda:"
 
@@ -60,57 +60,6 @@ msgstr "                              Tagit: "
 msgid "                              Possible Values: "
 msgstr "                              Mahdolliset arvot: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "täytyy olla joko 'true' tai 'false'."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "täytyy olla välillä %s ja %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "täytyy olla pienempi tai yhtä suuri kuin %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "täytyy olla suurempi tai yhtä suuri kuin %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "täytyy olla numero."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "täytyy olla pienempi tai yhtä suuri kuin %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "täytyy olla välillä %.1f ja %.1f"
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "täytyy olla suurempi tai yhtä suuri kuin %.1f"
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "täytyy olla yksi seuraavista:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "tunnistamaton välityspalvelinmuoto"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "tunnistamaton välityspalvelinmuoto"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -134,8 +83,9 @@ msgstr ""
 "                              loki kirjoitetaan stdout:iin."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -143,6 +93,11 @@ msgid ""
 "to\n"
 "                              \"/dev/null\"."
 msgstr ""
+" --allow-piece-lenght-change=true|false Jos false, aria2 keskeyttää "
+"latauksen kun\n"
+"                             palan koko on eri kuin hallintatiedostossa. Jos "
+"true, voit jatkaa\n"
+"                             mutta hieman latausedistystä voidaan menettää."
 
 #: src/usage_text.h:50
 #, fuzzy
@@ -395,7 +350,7 @@ msgstr ""
 #: src/usage_text.h:150
 #, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -407,13 +362,15 @@ msgstr ""
 "                             mutta hieman latausedistystä voidaan menettää."
 
 #: src/usage_text.h:154
+#, fuzzy
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 " --allow-piece-lenght-change=true|false Jos false, aria2 keskeyttää "
 "latauksen kun\n"
@@ -546,7 +503,7 @@ msgstr ""
 #: src/usage_text.h:198
 #, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -559,8 +516,9 @@ msgstr ""
 "                              Oletus: true"
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -579,7 +537,8 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr " -U, --user-agent=USER_AGENT Aseta selaimen nimi http(s)-latauksiin."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc Asettaa netrc-tuen pois päältä."
 
 #: src/usage_text.h:213
@@ -637,8 +596,9 @@ msgid ""
 msgstr ""
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -705,17 +665,6 @@ msgstr ""
 "                              pidetään muistissa."
 
 #: src/usage_text.h:259
-#, fuzzy
-msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-" --direct-file-mapping=true|false Lue ja kirjoita suoraan jokaiseen "
-"tiedostoon\n"
-"                             joka mainitaan .torrent-tiedostossa\n"
-"                             Oletus: true"
-
-#: src/usage_text.h:262
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -732,7 +681,7 @@ msgstr ""
 "'6881-6999'\n"
 "                            Molempia voi käyttää yhtäaikaa."
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 #, fuzzy
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
@@ -748,7 +697,7 @@ msgstr ""
 "= 1024K)\n"
 "                             Oletus: 0"
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 #, fuzzy
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
@@ -763,7 +712,7 @@ msgstr ""
 "= 1024K)\n"
 "                             Oletus: 0"
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -771,7 +720,7 @@ msgstr ""
 " --seed-time=MIN Aseta jakamisaika (seeding) minuuteissa. Ks. myös\n"
 "                             --seed-ratio valinta."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 #, fuzzy
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
@@ -794,7 +743,7 @@ msgstr ""
 "jakaminen\n"
 "                             päättyy kun toinen ehdoista täyttyy."
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 #, fuzzy
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
@@ -813,18 +762,18 @@ msgstr ""
 "lisätään.\n"
 "                              Oletus: -aria2-"
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 " --enable-http-keep-alive[=true|false] Käytä HTTP/1.1 säilyvää yhteyttä.\n"
 "                              Oletus: false"
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 #, fuzzy
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
@@ -841,7 +790,7 @@ msgstr ""
 "'6881-6999'\n"
 "                            Molempia voi käyttää yhtäaikaa."
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -851,13 +800,13 @@ msgstr ""
 " -m, --max-tries=N Yritysten määrä. 0 on rajoittamaton.\n"
 "                              OIetus:5"
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 #, fuzzy
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr " --conf-path=POLKU Muuta asetustiedoston polkua."
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -867,15 +816,22 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
+#, fuzzy
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
+" --allow-piece-lenght-change=true|false Jos false, aria2 keskeyttää "
+"latauksen kun\n"
+"                             palan koko on eri kuin hallintatiedostossa. Jos "
+"true, voit jatkaa\n"
+"                             mutta hieman latausedistystä voidaan menettää."
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 #, fuzzy
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
@@ -893,7 +849,7 @@ msgstr ""
 "                              Voit lisätä perään joko K tai M (1K = 1024, 1M "
 "= 1024K)"
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 #, fuzzy
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
@@ -903,13 +859,13 @@ msgstr ""
 " -m, --max-tries=N Yritysten määrä. 0 on rajoittamaton.\n"
 "                              OIetus:5"
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 #, fuzzy
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
@@ -921,7 +877,7 @@ msgstr ""
 "                              Arvon oltava väliltä 0 ja 60.\n"
 "                              Oletus: 5"
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 #, fuzzy
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
@@ -929,7 +885,7 @@ msgid ""
 "                              input from stdin when '-' is specified."
 msgstr " -M, --metalink-file=METALINK Käytä ladattua .metalink-tiedostoa."
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 #, fuzzy
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
@@ -952,21 +908,21 @@ msgstr ""
 "                           Jos mem, metalink-tiedostoa ei ladata levylle, "
 "vaan pidetään muistissa."
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSIO Aseta minkä version tiedostosta haluat."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 " --metalink-language=KIELI Aseta minkä kielisen version tiedostosta haluat."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr " --metalink-os=OS Mille käyttöjärjestelmälle lataat tiedostoa."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 #, fuzzy
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
@@ -976,7 +932,7 @@ msgstr ""
 " --metalink-location=SIJAINTI[,...] Suosittavan palvelimen sijainti.\n"
 "                              Pilkuilla erotettu lista on hyväksyttävä."
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 #, fuzzy
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
@@ -989,7 +945,7 @@ msgstr ""
 "'none'. Käytä 'none' poistaaksesi\n"
 "                              tämä ominaisuus käytöstä."
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 #, fuzzy
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
@@ -1014,9 +970,11 @@ msgstr ""
 "                           Jos mem, metalink-tiedostoa ei ladata levylle, "
 "vaan pidetään muistissa."
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
+#, fuzzy
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -1031,11 +989,11 @@ msgstr ""
 "vaihtoehtoa\n"
 "                              valitaksesi mitä protokollaa käytetään."
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version Tulosta versionumero ja lopeta."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 #, fuzzy
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
@@ -1056,23 +1014,24 @@ msgstr ""
 "jakaminen\n"
 "                             päättyy kun toinen ehdoista täyttyy."
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr " --no-conf Estä aria2.conf -asetustiedoston käyttö."
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr " --conf-path=POLKU Muuta asetustiedoston polkua."
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -1084,30 +1043,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 #, fuzzy
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
@@ -1121,7 +1080,7 @@ msgstr ""
 "                             joka mainitaan .torrent-tiedostossa\n"
 "                             Oletus: true"
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -1132,7 +1091,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 #, fuzzy
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
@@ -1154,7 +1113,7 @@ msgstr ""
 "tiedoston koosta.\n"
 "                              Oletus: prealloc"
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 #, fuzzy
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
@@ -1194,7 +1153,7 @@ msgstr ""
 "levylle, vaan\n"
 "                              pidetään muistissa."
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 #, fuzzy
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
@@ -1207,7 +1166,7 @@ msgstr ""
 "                              Arvon oltava väliltä 0 ja 60.\n"
 "                              Oletus: 5"
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -1217,7 +1176,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 #, fuzzy
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
@@ -1229,7 +1188,7 @@ msgstr ""
 "                              Arvon oltava väliltä 0 ja 60.\n"
 "                              Oletus: 5"
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1240,7 +1199,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1249,7 +1208,7 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 #, fuzzy
 msgid ""
 " --private-key=FILE           Use the private key in FILE.\n"
@@ -1260,7 +1219,7 @@ msgstr ""
 "                              Arvon oltava väliltä 0 ja 60.\n"
 "                              Oletus: 5"
 
-#: src/usage_text.h:477
+#: src/usage_text.h:474
 #, fuzzy
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
@@ -1281,14 +1240,14 @@ msgstr ""
 "tiedoston koosta.\n"
 "                              Oletus: prealloc"
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 #, fuzzy
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
@@ -1299,18 +1258,18 @@ msgstr ""
 " --seed-time=MIN Aseta jakamisaika (seeding) minuuteissa. Ks. myös\n"
 "                             --seed-ratio valinta."
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 #, fuzzy
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
@@ -1320,7 +1279,7 @@ msgstr ""
 " -m, --max-tries=N Yritysten määrä. 0 on rajoittamaton.\n"
 "                              OIetus:5"
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1330,7 +1289,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1338,19 +1297,19 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 #, fuzzy
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 " -http-user=USER Aseta http-käyttäjänimi. Tämä vaikuttaa kaikkiin URL:hin."
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 #, fuzzy
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 " --http-passwd=SALASANA Aseta http-salasana. Tämä vaikuttaa kaikkiin URL:hin."
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1360,7 +1319,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 #, fuzzy
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
@@ -1383,7 +1342,7 @@ msgstr ""
 "jakaminen\n"
 "                             päättyy kun toinen ehdoista täyttyy."
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 #, fuzzy
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
@@ -1405,7 +1364,7 @@ msgstr ""
 "tiedoston koosta.\n"
 "                              Oletus: prealloc"
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 #, fuzzy
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
@@ -1425,7 +1384,7 @@ msgstr ""
 "                              (1..9999) lisättynä.\n"
 "                              Oletus: true"
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 #, fuzzy
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
@@ -1449,12 +1408,12 @@ msgstr ""
 "jakaminen\n"
 "                             päättyy kun toinen ehdoista täyttyy."
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 #, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1465,19 +1424,27 @@ msgstr ""
 "= 1024K)\n"
 "                             Oletus: 0"
 
-#: src/usage_text.h:550
-msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
-msgstr ""
-
-#: src/usage_text.h:554
+#: src/usage_text.h:547
 #, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
+msgstr ""
+" --max-upload-limit=NOPEUS Aseta maksimi-uploadnopeus (tavua/sek)\n"
+"                             0 on ei rajaa.\n"
+"                             Voit lisätä perään joko K tai M (1K = 1024, 1M "
+"= 1024K)\n"
+"                             Oletus: 0"
+
+#: src/usage_text.h:552
+#, fuzzy
+msgid ""
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1487,11 +1454,11 @@ msgstr ""
 "= 1024K)\n"
 "                             Oletus: 0"
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 #, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1502,13 +1469,12 @@ msgstr ""
 "= 1024K)\n"
 "                             Oletus: 0"
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 #, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1526,7 +1492,7 @@ msgstr ""
 "levylle, vaan\n"
 "                              pidetään muistissa."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 #, fuzzy
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
@@ -1538,7 +1504,7 @@ msgstr ""
 "                              Arvon oltava väliltä 0 ja 60.\n"
 "                              Oletus: 5"
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 #, fuzzy
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
@@ -1552,7 +1518,7 @@ msgstr ""
 "                              tavalliset komentorivilatausapuohjelmat.\n"
 "                              Oletus: false"
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1574,18 +1540,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 #, fuzzy
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
@@ -1610,7 +1576,7 @@ msgstr ""
 "jakaminen\n"
 "                             päättyy kun toinen ehdoista täyttyy."
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1622,7 +1588,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 #, fuzzy
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
@@ -1638,21 +1604,21 @@ msgstr ""
 "true, voit jatkaa\n"
 "                             mutta hieman latausedistystä voidaan menettää."
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 #, fuzzy
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 " --enable-http-keep-alive[=true|false] Käytä HTTP/1.1 säilyvää yhteyttä.\n"
 "                              Oletus: false"
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 #, fuzzy
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
@@ -1668,69 +1634,69 @@ msgstr ""
 "true, voit jatkaa\n"
 "                             mutta hieman latausedistystä voidaan menettää."
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 #, fuzzy
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 " --http-proxy-user=USER Aseta http-välityspalvelin-käyttäjänimi. Tämä "
 "vaikuttaa kaikkiin URL:hin."
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 #, fuzzy
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 " --http-proxy-passwd=SALASANA Aseta http-välityspalvelin-salasana. Tämä "
 "vaikuttaa kaikkiin URL:hin."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 #, fuzzy
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 " --http-proxy-user=USER Aseta http-välityspalvelin-käyttäjänimi. Tämä "
 "vaikuttaa kaikkiin URL:hin."
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 #, fuzzy
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 " --http-proxy-passwd=SALASANA Aseta http-välityspalvelin-salasana. Tämä "
 "vaikuttaa kaikkiin URL:hin."
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 #, fuzzy
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 " --http-proxy-user=USER Aseta http-välityspalvelin-käyttäjänimi. Tämä "
 "vaikuttaa kaikkiin URL:hin."
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 #, fuzzy
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 " --http-proxy-passwd=SALASANA Aseta http-välityspalvelin-salasana. Tämä "
 "vaikuttaa kaikkiin URL:hin."
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 #, fuzzy
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 " --http-proxy-user=USER Aseta http-välityspalvelin-käyttäjänimi. Tämä "
 "vaikuttaa kaikkiin URL:hin."
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 #, fuzzy
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 " --http-proxy-passwd=SALASANA Aseta http-välityspalvelin-salasana. Tämä "
 "vaikuttaa kaikkiin URL:hin."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 #, fuzzy
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
@@ -1746,7 +1712,7 @@ msgstr ""
 "true, voit jatkaa\n"
 "                             mutta hieman latausedistystä voidaan menettää."
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 #, fuzzy
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
@@ -1773,7 +1739,7 @@ msgstr ""
 "levylle, vaan\n"
 "                              pidetään muistissa."
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1786,12 +1752,12 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 #, fuzzy
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr " -t, --timeout=SEK Aikakatkaisu sekunneissa. Oletus: 60"
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 #, fuzzy
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
@@ -1811,12 +1777,12 @@ msgstr ""
 "tiedoston koosta.\n"
 "                              Oletus: prealloc"
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 #, fuzzy
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr " -t, --timeout=SEK Aikakatkaisu sekunneissa. Oletus: 60"
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1826,7 +1792,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 #, fuzzy
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
@@ -1847,7 +1813,7 @@ msgstr ""
 "tiedoston koosta.\n"
 "                              Oletus: prealloc"
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 #, fuzzy
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
@@ -1857,7 +1823,7 @@ msgstr ""
 " -m, --max-tries=N Yritysten määrä. 0 on rajoittamaton.\n"
 "                              OIetus:5"
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 #, fuzzy
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
@@ -1879,7 +1845,7 @@ msgstr ""
 "                              Voit lisätä perään joko K tai M (1K = 1024, 1M "
 "= 1024K)"
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 #, fuzzy
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
@@ -1893,17 +1859,17 @@ msgstr ""
 "                             joka mainitaan .torrent-tiedostossa\n"
 "                             Oletus: true"
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 #, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1917,7 +1883,7 @@ msgstr ""
 "levylle, vaan\n"
 "                              pidetään muistissa."
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 #, fuzzy
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
@@ -1931,7 +1897,7 @@ msgstr ""
 "                              varatessa tilaa.\n"
 "                              Älä käytä, jos kohtaat virheitä"
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 #, fuzzy
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
@@ -1946,7 +1912,7 @@ msgstr ""
 "true, voit jatkaa\n"
 "                             mutta hieman latausedistystä voidaan menettää."
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1954,7 +1920,7 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 #, fuzzy
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
@@ -1964,13 +1930,13 @@ msgstr ""
 " -m, --max-tries=N Yritysten määrä. 0 on rajoittamaton.\n"
 "                              OIetus:5"
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 #, fuzzy
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr " --conf-path=POLKU Muuta asetustiedoston polkua."
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 #, fuzzy
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
@@ -1990,7 +1956,7 @@ msgstr ""
 "tiedoston koosta.\n"
 "                              Oletus: prealloc"
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -2003,7 +1969,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -2062,12 +2028,12 @@ msgstr "Asetukset:"
 msgid "Printing options whose name includes '%s'."
 msgstr "Tulostetaan valinnat, joiden nimi alkaa '%s'"
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, fuzzy, c-format
 msgid "No option matching with '%s'."
 msgstr "Ei ohjeosiota tai valintaa nimellä '%s'"
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 #, fuzzy
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
@@ -2077,14 +2043,14 @@ msgstr ""
 " Voit antaa useita osoitteita. Jos et käytä -Z valintaa, kaikkien\n"
 " osoitteiden täytyy johtaa samaan tiedostoon, tai lataaminen keskeytyy."
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 #, fuzzy
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
@@ -2103,7 +2069,7 @@ msgstr ""
 " samaan aikaan, ja jaat http/ftp:ltä saatua dataa torrent-parveen.\n"
 " HUOM: vain yhden tiedoston torrent-tiedostoa voi käyttää näin."
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 #, fuzzy
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
@@ -2114,7 +2080,7 @@ msgstr ""
 " siinä on \"&\" tai jokin muu merkki, jolla on erityismerkitys "
 "komentotulkille."
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "Ks. man-sivulta lisätietoja."
 
@@ -2620,122 +2586,107 @@ msgstr "%s ei ole hakemisto."
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "Hakemistoa %s ei voi luoda, syy: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "Osatiedostoa %s ei voi avata, syy: %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "Osatiedostoon %s ei voi kirjoittaa, syy: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "Osatiedostosta %s ei voi lukea, syy: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "Sockettia ei voi avata, syy: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "Socket-asetuksen asetus epäonnistui, syy: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "Socketin asetus estäväksi epäonnistui, syy: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "Socketin asetus ei-estäväksi epäonnistui, syy: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "Socketin sitominen epäonnistui, syy: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Socketin kuuntelu epäonnistui, syy: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "Käyttäjäyhteyttä ei voitu hyväksyä, syy: %s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "Socketin nimen saaminen epäonnistui, syy: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "Yhdistyneen käyttäjän nimeä ei saatu, syy: %s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "Koneen %s osoitetta ei pystytty selvittämään, syy: %s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "Yhteyttä koneeseen %s ei saatu, syy: %s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "Socketin kirjoitettavuutta ei voitu tarkistaa, syy: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "Socketin luettavuutta ei voitu tarkistaa, syy: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "Dataa ei voitu lähettää, syy: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "Dataa ei voitu vastaanottaa, syy: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "Dataa ei voitu katsoa, syy: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Tuntematon socket-virhe %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "Tiedosto %s on olemassa, mutta %s ei."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr "Väärä payload-koko %s:lla (%d), pitäisi olla %d."
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "Epäkelpo ID=%d %s:lla. Pitäisi olla %d."
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2744,29 +2695,29 @@ msgstr ""
 "Palan tarkistussumma ei täsmää. checksumIndex=%d, offset=%s, expectedHash="
 "%s, actualHash=%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Lataus keskeytettiin."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "Tiedostoa %s lataa joku toinen komento."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "Riittämättömät tarkistussummat."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "Tracker palautti epäonnistumisen syyn: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "Tulva huomattu."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -2775,48 +2726,48 @@ msgstr ""
 "Sulje yhteys koska yhtään pyyntöä/palaa ei vaihdettu tietyssä ajassa (%d "
 "sekunnissa)."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr "InfoHash torrent-tiedostossa ei täsmää .aria2-tiedostossa olevaan."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "Tiedostokohtaa %s ei ole."
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "Liian hidas latausnopeus: %d <= %d(B/s), kone:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "HttpRequestEntry:ä ei löydy."
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "Saatiin %d-tila, mutta ei osoiteotsaketta."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr "Epäkelpo rajaotsake. Pyyntö: %s-%s/%s, Vastaus %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "Yksikään tiedosto ei vastaa asetuksiasi."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "Poikkeus löytyi"
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr "Suurin payload-koko ylitetty tai väärä. Pituus = %u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2826,6 +2777,60 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr "Virheitä tapahtui sitoessa porttia.\n"
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "täytyy olla joko 'true' tai 'false'."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "täytyy olla välillä %s ja %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "täytyy olla pienempi tai yhtä suuri kuin %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "täytyy olla suurempi tai yhtä suuri kuin %s."
+
+#~ msgid "must be a number."
+#~ msgstr "täytyy olla numero."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "täytyy olla pienempi tai yhtä suuri kuin %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "täytyy olla välillä %.1f ja %.1f"
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "täytyy olla suurempi tai yhtä suuri kuin %.1f"
+
+#~ msgid "must be one of the following:"
+#~ msgstr "täytyy olla yksi seuraavista:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "tunnistamaton välityspalvelinmuoto"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "tunnistamaton välityspalvelinmuoto"
+
+#, fuzzy
+#~ msgid ""
+#~ " --direct-file-mapping=true|false Directly read from and write to each "
+#~ "file\n"
+#~ "                              mentioned in .torrent file."
+#~ msgstr ""
+#~ " --direct-file-mapping=true|false Lue ja kirjoita suoraan jokaiseen "
+#~ "tiedostoon\n"
+#~ "                             joka mainitaan .torrent-tiedostossa\n"
+#~ "                             Oletus: true"
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "Osatiedostoa %s ei voi avata, syy: %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "Osatiedostoon %s ei voi kirjoittaa, syy: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "Osatiedostosta %s ei voi lukea, syy: %s"
+
 #~ msgid "CUID#%d - The download for one segment completed successfully."
 #~ msgstr "CUID#%d - Yhden osan lataus valmistui onnistuneesti."
 
diff --git a/po/fr.po b/po/fr.po
index 539ef471..443974d2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2 0.11.2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-10-12 20:58+0900\n"
 "Last-Translator: Thomas Colomb <Unknown>\n"
 "Language-Team: Fran&ccedil;ais\n"
@@ -18,22 +18,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-10-12 11:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Séquence d'arrêt débutée... Pressez Ctrl-C une nouvelle fois pour un arrêt "
 "d'urgence."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Séquence d'arrêt d'urgence débutée..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2c va recommencer ce téléchargement si le transfert est relancé."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -41,11 +41,11 @@ msgstr ""
 "En cas d'érreurs, merci de lire le fichier log. Voir l'option '-l' pour plus "
 "d'informations."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Résultats du téléchargement:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Légende du statut:"
 
@@ -61,56 +61,6 @@ msgstr "                              Signets: "
 msgid "                              Possible Values: "
 msgstr "                              Valeurs possibles: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "doit impérativement être 'vrai' ou 'faux'"
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "doit être compris entre %s et %s"
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "doit être plus petit ou égal à %s"
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "doit être plus grand ou égal à %s"
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "doit être un nombre."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "doit être plus petit ou égal à %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "doit être compris entre %.1f et %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "doit être plus grand ou égal à %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "doit être l'une de ces valeurs suivantes:"
-
-#: src/OptionHandlerImpl.h:529
-msgid "Unrecognized format"
-msgstr "Format non reconnu"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "type de proxy non reconnu"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -133,7 +83,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -404,21 +354,28 @@ msgstr ""
 "problème."
 
 #: src/usage_text.h:150
+#, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
 msgstr ""
+" -R, --remote-time[=true|false] Récupère en HTTP ou FTP la date et l'heure "
+"du fichier distant\n"
+"                                          et l'appliquer comme valeur par "
+"défaut au fichier local."
 
 #: src/usage_text.h:154
+#, fuzzy
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 " --allow-piece-length-change=true|false Si false est choisi, aria2 annule le "
 "téléchargement\n"
@@ -548,8 +505,9 @@ msgstr ""
 "téléchargements via BitTorrent."
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -561,8 +519,9 @@ msgstr ""
 "                              si la fonction est supportée."
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -587,7 +546,8 @@ msgstr ""
 "téléchargements http(s)."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc               Désactiver le support netrc."
 
 #: src/usage_text.h:213
@@ -645,8 +605,9 @@ msgstr ""
 "                              et leur valeur d'expiration sera remise à 0."
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -719,15 +680,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-" --direct-file-mapping=true|false Lis et écris directement vers chaque "
-"fichier\n"
-"                              mentionné dans le fichier  .torrent."
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -746,7 +698,7 @@ msgstr ""
 "et '-' peuvent\n"
 "                              être utilisés ensemble."
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -764,7 +716,7 @@ msgstr ""
 "torrent, utiliser\n"
 "                              l'option --max-upload-limit."
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -780,7 +732,7 @@ msgstr ""
 "                              Afin de limiter la vitesse globale, utiliser "
 "l'option --max-overall-limit."
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -789,7 +741,7 @@ msgstr ""
 "Consultez aussi\n"
 "                              l'option --seed-ratio."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -818,7 +770,7 @@ msgstr ""
 "fois l'une des\n"
 "                              conditions remplie."
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -839,17 +791,17 @@ msgstr ""
 "compléter la séquence jusqu'à ce qu'elle\n"
 "                              atteigne 20 bytes."
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 " --enable-peer-exchange[=true|false] Active ou non le \"Peer Exchange"
 "\" (PEX)."
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -859,19 +811,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -888,9 +840,11 @@ msgstr ""
 "bas, remplissant\n"
 "                              les conditions du niveau donné."
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
+#, fuzzy
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
@@ -900,7 +854,7 @@ msgstr ""
 "                              Sinon aria2 utilise toujours des connexions "
 "cryptées."
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -913,7 +867,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
@@ -923,7 +877,7 @@ msgstr ""
 "ouverts pour\n"
 "                              chaque téléchargement BitTorrent."
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
@@ -931,7 +885,7 @@ msgstr ""
 " --bt-seed-unverified[=true|false] Partage (seed) les fichiers précédemment "
 "téléchargés sans vérifier les \"hash\" des fichiers."
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -943,14 +897,14 @@ msgstr ""
 "                              Voir également l'option --bt-request-peer-"
 "speed-limit."
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -974,22 +928,22 @@ msgstr ""
 "                              'maxconnections' au lieu de NUM_SERVERS. Voir "
 "également les options -s et -j."
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   La version du fichier à télécharger."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE La langua du fichier à télécharger."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 " --metalink-os=OS             Le système d'exploitation auquel est destiné "
 "le fichier."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
@@ -999,7 +953,7 @@ msgstr ""
 "                              Une liste de noms séparés par virgule peut "
 "être utilisée."
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
@@ -1009,7 +963,7 @@ msgstr ""
 "'none'\n"
 "                              si vous n'avez pas de préférence."
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -1036,9 +990,11 @@ msgstr ""
 "                              Si 'false' est spécifié, Aria2 ne suivra pas "
 "le Metalink."
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
+#, fuzzy
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -1054,11 +1010,11 @@ msgstr ""
 "protocol pour\n"
 "                              spécifier les préférences du protocole."
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version"
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -1071,17 +1027,18 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr " --no-conf Désactive le chargement du fichier aria2.conf ."
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 " --conf-path=PATH Change l'emplacement du fichier de configuration vers PATH."
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
@@ -1092,7 +1049,7 @@ msgstr ""
 "                              Si la valeur est égale à 0 cette fonction est "
 "inactive."
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -1111,21 +1068,21 @@ msgstr ""
 "9J1\"\n"
 "                              http://host/file"
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr " -q, --quiet[=true|false] Mode silencieux. Aucun message d'état."
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 " --async-dns[=true|false]     Active ou non la fonction \"asynchronous DNS"
 "\" (\"requetes DNS en mode multithread\")."
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr " --ftp-reuse-connection[=true|false] Réutilise la connexion en FTP."
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
@@ -1136,13 +1093,13 @@ msgstr ""
 "                              Mettre 0 pour ne pas l'afficher dans la "
 "console."
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 " --log-level=LEVEL            Configure le niveau de détail du fichier log "
 "en sortie."
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -1155,7 +1112,7 @@ msgstr ""
 "                                          et l'appliquer comme valeur par "
 "défaut au fichier local."
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -1172,7 +1129,7 @@ msgstr ""
 "                              cette option n'as pas d'autre usage et le "
 "paramètre --timeout est utilisé."
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -1193,7 +1150,7 @@ msgstr ""
 "                              Cette option est effective seulement sur des "
 "serveurs de type HTTP/FTP."
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -1223,7 +1180,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -1238,7 +1195,7 @@ msgstr ""
 "                              sauvegardées en utilisant l'option --server-"
 "stat-if."
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -1254,7 +1211,7 @@ msgstr ""
 "                              d'URI à titre de 'feedback'.\n"
 "                              Voir également l'option --uri-selector."
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -1266,7 +1223,7 @@ msgstr ""
 "                              le profil de performance des serveurs depuis "
 "leur dernière connexion."
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1277,7 +1234,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1292,7 +1249,7 @@ msgstr ""
 "afin de\n"
 "                              spécifier la clé privée."
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 msgid ""
 " --private-key=FILE           Use the private key in FILE.\n"
 "                              The private key must be decrypted and in PEM\n"
@@ -1303,7 +1260,7 @@ msgstr ""
 "PEM.\n"
 "                              Voir également l'option --certificate."
 
-#: src/usage_text.h:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1315,7 +1272,7 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
@@ -1325,7 +1282,7 @@ msgstr ""
 "spécifié\n"
 "                              dans l'option --ca-certificate."
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1333,18 +1290,18 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
@@ -1353,7 +1310,7 @@ msgstr ""
 " --xml-rpc-listen-port=PORT Spécifie le port sur lequel le serveur XML-RPC "
 "va écouter."
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1369,7 +1326,7 @@ msgstr ""
 "rpc-user et --xms-rpc-passwd.\n"
 "                              Voir également l'option --xml-rpc-listen-port."
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1381,15 +1338,15 @@ msgstr ""
 "                              détecte une requête supérieure à une taille de "
 "SIZE bytes, la connection est fermée."
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr " --xml-rpc-user=USER Définit l'utilisateur XML-RPC"
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr " --xml-rpc-passwd=PASSWD Définit le mot de passe XML-RPC"
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1399,7 +1356,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1414,7 +1371,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1427,7 +1384,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1438,7 +1395,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1454,22 +1411,34 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
+#, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --max-download-limit=SPEED Définit la vitesse de téléchargement maximale "
+"par téléchargement en\n"
+"                              bytes/sec. 0 indique sans limitation.\n"
+"                              Vous pouvez indiquer les valeurs en K ou M (1K "
+"= 1024, 1M = 1024K).\n"
+"                              Afin de limiter la vitesse globale de "
+"téléchargement, utiliser\n"
+"                              l'option --max-overall-download-limit."
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
+#, fuzzy
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 " --on-download-start=COMMAND  Spécifie la commande devant être exécutée\n"
 "                              lorsque le téléchargement démarre. COMMAND ne "
@@ -1477,29 +1446,44 @@ msgstr ""
 "                              le GID est mentionné dans COMMAND en tant "
 "qu'argument primaire."
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
+#, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --on-download-start=COMMAND  Spécifie la commande devant être exécutée\n"
+"                              lorsque le téléchargement démarre. COMMAND ne "
+"doit utiliser qu'un seul argument et\n"
+"                              le GID est mentionné dans COMMAND en tant "
+"qu'argument primaire."
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
+#, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --max-download-limit=SPEED Définit la vitesse de téléchargement maximale "
+"par téléchargement en\n"
+"                              bytes/sec. 0 indique sans limitation.\n"
+"                              Vous pouvez indiquer les valeurs en K ou M (1K "
+"= 1024, 1M = 1024K).\n"
+"                              Afin de limiter la vitesse globale de "
+"téléchargement, utiliser\n"
+"                              l'option --max-overall-download-limit."
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
+#, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1507,8 +1491,23 @@ msgid ""
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --follow-torrent=true|false|mem Si true ou mem est spécifié, quand un "
+"fichier\n"
+"                              dont le suffixe est .torrent ou dont le type\n"
+"                              de contenu est application/x-bittorrent est "
+"téléchargé, aria2 le\n"
+"                              considère comme un fichier \"torrent\" et "
+"télécharge les fichiers\n"
+"                              mentionnés dedans.\n"
+"                              Si mem est spécifié, le fichiertorrent n'est "
+"pas\n"
+"                              écrit sur le disque, mais est juste gardé en "
+"mémoire.\n"
+"                              Si false est spécifié, l'action mentionné ci-"
+"dessus\n"
+"                              n'est pas appliquée."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1521,7 +1520,7 @@ msgstr ""
 "cette\n"
 "                              fonctionnalité est désactivée."
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1535,7 +1534,7 @@ msgstr ""
 "                              ne sera effective que sur l'interface de "
 "boucle locale."
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1557,18 +1556,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1585,7 +1584,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1597,7 +1596,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1607,18 +1606,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1628,45 +1627,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1676,7 +1675,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1693,7 +1692,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1706,11 +1705,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1721,11 +1720,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1735,7 +1734,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1747,7 +1746,7 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 #, fuzzy
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
@@ -1758,7 +1757,7 @@ msgstr ""
 "ouverts pour\n"
 "                              chaque téléchargement BitTorrent."
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1775,7 +1774,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1784,21 +1783,32 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
+#, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --bt-hash-check-seed[=true|false] Si 'true' est spécifié, une fois le "
+"contrôle du hash effectué\n"
+"                              en utilisant --check-integrity et que le "
+"fichier est terminé, continuer de seeder.\n"
+"                              Si vous souhaitez contrôler le fichier et le "
+"télécharger seulement s'il est endommagé\n"
+"                              ou incomplet, définir cette option sur "
+"'false'.\n"
+"                              Cette option n'est effective que lors de "
+"téléchargements via BitTorrent."
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1807,7 +1817,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1816,7 +1826,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1824,19 +1834,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1847,7 +1857,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1860,7 +1870,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1920,26 +1930,26 @@ msgstr "Options:"
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr "Aucune option correspondant à '%s'."
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1953,13 +1963,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "Merci de vous reférer au manuel pour plus d'information."
 
@@ -2477,123 +2487,108 @@ msgstr "%s n'est pas un dossier"
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "Impossible de créer le dossier %s, cause: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "Impossible d'ouvrir le fichier de segment %s, cause: %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "Impossible d'écrire dans le fichier de segment %s, cause: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "Impossible de lire à partir du fichier de segment %s, cause: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "Impossible d'ouvrir une connexion socket, cause: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "Impossible de définir une option de connexion socket, cause: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "Failed to set a socket as blocking, cause: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "Failed to set a socket as non-blocking, cause: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "Impossible d'unir une connexion socket, cause: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Impossible d'écouter une connexion socket, cause: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "Impossible d'accepter une connexion à un autre ordinateur, cause: %s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "Impossible de récupérer le nom de la connexion socket, cause: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "Impossible d'obtenir le nom de l'autre ordinateur, cause: %s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "Impossible de récupérer le nom de l'hôte %s, cause: %s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "Impossible de se connecter à l'hôte %s, cause: %s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 "Impossible de vérifier si la connexion socket est inscriptible, cause: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "Impossible de vérifier si la connexion socket est lisible, cause: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "Impossible d'envoyer les données, cause: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "Impossible de recevoir les données, cause: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "Impossible de lire les données, cause: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Erreur de socket inconnue %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "Le fichier %s existe, mais %s n'existe pas"
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr "Taille du fichier %s invalide, taille=%d. Il devrait faire %d."
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "ID invalide=%d pour %s. Ça devrait être %d."
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2602,31 +2597,31 @@ msgstr ""
 "La validation du bloc a échoué. Hash=%d, décalage=%s, Hash attendu=%s, Hash ="
 "%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Téléchargement interrompu."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 "Le fichier %s est déjà en train d'être téléchargé par une autre commande."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "Somme de vérification insuffisante."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "Le Tracker a retourné le message d'alerte suivant: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 "Réception d'une quantité anormalement élevée de données (\"flood\") détectée."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -2635,52 +2630,52 @@ msgstr ""
 "Coupure de connexion demandée car aucune pièce ou message n'ont été "
 "échangées pendant un certain temps (%d secondes)."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 "Les informations du hash contenu dans le fichier torrent ne correspondent "
 "pas à celles du fichier .aria2 ."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "Aucune entrée de ce type %s"
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "La vitesse de téléchargement est trop lente: %d <= %d(B/s), hôte:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "Aucune en-tête trouvée."
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "Obtention du status %d, mais aucune en-tête de location proposée."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr "Champ de l'en-tête invalide. Requête: %s-%s/%s, Réponse: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "Aucun fichier ne correspond à votre préférence"
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "Exception détectée"
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 "La longueur maximale du \"payload\" est excédentaire ou invalide. Longueur = "
 "%u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2691,6 +2686,57 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr "La jonction du port a engendré des erreurs.\n"
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "doit impérativement être 'vrai' ou 'faux'"
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "doit être compris entre %s et %s"
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "doit être plus petit ou égal à %s"
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "doit être plus grand ou égal à %s"
+
+#~ msgid "must be a number."
+#~ msgstr "doit être un nombre."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "doit être plus petit ou égal à %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "doit être compris entre %.1f et %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "doit être plus grand ou égal à %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "doit être l'une de ces valeurs suivantes:"
+
+#~ msgid "Unrecognized format"
+#~ msgstr "Format non reconnu"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "type de proxy non reconnu"
+
+#~ msgid ""
+#~ " --direct-file-mapping=true|false Directly read from and write to each "
+#~ "file\n"
+#~ "                              mentioned in .torrent file."
+#~ msgstr ""
+#~ " --direct-file-mapping=true|false Lis et écris directement vers chaque "
+#~ "fichier\n"
+#~ "                              mentionné dans le fichier  .torrent."
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "Impossible d'ouvrir le fichier de segment %s, cause: %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "Impossible d'écrire dans le fichier de segment %s, cause: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "Impossible de lire à partir du fichier de segment %s, cause: %s"
+
 #~ msgid "CUID#%d - No segment available."
 #~ msgstr "CUID#%d - Pas de segment disponible."
 
diff --git a/po/he.po b/po/he.po
index be022172..bc122928 100644
--- a/po/he.po
+++ b/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: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+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"
@@ -18,30 +18,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr ""
 
@@ -57,57 +57,6 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "מוכרח להיות 'אמת' או 'שקר'."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "מוכרח להיות בטווח שבין %s ל-%s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "מוכרח להיות קטן או שווה ל-%s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "מוכרח להיות גדול או שווה ל-%s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "מוכרח להיות ערך מספרי."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "מוכרח להיות קטן או שווה ל-%.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "מוכרח להיות בטווח שבין %.1f ל- %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "מוכרח להיות גדול או שווה ל-%.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "מוכרח להיות אחד מהבאים:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "תבנית מתווך לא מוכרת"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "תבנית מתווך לא מוכרת"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -127,7 +76,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -318,7 +267,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -326,12 +275,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -407,7 +357,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -415,7 +365,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -428,7 +378,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -475,7 +425,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -518,12 +468,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -533,7 +477,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -543,7 +487,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -552,13 +496,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -573,7 +517,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -585,15 +529,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -603,19 +547,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -625,15 +569,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -646,20 +591,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -667,14 +612,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -688,34 +633,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -731,9 +676,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -741,11 +687,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -758,23 +704,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -786,30 +732,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -818,7 +764,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -829,7 +775,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -842,7 +788,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -872,7 +818,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -881,7 +827,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -891,7 +837,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -899,7 +845,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -910,7 +856,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -919,14 +865,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -938,14 +884,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -953,25 +899,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -981,7 +927,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -989,15 +935,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1007,7 +953,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1022,7 +968,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1035,7 +981,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1046,7 +992,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1062,47 +1008,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1111,7 +1058,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1119,7 +1066,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1127,7 +1074,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1149,18 +1096,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1177,7 +1124,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1189,7 +1136,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1199,18 +1146,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1220,45 +1167,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1268,7 +1215,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1285,7 +1232,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1298,11 +1245,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1313,11 +1260,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1327,7 +1274,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1339,14 +1286,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1363,7 +1310,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1372,21 +1319,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1395,7 +1342,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1404,7 +1351,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1412,19 +1359,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1435,7 +1382,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1448,7 +1395,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1506,26 +1453,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1539,13 +1486,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2048,199 +1995,184 @@ msgstr "%s אינו תיקיה."
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "שגיאה ביצירת התיקיה %s, סיבה: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "שגיאה בפתיחת קובץ המקטע %s, סיבה: %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "שגיאה בכתיבה לקובץ המקטע %s, סיבה: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "שגיאה בעת קריאה מקובץ המקטע %s, סיבה: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "שגיאה בפתיחת החיבור, סיבה: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "שגיאה בהגדרת אפשרויות החיבור, סיבה: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "שגיאה בהגדרת החיבור כחוסם, סיבה: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "שגיאה בהגדרת החיבור כלא חוסם, סיבה: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "שגיאה בקישור החיבור, סיבה: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "שגיאה בהאזנה לחיבור, סיבה: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "שגיאה בקבלת חיבור מהעמית, סיבה: %s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "שגיאה בקבלת שם החיבור, סיבה: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "שגיאת חיבור לא ידועה %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "הקובץ %s קיים, אך %s לא קיים."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr "מטען תכליתי קטן מדי עבור %s, גודל=%d."
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "ההורדה בוטלה."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "בדיקות שגויות."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "העוקב השיב בשגיאה מהסיבה: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "נתגלתה הצפה."
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2249,6 +2181,49 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "מוכרח להיות 'אמת' או 'שקר'."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "מוכרח להיות בטווח שבין %s ל-%s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "מוכרח להיות קטן או שווה ל-%s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "מוכרח להיות גדול או שווה ל-%s."
+
+#~ msgid "must be a number."
+#~ msgstr "מוכרח להיות ערך מספרי."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "מוכרח להיות קטן או שווה ל-%.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "מוכרח להיות בטווח שבין %.1f ל- %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "מוכרח להיות גדול או שווה ל-%.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "מוכרח להיות אחד מהבאים:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "תבנית מתווך לא מוכרת"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "תבנית מתווך לא מוכרת"
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "שגיאה בפתיחת קובץ המקטע %s, סיבה: %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "שגיאה בכתיבה לקובץ המקטע %s, סיבה: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "שגיאה בעת קריאה מקובץ המקטע %s, סיבה: %s"
+
 #~ msgid "CUID#%d - The download for one segment completed successfully."
 #~ msgstr "CUID#%d - הורדת מקטע אחד הושלמה בהצלחה."
 
diff --git a/po/hu.po b/po/hu.po
index 1f664554..a665ddae 100644
--- a/po/hu.po
+++ b/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: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+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"
@@ -18,30 +18,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr ""
 
@@ -57,57 +57,6 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "Az értéknek 'igaz'-nak vagy 'hamis'-nak kell lennie"
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:217
-#, 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:223
-#, 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:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "az értéknek számnak kell lennie"
-
-#: src/OptionHandlerImpl.h:295
-#, 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:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "az érték a következő lehet"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "értelmezhetetlen proxy formátum"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "értelmezhetetlen proxy formátum"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -127,7 +76,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -318,7 +267,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -326,12 +275,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -407,7 +357,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -415,7 +365,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -428,7 +378,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -475,7 +425,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -518,12 +468,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -533,7 +477,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -543,7 +487,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -552,13 +496,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -573,7 +517,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -585,15 +529,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -603,19 +547,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -625,15 +569,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -646,20 +591,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -667,14 +612,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -688,34 +633,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -731,9 +676,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -741,11 +687,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -758,23 +704,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -786,30 +732,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -818,7 +764,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -829,7 +775,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -842,7 +788,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -872,7 +818,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -881,7 +827,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -891,7 +837,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -899,7 +845,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -910,7 +856,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -919,14 +865,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -938,14 +884,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -953,25 +899,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -981,7 +927,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -989,15 +935,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1007,7 +953,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1022,7 +968,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1035,7 +981,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1046,7 +992,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1062,47 +1008,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1111,7 +1058,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1119,7 +1066,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1127,7 +1074,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1149,18 +1096,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1177,7 +1124,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1189,7 +1136,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1199,18 +1146,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1220,45 +1167,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1268,7 +1215,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1285,7 +1232,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1298,11 +1245,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1313,11 +1260,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1327,7 +1274,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1339,14 +1286,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1363,7 +1310,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1372,21 +1319,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1395,7 +1342,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1404,7 +1351,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1412,19 +1359,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1435,7 +1382,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1448,7 +1395,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1506,26 +1453,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1539,13 +1486,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2042,199 +1989,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2243,6 +2175,31 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "Az értéknek 'igaz'-nak vagy 'hamis'-nak kell lennie"
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "az értéknek kisebbnek vagy egyenlőnek kell lennie mint %s"
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "az értéknek nagyobbnak vagy egyenlőnek kell lennie mint %s"
+
+#~ msgid "must be a number."
+#~ msgstr "az értéknek számnak kell lennie"
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "az értéknek kisebbnek vagy egyenlőnek kell lennie mint %.1f"
+
+#~ msgid "must be one of the following:"
+#~ msgstr "az érték a következő lehet"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "értelmezhetetlen proxy formátum"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "értelmezhetetlen proxy formátum"
+
 #~ msgid "CUID#%d - The download for one segment completed successfully."
 #~ msgstr "CUID#%d - A szegmens letöltése sikeres."
 
diff --git a/po/id.po b/po/id.po
index 8a917ae1..9b481acc 100644
--- a/po/id.po
+++ b/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: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2009-03-05 06:58+0000\n"
 "Last-Translator: pepoluan <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -18,21 +18,21 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-03-13 14:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Memulai proses shutdown... Tekan Ctrl-C sekali lagi untuk mengakhiri segera."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Memulai proses shutdown darurat..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 akan melanjutkan unduh jika proses transfer dimulai kembali."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 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 ""
 "Jika terjadi error, silakan lihat berkas log. Lihat opsi '-l' pada laman "
 "help/man untuk keterangan lebih lanjut."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Hasil pengunduhan:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Legenda Status:"
 
@@ -60,57 +60,6 @@ msgstr "                              Tag: "
 msgid "                              Possible Values: "
 msgstr "                              Nilai-nilai yang dimungkinkan: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "harus diisi 'true' atau 'false'."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "harus diantara %s dan %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "harus lebih kecil atau sama dengan %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "harus lebih besar atau sama dengan %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "harus sebuah angka."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "harus lebih kecil atau sama dengan %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "harus diantara %.1f dan %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "harus lebih besar atau sama dengan %.1f"
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "harus berisi salah satu dari:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "format proxy tidak dikenali"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "format proxy tidak dikenali"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -135,8 +84,9 @@ msgstr ""
 "                              diisi dengan '-', log ditulis ke stdout."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -144,6 +94,14 @@ msgid ""
 "to\n"
 "                              \"/dev/null\"."
 msgstr ""
+" --allow-piece-length-change=true|false Jika false yang diberikan, aria2 "
+"akan\n"
+"                              membatalkan unduhan ketika satu bagian berbeda "
+"dengan\n"
+"                              yang ada di berkas kendali. Jika true yang "
+"diberikan, anda\n"
+"                              dapat melanjutkan tapi beberapa proses unduhan "
+"akan hilang."
 
 #: src/usage_text.h:50
 #, fuzzy
@@ -408,7 +366,7 @@ msgstr ""
 #: src/usage_text.h:150
 #, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -423,13 +381,15 @@ msgstr ""
 "akan hilang."
 
 #: src/usage_text.h:154
+#, fuzzy
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 " --allow-piece-length-change=true|false Jika false yang diberikan, aria2 "
 "akan\n"
@@ -558,8 +518,9 @@ msgstr ""
 "                              BitTorrent."
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -571,8 +532,9 @@ msgstr ""
 "                              bagian disediakan."
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -596,7 +558,8 @@ msgstr ""
 " -U, --user-agent=AGEN_PENGGUNA  Atur agen pengguna untuk unduhan http(s)."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc               Matikan dukungan netrc."
 
 #: src/usage_text.h:213
@@ -663,8 +626,9 @@ msgid ""
 msgstr ""
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -736,12 +700,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -760,7 +718,7 @@ msgstr ""
 "',' dan\n"
 "                              '-' dapat digunakan bersamaan."
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 #, fuzzy
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
@@ -776,7 +734,7 @@ msgstr ""
 "                              Anda dapat menggunakan K atau M(1K = 1024, 1M "
 "= 1024K)."
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -785,7 +743,7 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -794,7 +752,7 @@ msgstr ""
 "Lihat\n"
 "                              pula opsi --seed-ratio."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -809,7 +767,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -821,16 +779,16 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr " --enable-dht[=true|false]    Aktifkan fungsionalitas DHT."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 #, fuzzy
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
@@ -850,7 +808,7 @@ msgstr ""
 "',' dan\n"
 "                              '-' dapat digunakan bersamaan."
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -860,14 +818,14 @@ msgstr ""
 " --retry-wait=DET             Atur detik tunggu sebelum mencoba kembali\n"
 "                              setelah error terjadi."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 #, fuzzy
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 " --conf-path=ALAMAT             Ubah alamat berkas konfigurasi ke ALAMAT."
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -877,15 +835,25 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
+#, fuzzy
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
+" --allow-piece-length-change=true|false Jika false yang diberikan, aria2 "
+"akan\n"
+"                              membatalkan unduhan ketika satu bagian berbeda "
+"dengan\n"
+"                              yang ada di berkas kendali. Jika true yang "
+"diberikan, anda\n"
+"                              dapat melanjutkan tapi beberapa proses unduhan "
+"akan hilang."
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -898,20 +866,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -919,7 +887,7 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 #, fuzzy
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
@@ -928,7 +896,7 @@ msgid ""
 msgstr ""
 " -M, --metalink-file=BERKAS_METALINK Alamat berkas ke berkas .metalink."
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -942,35 +910,35 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSI   Versi berkas yang akan diunduh."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=BAHASA Bahasa dari berkas yang akan diunduh."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 " --metalink-os=OS             Sistem operasi dari berkas yang akan diunduh."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 #, fuzzy
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
@@ -999,21 +967,31 @@ msgstr ""
 "                              Jika false diberikan, tindakan di atas tidak "
 "dilakukan."
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
+#, fuzzy
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
 "                              Use --metalink-preferred-protocol option to\n"
 "                              specify the preference of protocol."
 msgstr ""
+" --auto-file-renaming[=true|false] Namai ulang nama berkas jika berkas yang "
+"sama\n"
+"                              telah ada. Opsi ini hanya bekerja dalam "
+"unduhan\n"
+"                              http(s)/ftp.\n"
+"                              Nama berkas baru memiliki titik dan nomor"
+"(1..9999)\n"
+"                              yang ditambahkan."
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Cetak nomor versi lalu keluar."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 #, fuzzy
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
@@ -1039,24 +1017,25 @@ msgstr ""
 "                              Opsi ini hanya berpengaruh pada unduhan\n"
 "                              BitTorrent."
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr " --no-conf                    Nonaktifkan memuat berkas aria2.conf."
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 " --conf-path=ALAMAT             Ubah alamat berkas konfigurasi ke ALAMAT."
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -1068,30 +1047,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -1100,7 +1079,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -1111,7 +1090,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -1124,7 +1103,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -1154,7 +1133,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -1163,7 +1142,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -1173,7 +1152,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -1181,7 +1160,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1192,7 +1171,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1201,14 +1180,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1220,14 +1199,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1235,25 +1214,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1263,7 +1242,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1271,20 +1250,20 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 #, fuzzy
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 " --ftp-user=PENGGUNA              Atur pengguna FTP. Ini mempengaruhi semua "
 "URL."
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 #, fuzzy
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 " --ftp-passwd=SANDI          Atur sandi FTP. Ini mempengaruhi semua URL."
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1294,7 +1273,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1309,7 +1288,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 #, fuzzy
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
@@ -1331,7 +1310,7 @@ msgstr ""
 "dari\n"
 "                              berkas ini."
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 #, fuzzy
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
@@ -1351,7 +1330,7 @@ msgstr ""
 "(1..9999)\n"
 "                              yang ditambahkan."
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 #, fuzzy
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
@@ -1380,12 +1359,12 @@ msgstr ""
 "                              Opsi ini hanya berpengaruh pada unduhan\n"
 "                              BitTorrent."
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 #, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1396,19 +1375,27 @@ msgstr ""
 "                              Anda dapat menggunakan K atau M(1K = 1024, 1M "
 "= 1024K)."
 
-#: src/usage_text.h:550
-msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
-msgstr ""
-
-#: src/usage_text.h:554
+#: src/usage_text.h:547
 #, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
+msgstr ""
+" --max-download-limit=KECEPATAN   Atur kecepatan unduh maksimal dalam byte "
+"per detik.\n"
+"                              0 berarti tidak dibatasi.\n"
+"                              Anda dapat menggunakan K atau M(1K = 1024, 1M "
+"= 1024K)."
+
+#: src/usage_text.h:552
+#, fuzzy
+msgid ""
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1418,11 +1405,11 @@ msgstr ""
 "                              Anda dapat menggunakan K atau M(1K = 1024, 1M "
 "= 1024K)."
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 #, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1433,13 +1420,12 @@ msgstr ""
 "                              Anda dapat menggunakan K atau M(1K = 1024, 1M "
 "= 1024K)."
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 #, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1460,7 +1446,7 @@ msgstr ""
 "                              Jika false diberikan, tindakan di atas tidak "
 "dilakukan."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1468,7 +1454,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 #, fuzzy
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
@@ -1482,7 +1468,7 @@ msgstr ""
 "seperti\n"
 "                              utilitas unduhan baris perintah biasa."
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1504,18 +1490,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 #, fuzzy
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
@@ -1545,7 +1531,7 @@ msgstr ""
 "                              Opsi ini hanya berpengaruh pada unduhan\n"
 "                              BitTorrent."
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1557,7 +1543,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 #, fuzzy
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
@@ -1576,19 +1562,19 @@ msgstr ""
 "                              dapat melanjutkan tapi beberapa proses unduhan "
 "akan hilang."
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 #, fuzzy
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr " --enable-dht[=true|false]    Aktifkan fungsionalitas DHT."
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 #, fuzzy
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
@@ -1607,52 +1593,52 @@ msgstr ""
 "                              dapat melanjutkan tapi beberapa proses unduhan "
 "akan hilang."
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 #, fuzzy
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 " --ftp-user=PENGGUNA              Atur pengguna FTP. Ini mempengaruhi semua "
 "URL."
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 #, fuzzy
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 " --ftp-passwd=SANDI          Atur sandi FTP. Ini mempengaruhi semua URL."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 #, fuzzy
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 " --ftp-passwd=SANDI          Atur sandi FTP. Ini mempengaruhi semua URL."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 #, fuzzy
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
@@ -1671,7 +1657,7 @@ msgstr ""
 "                              dapat melanjutkan tapi beberapa proses unduhan "
 "akan hilang."
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 #, fuzzy
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
@@ -1701,7 +1687,7 @@ msgstr ""
 "                              Jika false diberikan, tindakan di atas tidak "
 "dilakukan."
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1714,12 +1700,12 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 #, fuzzy
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr " -t, --timeout=DET            Atur tenggang waktu dalam detik."
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 #, fuzzy
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
@@ -1739,12 +1725,12 @@ msgstr ""
 "dari\n"
 "                              berkas ini."
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 #, fuzzy
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr " -t, --timeout=DET            Atur tenggang waktu dalam detik."
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1754,7 +1740,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 #, fuzzy
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
@@ -1775,14 +1761,14 @@ msgstr ""
 "dari\n"
 "                              berkas ini."
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1799,7 +1785,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 #, fuzzy
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
@@ -1817,17 +1803,17 @@ msgstr ""
 "                              dapat melanjutkan tapi beberapa proses unduhan "
 "akan hilang."
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 #, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1844,7 +1830,7 @@ msgstr ""
 "                              Jika false diberikan, tindakan di atas tidak "
 "dilakukan."
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 #, fuzzy
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
@@ -1858,7 +1844,7 @@ msgstr ""
 "                              cpu ketika mengalokasi berkas.\n"
 "                              Matikan jika anda mengalami error"
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 #, fuzzy
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
@@ -1876,7 +1862,7 @@ msgstr ""
 "                              dapat melanjutkan tapi beberapa proses unduhan "
 "akan hilang."
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1884,21 +1870,21 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 #, fuzzy
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 " --conf-path=ALAMAT             Ubah alamat berkas konfigurasi ke ALAMAT."
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 #, fuzzy
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
@@ -1918,7 +1904,7 @@ msgstr ""
 "dari\n"
 "                              berkas ini."
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1931,7 +1917,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1990,26 +1976,26 @@ msgstr "Opsi:"
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -2023,13 +2009,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "Baca halaman man untuk informasi selanjutnya."
 
@@ -2535,151 +2521,136 @@ msgstr "%s bukan direktori"
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "Gagal membuat direktori %s, penyebab: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "Gagal membuka segmen berkas %s, penyebab: %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "Gagal menulis ke segmen berkas %s, penyebab: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "Gagal membaca dari segmen berkas %s, penyebab: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "Gagal membuka soket, penyebab: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "Gagal mengatur opsi soket, penyebab: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "Gagal mengatur soket sebagai penghalang, penyebab: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "Gagal mengatur soket sebagai bukan penghalang, penyebab: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "Gagal mengikat soket, penyebab: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Gagal mendengarkan soket, penyebab: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "Gagal mendapatkan nama soket, penyebab: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "Gagal menyambung ke host %s, penyebab: %s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "Gagal memeriksa apakah soket dapat ditulis, penyebab: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "Gagal memeriksa apakah soket dapat dibaca, penyebab: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "Gagal mengirim data, penyebab: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "Gagal menerima data, penyebab: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "Gagal mengintip data, penyebab: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Galat soket %d tak diketahui (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "Berkas %s ada, tapi %s tidak ada"
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Unduh dibatalkan."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "Banjir terdeteksi."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -2688,49 +2659,49 @@ msgstr ""
 "Koneksi jatuh karena tak ada pesan permintaan/bagian yang ditukar dalam "
 "periode tertentu (%d detik)."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 "infoHash dalam berkas torrent tidak cocok dengan yang ada di berkas .aria2."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "Tak ada entri berkas %s"
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "Terlalu pelan kecepatan Unduh: %d <= %d(B/s), host:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "Tak ada HttpRequestEntry yang ditemukan."
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "Dapat status %d, tapi tak ada tajuk lokasi yang diberikan."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr "Rentang tajuk tidak sah. Permintaan: %s-%s/%s, Respon: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "Tidak ada berkas yang cocok dengan pilihan Anda."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "Pengecualian tertangkap"
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr "Panjang muatan maksimum terlampaui atau tidak sah. panjang = %u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2741,6 +2712,49 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr "Galat terjadi ketika mengikat pangkalan.\n"
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "harus diisi 'true' atau 'false'."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "harus diantara %s dan %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "harus lebih kecil atau sama dengan %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "harus lebih besar atau sama dengan %s."
+
+#~ msgid "must be a number."
+#~ msgstr "harus sebuah angka."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "harus lebih kecil atau sama dengan %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "harus diantara %.1f dan %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "harus lebih besar atau sama dengan %.1f"
+
+#~ msgid "must be one of the following:"
+#~ msgstr "harus berisi salah satu dari:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "format proxy tidak dikenali"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "format proxy tidak dikenali"
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "Gagal membuka segmen berkas %s, penyebab: %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "Gagal menulis ke segmen berkas %s, penyebab: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "Gagal membaca dari segmen berkas %s, penyebab: %s"
+
 #~ msgid "Certificate verification failed. Cause: %s"
 #~ msgstr "Verifikasi sertifikat gagal. Menyebabkan: %s"
 
diff --git a/po/it.po b/po/it.po
index 815b90a0..b182017a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-04-27 18:26+0000\n"
 "Last-Translator: Simone F. <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -19,22 +19,22 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Bookmarks: 81,324,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Sequenza di arresto in corso... Premere un'altra volta Ctrl-C per l'arresto "
 "d'emergenza."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Sequenza di arresto di emergenza avviata..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 continuerà a scaricare se il trasferimento verrà riavviato."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -42,11 +42,11 @@ msgstr ""
 "Se avvengono errori, controllare il file di log. Vedi l'opzione '-l' nella "
 "pagina di man/help per informazioni."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Riepilogo scaricamenti:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Legenda degli stati:"
 
@@ -62,57 +62,6 @@ msgstr "                              Etichette: "
 msgid "                              Possible Values: "
 msgstr "                              Valori possibili: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "deve essere 'true' (vero) o 'false' (falso)."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "deve essere compreso tra %s e %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "deve essere minore o uguale a %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "deve essere maggiore o uguale a %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "deve essere un numero."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "deve essere minore o uguale a %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "deve essere compreso tra %.1f e %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "deve essere maggiore o uguale a %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "deve essere uno dei seguenti:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "formato del proxy non riconosciuto"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "formato del proxy non riconosciuto"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -136,8 +85,9 @@ msgstr ""
 "                              il log viene riportato sullo stdout."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -467,8 +417,9 @@ msgstr ""
 "                              Disabilitare se si riscontrano errori"
 
 #: src/usage_text.h:150
+#, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -479,13 +430,15 @@ msgstr ""
 "                              l'opzione --auto-file-renaming."
 
 #: src/usage_text.h:154
+#, fuzzy
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 " --allow-piece-length-change=true|false\n"
 "                              Se impostato false, aria2 interrompe lo "
@@ -620,8 +573,9 @@ msgstr ""
 "                              di BitTorrent."
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -632,8 +586,9 @@ msgstr ""
 "                              checksum di controllo."
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -657,7 +612,8 @@ msgstr ""
 "http(s)"
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc               Disabilita il supporto per netrc."
 
 #: src/usage_text.h:213
@@ -732,8 +688,9 @@ msgstr ""
 "impostato a 0."
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -812,15 +769,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-" --direct-file-mapping=true|false\n"
-"                              Legge e scrive in modo diretto ciascun\n"
-"                              file nominato nel file .torrent."
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -840,7 +788,7 @@ msgstr ""
 "simboli ',' e '-'\n"
 "                              possono venire usati congiuntamente."
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -859,7 +807,7 @@ msgstr ""
 "per ciascun\n"
 "                              torrent, usa l'opzione --max-upload-limit."
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -877,7 +825,7 @@ msgstr ""
 "usa\n"
 "                              l'opzione --max-overall-upload-limit."
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -886,7 +834,7 @@ msgstr ""
 "minuti. Vedi anche\n"
 "                              l'opzione --seed-ratio."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -915,7 +863,7 @@ msgstr ""
 "delle\n"
 "                              condizioni si verifica."
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -937,18 +885,18 @@ msgstr ""
 "                              aggiunti i bytes mancanti fino a raggiungere "
 "la lunghezza di 20 bytes."
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 " --enable-peer-exchange[=true|false]\n"
 "                              Abilita l'estensione di scambio di peer."
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr " --enable-dht[=true|false]    Abilita la funzione DHT."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 #, fuzzy
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
@@ -968,7 +916,7 @@ msgstr ""
 "e '-'\n"
 "                              possono essere indicati congiuntamente."
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -979,7 +927,7 @@ msgstr ""
 "                              Configura l'host e la porta come punto\n"
 "                              di ingresso alla rete DHT."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 #, fuzzy
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
@@ -988,7 +936,7 @@ msgstr ""
 "                              Modifica la tabella di instradamento DHT come\n"
 "                              indicato in PERCORSO."
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -1005,9 +953,11 @@ msgstr ""
 "                              sceglierà quello sufficiente a soddisfare il "
 "livello indicato."
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
+#, fuzzy
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
@@ -1020,7 +970,7 @@ msgstr ""
 "l'offuscamento\n"
 "                              degli handshake."
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -1046,7 +996,7 @@ msgstr ""
 "                              Puoi posporre una K o una M(1K = 1024 byte, 1M "
 "= 1024K)."
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
@@ -1056,7 +1006,7 @@ msgstr ""
 "ogni\n"
 "                              scaricamento BitTorrent."
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
@@ -1065,7 +1015,7 @@ msgstr ""
 "                              Condivide i file già scaricati senza\n"
 "                              verificare gli hash delle parti."
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -1077,7 +1027,7 @@ msgstr ""
 "                              Vedere anche l'opzione --bt-request-peer-speed-"
 "limit."
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
@@ -1087,7 +1037,7 @@ msgstr ""
 "passa\n"
 "                              '-' viene letto l'input da stdin."
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -1114,25 +1064,25 @@ msgstr ""
 "maxconnections.\n"
 "                              Vedere anche le opzioni -s e -j."
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 " --metalink-version=VERSIONE\n"
 "                              La versione del file da scaricare."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 " --metalink-language=LINGUA\n"
 "                              La lingua del file da scaricare."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 " --metalink-os=SO             Il Sistema Operativo del file da scaricare."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
@@ -1144,7 +1094,7 @@ msgstr ""
 "separate da\n"
 "                              una virgola."
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
@@ -1155,7 +1105,7 @@ msgstr ""
 "                              Indicare 'none' se non c'è un protocollo "
 "preferito."
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -1186,9 +1136,11 @@ msgstr ""
 "above\n"
 "                              is not taken."
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
+#, fuzzy
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -1204,11 +1156,11 @@ msgstr ""
 "protocol\n"
 "                              per indicare la preferenza del protocollo."
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Mostra il numero di versione ed esce."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -1230,20 +1182,21 @@ msgstr ""
 "stampa tutte\n"
 "                              le opzioni che utilizzano quella parola.."
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 " --no-conf                    Disabilita il file di configurazione aria2."
 "conf."
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 " --conf-path=PERCORSO         Cambia il percorso del file di configurazione\n"
 "                              in PERCORSO."
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
@@ -1254,7 +1207,7 @@ msgstr ""
 "funzione\n"
 "                              viene disabilitata."
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -1274,23 +1227,23 @@ msgstr ""
 "\"X-A: b78\" --header=\"X-B: 9J1\"\n"
 "                              http://host/file"
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 " -q, --quiet[=true|false]     Rende aria2 silenzioso(nessun output su "
 "console)."
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr " --async-dns[=true|false]     Abilita il DNS asincrono."
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 " --ftp-reuse-connection[=true|false]\n"
 "                              Riutilizza la connessione per l'FTP."
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
@@ -1302,13 +1255,13 @@ msgstr ""
 "impostato a 0\n"
 "                              non verrà visualizzato alcun sommario."
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 " --log-level=LIVELLO          Imposta il LIVELLO di registro (log) "
 "visualizzato."
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -1322,7 +1275,7 @@ msgstr ""
 "applica al\n"
 "                              file locale."
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -1341,7 +1294,7 @@ msgstr ""
 "utilizzata\n"
 "                              l'opzione --timeout."
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -1362,7 +1315,7 @@ msgstr ""
 "                              Questa opzione ha effetto solo se sono in uso\n"
 "                              server HTTP/FTP."
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -1423,7 +1376,7 @@ msgstr ""
 "'feedback',\n"
 "                              userà un profilo di prestazioni dei server."
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -1437,7 +1390,7 @@ msgstr ""
 "                              caricare questo profilo con l'opzione --server-"
 "stat-if."
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -1453,7 +1406,7 @@ msgstr ""
 "'feedback'.\n"
 "                              Vedere anche l'opzione --uri-selector"
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -1465,7 +1418,7 @@ msgstr ""
 "prestazioni dei\n"
 "                              server affinché questo venga disabilitato."
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1484,7 +1437,7 @@ msgstr ""
 "                              che si interrompe, a prescindere da questa "
 "opzione."
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1498,7 +1451,7 @@ msgstr ""
 "key\n"
 "                              per indicare una chiave privata."
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 msgid ""
 " --private-key=FILE           Use the private key in FILE.\n"
 "                              The private key must be decrypted and in PEM\n"
@@ -1510,7 +1463,7 @@ msgstr ""
 "                              il formato PEM. Vedi anche l'opzione --"
 "certificate."
 
-#: src/usage_text.h:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1529,7 +1482,7 @@ msgstr ""
 "                              Usa l'opzione --check-certificate per "
 "abilitare il controllo."
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
@@ -1540,7 +1493,7 @@ msgstr ""
 "specificati\n"
 "                              tramite l'opzione --ca-certificate."
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1552,7 +1505,7 @@ msgstr ""
 "virgola,\n"
 "                              per i quali il proxy non deve essere usato."
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
@@ -1561,12 +1514,12 @@ msgstr ""
 " --use-head[=true|false]      Usa il metodo HEAD per la prima richiesta al\n"
 "                              server HTTP."
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 " --event-poll=POLL            Configura il metodo di 'polling' degli eventi."
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
@@ -1576,7 +1529,7 @@ msgstr ""
 "                               Specifica un numero di porta sulla quale il\n"
 "                               server XML-RPC sarà in ascolto."
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1593,7 +1546,7 @@ msgstr ""
 "passwd.\n"
 "                              Vedere anche l'opzione --xml-rpc-listen-port."
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1607,17 +1560,17 @@ msgstr ""
 "                              una richiesta maggiore di DIMENSIONE byte,\n"
 "                              termina la connessione."
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr " --xml-rpc-user=UTENTE        Imposta l'utente di XML-RPC."
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 " --xml-rpc-passwd=PASSWORD\n"
 "                              Imposta la password di XML-RPC."
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1634,7 +1587,7 @@ msgstr ""
 "indirizzo IP\n"
 "                              può andare bene."
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1660,7 +1613,7 @@ msgstr ""
 "autorizzazione verrà\n"
 "                              sempre inviata a prescindere da questa opzione."
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1682,7 +1635,7 @@ msgstr ""
 "                              l'opzione --dir. Puoi utilizzare l'opzione più "
 "volte."
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1700,7 +1653,7 @@ msgstr ""
 "                              Gli scaricamenti BitTorrent vengono annullati "
 "se si indica true."
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1725,11 +1678,12 @@ msgstr ""
 "risposta del\n"
 "                              tracker e del progresso di scaricamento."
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
+#, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1741,25 +1695,26 @@ msgstr ""
 "COMANDO.\n"
 "                              Vedere anche l'opzione --on-download-stop."
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
+#, fuzzy
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
-" --on-download-start=COMANDO\n"
-"                              Imposta il comando da eseguire quando\n"
-"                              il download comincia. COMANDO deve essere "
-"seguito\n"
-"                              da un solo argomento e il GID viene passato a "
-"COMANDO\n"
-"                              come primo argomento."
+" --on-download-pause=COMANDO  Imposta il comando da eseguire quando \n"
+"                              lo scaricamento è in pausa.\n"
+"                              Vedi l'opzione --on-download-start per l "
+"requisiti di COMANDO."
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
+#, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1768,10 +1723,11 @@ msgstr ""
 "                              Vedi l'opzione --on-download-start per l "
 "requisiti di COMANDO."
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
+#, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1784,12 +1740,12 @@ msgstr ""
 "                              sintassi del COMANDO.\n"
 "                              Vedere anche l'opzione --on-download-stop."
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
+#, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1812,7 +1768,7 @@ msgstr ""
 "requisiti\n"
 "                              del COMANDO."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1825,7 +1781,7 @@ msgstr ""
 "questa\n"
 "                              configurazione è disabilitata."
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1838,7 +1794,7 @@ msgstr ""
 "falso, ascolta solo\n"
 "                              sull'interfaccia di loopback locale."
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1860,18 +1816,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr " --disable-ipv6[=true|false]  Disabilita IPv6."
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1888,7 +1844,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1900,7 +1856,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1910,7 +1866,7 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
@@ -1921,11 +1877,11 @@ msgstr ""
 "                              in un formato comunemente comprensibile (p."
 "es., 1.2Ki, 3.4Mi)."
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr " --bt-enable-lpd[=true|false] Abilita la scoperta dei peer locali."
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1941,54 +1897,54 @@ msgstr ""
 "interface\n"
 "                              name and IP address."
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 " --all-proxy-user=UTENTE        Imposta l'utente per l'opzione --all-proxy."
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 " --all-proxy-passwd=PASSWD    Imposta la password per l'opzione --all-proxy."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 " --http-proxy-user=UTENTE       Imposta l'utente per l'opzione --http-proxy."
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 " --http-proxy-passwd=PASSWD   Imposta la password per l'opzione --http-proxy."
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 " --https-proxy-user=UTENTE      Imposta l'utente per l'opzione --https-proxy."
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 " --https-proxy-passwd=PASSWD  Imposta la password per l'opzione --https-"
 "proxy."
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 " --ftp-proxy-user=UTENTE        Imposta l'utente per l'opzione --ftp-proxy."
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 " --ftp-proxy-passwd=PASSWD    Imposta la password per l'opzione --ftp-proxy."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1998,7 +1954,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -2015,7 +1971,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -2028,11 +1984,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr " --bt-tracker-timeout=SEC     Imposta il timeout in secondi."
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -2043,11 +1999,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr " --dht-message-timeout=SEC    Imposta il timeout in secondi."
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -2057,7 +2013,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -2069,7 +2025,7 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 #, fuzzy
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
@@ -2080,7 +2036,7 @@ msgstr ""
 "ogni\n"
 "                              scaricamento BitTorrent."
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 #, fuzzy
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
@@ -2111,7 +2067,7 @@ msgstr ""
 "                              Puoi posporre una K o una M(1K = 1024 byte, 1M "
 "= 1024K)."
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 #, fuzzy
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
@@ -2126,17 +2082,17 @@ msgstr ""
 "applica al\n"
 "                              file locale."
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 #, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -2155,7 +2111,7 @@ msgstr ""
 "requisiti\n"
 "                              del COMANDO."
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 #, fuzzy
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
@@ -2170,7 +2126,7 @@ msgstr ""
 "                              durante l'allocazione dei file.\n"
 "                              Disabilitare se si riscontrano errori"
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 #, fuzzy
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
@@ -2187,7 +2143,7 @@ msgstr ""
 "l'offuscamento\n"
 "                              degli handshake."
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -2195,7 +2151,7 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 #, fuzzy
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
@@ -2206,7 +2162,7 @@ msgstr ""
 "                              Configura l'host e la porta come punto\n"
 "                              di ingresso alla rete DHT."
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 #, fuzzy
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
@@ -2215,7 +2171,7 @@ msgstr ""
 "                              Modifica la tabella di instradamento DHT come\n"
 "                              indicato in PERCORSO."
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -2226,7 +2182,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -2239,7 +2195,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -2298,26 +2254,26 @@ msgstr "Opzioni:"
 msgid "Printing options whose name includes '%s'."
 msgstr "Sono visualizzate le opzioni il cui nome include '%s'."
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr "Nessuna opzione corrispondente con '%s'."
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -2331,13 +2287,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "Fare riferimento alla pagina di manuale per ulteriori informazioni"
 
@@ -2850,123 +2806,108 @@ msgstr "%s non è una directory."
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "La creazione della directory %s è fallita, causa: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "Fallita l'apertura del file relativo al segmento %s, causa: %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "Fallita la scrittura sul file relativo al segmento %s, causa: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "Fallita la lettura dal file relativo al segmento %s, causa: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "Fallita l'apertura di un socket, causa: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "L'abilitazione di una opzione sul socket è fallita, causa: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "Il settaggio di un socket come bloccante è fallita, causa: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "Fallita l'impostazione di un socket a non-bloccante, causa: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "Il binding di un socket è fallito, causa: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Fallito l'ascolto su di un socket, causa: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "L'accettazione di una connessione da un peer è fallita, causa: %s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "Il recupero del nome del socket è fallito, causa: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "Il recupero del nome di un peer connesso è fallito, causa: %s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "La risoluzione del nome %s è fallita, causa :%s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "La connessione all'host %s è fallita, causa: %s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "Non sono riuscito a verificare che il socket sia scrivibile, causa: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "Non sono riuscito a verificare che il socket sia leggibile, causa: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "Invio dati fallito, causa: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "Ricezione dati fallita, causa: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "Reperimento dati fallito, causa: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Errore sconosciuto del socket %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "Il file %s esiste, ma %s non esiste."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 "Errata dimensione del payload per %s, dimensione=%d. Avrebbe dovuto essere %d"
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "ID=%d errato per %s. Dovrebbe essere %d."
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2975,29 +2916,29 @@ msgstr ""
 "Convalida del checksum della parte fallita. indiceChecksum=%d, offset=%s, "
 "hashAtteso=%s, hashAttuale=%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Scaricamento annullato."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "Il file %s viene scaricato già da un altro comando."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "Checksum insufficienti."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "Il tracker ha ritornato un messaggio di fallimento: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "Rilevato flooding."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -3006,50 +2947,50 @@ msgstr ""
 "La connessione è stata interrotta  in quanto nessun messaggio di richiesta o "
 "di parte sono stati scambiati in un certo periodo di tempo(%d secondi)."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr "L'infoHash nel file torrent è diverso da quello nel file .aria2."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "Nessun file con il nome %s"
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "Velocità di scaricamento troppo bassa: %d <= %d(B/s), host:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "Non è stata trovata la HttpRequestEntry."
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 "Ho ricevuto lo stato %d, ma nessun header di locazione è stato fornito."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 "Header con intervallo invalido. Richiesta: %s-%s/%s, Risposta: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "Nessun file riconosciuto con le tue preferenze."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "È stata rilevata un'eccezione."
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr "Lunghezza massima del payload superata o invalida. Lughezza = %u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -3060,5 +3001,73 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr "Ci sono stati degli errori durante il binding della porta.\n"
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "deve essere 'true' (vero) o 'false' (falso)."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "deve essere compreso tra %s e %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "deve essere minore o uguale a %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "deve essere maggiore o uguale a %s."
+
+#~ msgid "must be a number."
+#~ msgstr "deve essere un numero."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "deve essere minore o uguale a %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "deve essere compreso tra %.1f e %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "deve essere maggiore o uguale a %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "deve essere uno dei seguenti:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "formato del proxy non riconosciuto"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "formato del proxy non riconosciuto"
+
+#~ msgid ""
+#~ " --direct-file-mapping=true|false Directly read from and write to each "
+#~ "file\n"
+#~ "                              mentioned in .torrent file."
+#~ msgstr ""
+#~ " --direct-file-mapping=true|false\n"
+#~ "                              Legge e scrive in modo diretto ciascun\n"
+#~ "                              file nominato nel file .torrent."
+
+#~ msgid ""
+#~ " --on-download-start=COMMAND  Set the command to be executed when "
+#~ "download\n"
+#~ "                              starts up. COMMAND must take just one "
+#~ "argument and\n"
+#~ "                              GID is passed to COMMAND as a first "
+#~ "argument."
+#~ msgstr ""
+#~ " --on-download-start=COMANDO\n"
+#~ "                              Imposta il comando da eseguire quando\n"
+#~ "                              il download comincia. COMANDO deve essere "
+#~ "seguito\n"
+#~ "                              da un solo argomento e il GID viene passato "
+#~ "a COMANDO\n"
+#~ "                              come primo argomento."
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "Fallita l'apertura del file relativo al segmento %s, causa: %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "Fallita la scrittura sul file relativo al segmento %s, causa: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "Fallita la lettura dal file relativo al segmento %s, causa: %s"
+
 #~ msgid "Certificate verification failed. Cause: %s"
 #~ msgstr "Verifica certificato fallita. Causa: %s"
diff --git a/po/ja.po b/po/ja.po
index 3c86353c..880a40b9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2c 0.2.1\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2009-11-02 23:14+0900\n"
 "Last-Translator: Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-11-01 09:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "シャットダウン中です... 緊急時に即座にシャットダウンしたい場合は Ctrl-C をも"
 "う一度押してください."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "緊急シャットダウン中です..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 は次回, ダウンロードを再開します."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -41,11 +41,11 @@ msgstr ""
 "エラーが表示された場合, ログファイルを見てください. 詳しくはヘルプ/man ページ"
 "の '-l' オプションの項を見てください."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "ダウンロード結果:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "凡例:"
 
@@ -61,57 +61,6 @@ msgstr "                              タグ: "
 msgid "                              Possible Values: "
 msgstr "                              設定可能な値: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "は, 'true' または 'false' のどちらかで指定してください."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "は, %s と %s の間で指定してください."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "は, %s 以下で指定してください."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "は, %s 以上で指定してください."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "は, 数字でなければなりません."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "は, %.1f 以下で指定してください."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "は, %1.f と %.1f の間で指定してください."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "は, %.1f 以上で指定してください."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "は, 以下のいずれかを指定してください:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "サポートされていないプロキシーサーバーの指定形式です."
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "サポートされていないプロキシーサーバーの指定形式です."
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -138,8 +87,9 @@ msgstr ""
 "                              に出力します."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -460,7 +410,7 @@ msgstr ""
 #: src/usage_text.h:150
 #, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -476,13 +426,15 @@ msgstr ""
 "い."
 
 #: src/usage_text.h:154
+#, fuzzy
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 " --allow-piece-length-change=true|false ピース(セグメント)の長さ(ファイル分"
 "割\n"
@@ -631,8 +583,9 @@ msgstr ""
 "                              ドでのみ有効です."
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -644,8 +597,9 @@ msgstr ""
 "                              す."
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -667,7 +621,8 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr " -U, --user-agent=USER_AGENT  ユーザーエージェントを設定します."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc               netrc サポートを止めます."
 
 #: src/usage_text.h:213
@@ -746,8 +701,9 @@ msgstr ""
 "                              その有効期限値を 0 にして保存します."
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -828,15 +784,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-" --direct-file-mapping=true|false .torrent ファイル記載のファイルに直接読み書"
-"き\n"
-"                              します."
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -855,7 +802,7 @@ msgstr ""
 "う\n"
 "                              ことができます."
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -874,7 +821,7 @@ msgstr ""
 "                              torrent 毎の速度を制限するには,\n"
 "                              --max-upload-limit オプションを使用します."
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -893,7 +840,7 @@ msgstr ""
 "                              --max-overall-upload-limit オプションを使用しま"
 "す."
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -901,7 +848,7 @@ msgstr ""
 " --seed-time=MINUTES          シードを行う時間を分単位で指定します. \n"
 "                              --seed-ratio オプションも参照してください."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -928,7 +875,7 @@ msgstr ""
 "らか\n"
 "                              の条件が成立した時点でシードは終了となります."
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -949,16 +896,16 @@ msgstr ""
 "しま\n"
 "                              す."
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr " --enable-peer-exchange[=true|false] Peer Exchange を有効にします."
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr " --enable-dht[=true|false]    DHT を有効にします."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 #, fuzzy
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
@@ -976,7 +923,7 @@ msgstr ""
 "う\n"
 "                              ことができます."
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -987,13 +934,13 @@ msgstr ""
 "用\n"
 "                              するホストとポート番号を指定します."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 #, fuzzy
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr " --dht-file-path=PATH DHT ルーティングテーブルを PATH に保存します."
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -1010,9 +957,11 @@ msgstr ""
 "号化\n"
 "                              レベルが選択されます."
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
+#, fuzzy
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
@@ -1025,7 +974,7 @@ msgstr ""
 "い\n"
 "                              ます."
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -1048,7 +997,7 @@ msgstr ""
 "1024,\n"
 "                              1M = 1024K)."
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
@@ -1058,7 +1007,7 @@ msgstr ""
 "時に\n"
 "                              オープンするファイルの最大値を指定します."
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
@@ -1067,7 +1016,7 @@ msgstr ""
 "ま\n"
 "                              す."
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -1080,7 +1029,7 @@ msgstr ""
 "ショ\n"
 "                              ンも参照してください."
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 #, fuzzy
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
@@ -1088,7 +1037,7 @@ msgid ""
 "                              input from stdin when '-' is specified."
 msgstr " -M, --metalink-file=METALINK_FILE .metalink ファイルのパスを指定."
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -1114,15 +1063,15 @@ msgstr ""
 "                              maxconnections 属性の値を使います.\n"
 "                              -s と -j オプションも参照してください."
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   ダウンロードするファイルのバージョン."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE ダウンロードするファイルの言語."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
@@ -1130,7 +1079,7 @@ msgstr ""
 "レー\n"
 "                              ティング・システム."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
@@ -1139,7 +1088,7 @@ msgstr ""
 " --metalink-location=LOCATION[,...] お好みのサーバーの地域を指定します.\n"
 "                              コンマ区切りの地域のリストが指定可能です."
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
@@ -1151,7 +1100,7 @@ msgstr ""
 "定す\n"
 "                              してください."
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -1184,9 +1133,11 @@ msgstr ""
 "いま\n"
 "                              せん."
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
+#, fuzzy
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -1205,11 +1156,11 @@ msgstr ""
 "protocol\n"
 "                              オプションを使ってください."
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                バージョン番号を表示し, 終了します."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -1232,18 +1183,19 @@ msgstr ""
 "を名\n"
 "                              前に含むオプションのヘルプを表示します."
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 " --no-conf                    aria2.conf ファイルの読み込みを抑制します."
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 " --conf-path=PATH             読み込む設定ファイルのパスを PATH に変更します."
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
@@ -1253,7 +1205,7 @@ msgstr ""
 "す.\n"
 "                              0 を指定すると, この機能は無効になります."
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -1272,19 +1224,19 @@ msgstr ""
 "9J1\"\n"
 "                              http://host/file"
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr " -q, --quiet[=true|false]     コンソールに何も表示しないようにします."
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr " --async-dns[=true|false]     非同期 DNS を有効にします."
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr " --ftp-reuse-connection[=true|false] FTP で接続を再利用します."
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
@@ -1296,11 +1248,11 @@ msgstr ""
 "0\n"
 "                              を指定します."
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr " --log-level=LEVEL            出力するログレベルを指定します."
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -1312,7 +1264,7 @@ msgstr ""
 "し\n"
 "                              て保存したファイルの更新日付としてに使用します."
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -1327,7 +1279,7 @@ msgstr ""
 "                              で指定します. 接続完了後のタイムアウトは,\n"
 "                              --timeout で指定する値を使用します."
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -1351,7 +1303,7 @@ msgstr ""
 "有効\n"
 "                              です."
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -1416,7 +1368,7 @@ msgstr ""
 "ファ\n"
 "                              イルを使用します."
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -1431,7 +1383,7 @@ msgstr ""
 "で\n"
 "                              きます."
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -1446,7 +1398,7 @@ msgstr ""
 "                              'feedback' 等の URI セレクターで使用されます.\n"
 "                              --uri-selector オプションを参照してください."
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -1461,7 +1413,7 @@ msgstr ""
 "ま\n"
 "                              す."
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1480,7 +1432,7 @@ msgstr ""
 "                              aria2 は終了時にコントロールファイルを保存しま"
 "す."
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1495,7 +1447,7 @@ msgstr ""
 "定\n"
 "                              します."
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 msgid ""
 " --private-key=FILE           Use the private key in FILE.\n"
 "                              The private key must be decrypted and in PEM\n"
@@ -1509,7 +1461,7 @@ msgstr ""
 "して\n"
 "                              ください."
 
-#: src/usage_text.h:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1529,7 +1481,7 @@ msgstr ""
 "効に\n"
 "                              します."
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
@@ -1539,7 +1491,7 @@ msgstr ""
 "を\n"
 "                              使ってピアを検証します."
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 #, fuzzy
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
@@ -1551,7 +1503,7 @@ msgstr ""
 "をコ\n"
 "                              ンマで区切って指定します."
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
@@ -1560,20 +1512,20 @@ msgstr ""
 " --use-head[=true|false]      HTTP サーバーへの最初のリクエストに HEAD を使い"
 "ます."
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 " --event-poll=POLL            イベントを検出する方法 (システム コール) を指定"
 "します."
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr " --xml-rpc-listen-port=PORT   XML-RPC で使うポート番号を指定します."
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1591,7 +1543,7 @@ msgstr ""
 "さい\n"
 "                              ."
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1604,15 +1556,15 @@ msgstr ""
 "解除\n"
 "                              します."
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr " --xml-rpc-user=USER          XML-RPC ユーザーを設定します."
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr " --xml-rpc-passwd=PASSWD      XML-RPC パスワードを設定します."
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1627,7 +1579,7 @@ msgstr ""
 "ど\n"
 "                              のような IP アドレスでも受け付けます."
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1653,7 +1605,7 @@ msgstr ""
 "関わ\n"
 "                              らず常に送信されます."
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1677,7 +1629,7 @@ msgstr ""
 "も使\n"
 "                              うことができます."
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1697,7 +1649,7 @@ msgstr ""
 "合,\n"
 "                              BitTorrent ダウンロードはキャンセルされます."
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1725,11 +1677,12 @@ msgstr ""
 "隔を\n"
 "                              決定します."
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
+#, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1741,24 +1694,28 @@ msgstr ""
 "stop\n"
 "                              オプションも参照してください."
 
-#: src/usage_text.h:550
-msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
-msgstr ""
-" --on-download-start=COMMAND  ダウンロード開始時に実行するコマンドを指定しま"
-"す.\n"
-"                              COMMAND は引数を一つ取るものでなければなりませ"
-"ん.\n"
-"                              GID が引数として渡されます."
-
-#: src/usage_text.h:554
+#: src/usage_text.h:547
 #, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
+msgstr ""
+" --on-download-complete=COMMAND ダウンロード完了時に実行するコマンドを指定し"
+"ます.\n"
+"                              COMMAND の制限については, --on-download-start\n"
+"                              オプションを参照してください. --on-download-"
+"stop\n"
+"                              オプションも参照してください."
+
+#: src/usage_text.h:552
+#, fuzzy
+msgid ""
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1769,10 +1726,11 @@ msgstr ""
 "stop\n"
 "                              オプションも参照してください."
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
+#, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1785,12 +1743,12 @@ msgstr ""
 "stop\n"
 "                              オプションも参照してください."
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
+#, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1813,7 +1771,7 @@ msgstr ""
 "                              COMMAND の制限については, --on-download-start\n"
 "                              オプションを参照してください."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1828,7 +1786,7 @@ msgstr ""
 "るこ\n"
 "                              とができます."
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1843,7 +1801,7 @@ msgstr ""
 "受\n"
 "                              け付ける."
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1865,18 +1823,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 #, fuzzy
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
@@ -1905,7 +1863,7 @@ msgstr ""
 "ロー\n"
 "                              ドでのみ有効です."
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1917,7 +1875,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 #, fuzzy
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
@@ -1933,19 +1891,19 @@ msgstr ""
 "                              'feedback' 等の URI セレクターで使用されます.\n"
 "                              --uri-selector オプションを参照してください."
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 #, fuzzy
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr " --enable-dht[=true|false]    DHT を有効にします."
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 #, fuzzy
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
@@ -1962,7 +1920,7 @@ msgstr ""
 "定\n"
 "                              します."
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 #, fuzzy
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
@@ -1971,37 +1929,37 @@ msgstr ""
 " --use-head[=true|false]      HTTP サーバーへの最初のリクエストに HEAD を使い"
 "ます."
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 #, fuzzy
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr " --xml-rpc-user=USER          XML-RPC ユーザーを設定します."
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 #, fuzzy
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr " --xml-rpc-passwd=PASSWD      XML-RPC パスワードを設定します."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 #, fuzzy
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
@@ -2009,7 +1967,7 @@ msgstr ""
 "ション\n"
 "                              はすべての URL に影響します."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 #, fuzzy
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
@@ -2033,7 +1991,7 @@ msgstr ""
 "も\n"
 "                              しれません."
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 #, fuzzy
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
@@ -2068,7 +2026,7 @@ msgstr ""
 "せ\n"
 "                              ん."
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -2081,12 +2039,12 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 #, fuzzy
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr " -t, --timeout=SEC            タイムアウトとなる時間を秒で指定します."
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 #, fuzzy
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
@@ -2102,12 +2060,12 @@ msgstr ""
 "                              で指定します. 接続完了後のタイムアウトは,\n"
 "                              --timeout で指定する値を使用します."
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 #, fuzzy
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr " -t, --timeout=SEC            タイムアウトとなる時間を秒で指定します."
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -2117,7 +2075,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 #, fuzzy
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
@@ -2138,7 +2096,7 @@ msgstr ""
 "効に\n"
 "                              します."
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 #, fuzzy
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
@@ -2149,7 +2107,7 @@ msgstr ""
 "時に\n"
 "                              オープンするファイルの最大値を指定します."
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 #, fuzzy
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
@@ -2177,7 +2135,7 @@ msgstr ""
 "1024,\n"
 "                              1M = 1024K)."
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 #, fuzzy
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
@@ -2190,17 +2148,17 @@ msgstr ""
 "し\n"
 "                              て保存したファイルの更新日付としてに使用します."
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 #, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -2219,7 +2177,7 @@ msgstr ""
 "                              COMMAND の制限については, --on-download-start\n"
 "                              オプションを参照してください."
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 #, fuzzy
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
@@ -2233,7 +2191,7 @@ msgstr ""
 "                              ファイル領域確保中の CPU 利用率が下がります.\n"
 "                              エラーが発生する場合は, 無効にしてください."
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 #, fuzzy
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
@@ -2250,7 +2208,7 @@ msgstr ""
 "い\n"
 "                              ます."
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -2258,7 +2216,7 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 #, fuzzy
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
@@ -2269,13 +2227,13 @@ msgstr ""
 "用\n"
 "                              するホストとポート番号を指定します."
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 #, fuzzy
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr " --dht-file-path=PATH DHT ルーティングテーブルを PATH に保存します."
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 #, fuzzy
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
@@ -2291,7 +2249,7 @@ msgstr ""
 "                              で指定します. 接続完了後のタイムアウトは,\n"
 "                              --timeout で指定する値を使用します."
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -2304,7 +2262,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -2365,12 +2323,12 @@ msgstr "オプション:"
 msgid "Printing options whose name includes '%s'."
 msgstr "'%s' を含むオプションを表示しています."
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr "'%s' にマッチするオプションが見つかりませんでした."
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 #, fuzzy
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
@@ -2381,7 +2339,7 @@ msgstr ""
 " URL が同じファイルをさしている必要があります. そうでない場合, ダウ\n"
 " ンロードは失敗します."
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 #, fuzzy
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
@@ -2394,7 +2352,7 @@ msgstr ""
 "ま\n"
 " す."
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 #, fuzzy
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
@@ -2419,7 +2377,7 @@ msgstr ""
 "'path'\n"
 " が URL に追加されて, それぞれのファイルの URL を形成します."
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 #, fuzzy
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
@@ -2429,7 +2387,7 @@ msgstr ""
 "たは\n"
 " \" で囲って(クォートして)ください."
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "より詳しい情報は man ページを参照してください."
 
@@ -2948,127 +2906,112 @@ msgstr "%s はディレクトリではありません."
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "ディレクトリ %s を作成できませんでした. 原因: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "コントロールファイル %s をオープンできませんでした. 原因: %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "コントロールファイル %s への書き込みに失敗しました. 原因: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "コントロールファイル %s からの読み込みに失敗しました. 原因: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "ソケットをオープンできませんでした. 原因: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "ソケットのオプションの設定に失敗しました. 原因: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "ソケットをブロッキングモードにすることに失敗しました. 原因: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "ソケットをノンブロッキングモードにすることに失敗しました. 原因: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "ソケットの bind に失敗しました. 原因: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "ソケットの listen に失敗しました. 原因: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "ピアからの接続の受付に失敗しました. 原因: %s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "ソケットの名前の取得に失敗しました. 原因: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "接続ピアの名前の取得に失敗しました. 原因: %s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "ホスト名 %s のアドレス解決に失敗しました. 原因: %s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "ホスト %s への接続に失敗しました. 原因: %s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 "ソケットへデータを書き込み可能かどうかのチェックに失敗しました. 原因: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 "ソケットからデータを読みとり可能かどうかのチェックに失敗しました. 原因: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "データの送信に失敗しました. 原因: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "データの受信に失敗しました. 原因: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "データの peek に失敗しました. 原因: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "未定義のソケットエラー %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 "ファイル %s が存在しますが, それに対応するセグメントファイル %s が存在しませ"
 "ん."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 "%s に対するペイロードサイズが不正です. 実際のサイズ:%d 期待するサイズ:%d"
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "ID %d は %s に対して使用できません. 期待する ID:%d"
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -3077,29 +3020,29 @@ msgstr ""
 "部分チェックサムの検証が失敗しました. チェックサムインデックス=%d, オフセット"
 "=%s, 期待するハッシュ値:%s, 実際のハッシュ値:%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "ダウンロードを中止します."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "ファイル %s は他のコマンドがダウンロード中です."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "チェックサムが足りません."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "トラッカーがエラーを返しました: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "フラッディング (いわゆる荒らし行為) を検出しました."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -3108,49 +3051,49 @@ msgstr ""
 "一定期間 (%d 秒) request/piece メッセージの交換がなされていないので, 接続を閉"
 "じます."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 "torrent ファイル中の infoHash と .aria2 ファイル中のそれが一致しません."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "ファイルエントリー %s は存在しません."
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "ダウンロード速度が遅すぎます: %d <= %d(B/s), host:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "HttpRequestEntry が見つかりません."
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "ステータス %d を受けとりましたが, location ヘッダーが見つかりません."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr "range ヘッダーの値が不正です. 要求: %s-%s/%s, 応答: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "検索条件に合致するファイルが見つかりません."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "例外発生"
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr "ペイロード長が許容最大値を越えているか, 不正です. ペイロード長 = %u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -3160,6 +3103,72 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr "ポートをバインド中にエラーが発生しました.\n"
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "は, 'true' または 'false' のどちらかで指定してください."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "は, %s と %s の間で指定してください."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "は, %s 以下で指定してください."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "は, %s 以上で指定してください."
+
+#~ msgid "must be a number."
+#~ msgstr "は, 数字でなければなりません."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "は, %.1f 以下で指定してください."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "は, %1.f と %.1f の間で指定してください."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "は, %.1f 以上で指定してください."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "は, 以下のいずれかを指定してください:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "サポートされていないプロキシーサーバーの指定形式です."
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "サポートされていないプロキシーサーバーの指定形式です."
+
+#~ msgid ""
+#~ " --direct-file-mapping=true|false Directly read from and write to each "
+#~ "file\n"
+#~ "                              mentioned in .torrent file."
+#~ msgstr ""
+#~ " --direct-file-mapping=true|false .torrent ファイル記載のファイルに直接読"
+#~ "み書き\n"
+#~ "                              します."
+
+#~ msgid ""
+#~ " --on-download-start=COMMAND  Set the command to be executed when "
+#~ "download\n"
+#~ "                              starts up. COMMAND must take just one "
+#~ "argument and\n"
+#~ "                              GID is passed to COMMAND as a first "
+#~ "argument."
+#~ msgstr ""
+#~ " --on-download-start=COMMAND  ダウンロード開始時に実行するコマンドを指定し"
+#~ "ます.\n"
+#~ "                              COMMAND は引数を一つ取るものでなければなりま"
+#~ "せん.\n"
+#~ "                              GID が引数として渡されます."
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "コントロールファイル %s をオープンできませんでした. 原因: %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "コントロールファイル %s への書き込みに失敗しました. 原因: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "コントロールファイル %s からの読み込みに失敗しました. 原因: %s"
+
 #~ msgid "Certificate verification failed. Cause: %s"
 #~ msgstr "証明書の検証が失敗しました. 原因: %s"
 
diff --git a/po/ko.po b/po/ko.po
index 1ed8aa3a..fb08b872 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-05-30 06:00+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-06-04 12:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr "종료 중입니다 ... 비상시에 즉시 종료하려면 : Ctrl-C를 다시 누르십시오."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "긴급 종료 중입니다 ..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2는 다음 다운로드를 다시 시작합니다."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -39,11 +39,11 @@ msgstr ""
 "오류가 발생하면 로그 파일을 보십시오. 자세한 내용은 help/man 페이지의 '-l' 옵"
 "션 항목을 보십시오."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "다운로드 결과:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "상태 설명:"
 
@@ -59,57 +59,6 @@ msgstr "                              태그: "
 msgid "                              Possible Values: "
 msgstr "                              가능한 값: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "'true' 또는 'false'중 하나를 지정하십시오."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "%s 와 %s 사이어야 함."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "보다 작거나 %s와 같아야 함."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "크거나 %s와 같아야 함."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "숫자 이어야 함."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "보다 작거나 %.1f와 같아야 함."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "%1.f 및 %.1f 사이에서 지정합니다."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "%.1f 이상 이어야 합니다."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "다음 중 하나 이어야 함:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "인식되지 않은 프락시 형식"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "인식되지 않은 프락시 형식"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -130,8 +79,9 @@ msgstr ""
 "                              지정하면 표준 출력,  출력합니다."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -338,7 +288,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -346,12 +296,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -427,7 +378,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -435,7 +386,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -448,7 +399,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -495,7 +446,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -538,12 +489,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -553,7 +498,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -563,7 +508,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -572,13 +517,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -593,7 +538,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -605,15 +550,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -623,19 +568,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -645,15 +590,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -666,20 +612,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -687,14 +633,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -708,34 +654,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -751,9 +697,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -761,11 +708,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -778,23 +725,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -806,30 +753,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -838,7 +785,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -849,7 +796,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -862,7 +809,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -892,7 +839,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -901,7 +848,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -911,7 +858,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -919,7 +866,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -930,7 +877,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -939,14 +886,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -958,14 +905,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -973,25 +920,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1001,7 +948,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1009,15 +956,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1027,7 +974,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1042,7 +989,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1055,7 +1002,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1066,7 +1013,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1082,47 +1029,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1131,7 +1079,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1139,7 +1087,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1147,7 +1095,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1169,18 +1117,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1197,7 +1145,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1209,7 +1157,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1219,18 +1167,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1240,45 +1188,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1288,7 +1236,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1305,7 +1253,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1318,11 +1266,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1333,11 +1281,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1347,7 +1295,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1359,14 +1307,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1383,7 +1331,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1392,21 +1340,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1415,7 +1363,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1424,7 +1372,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1432,19 +1380,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1455,7 +1403,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1468,7 +1416,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1526,26 +1474,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1559,13 +1507,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2062,199 +2010,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2262,3 +2195,37 @@ msgstr ""
 #: src/BtSetup.cc:212
 msgid "Errors occurred while binding port.\n"
 msgstr ""
+
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "'true' 또는 'false'중 하나를 지정하십시오."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "%s 와 %s 사이어야 함."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "보다 작거나 %s와 같아야 함."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "크거나 %s와 같아야 함."
+
+#~ msgid "must be a number."
+#~ msgstr "숫자 이어야 함."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "보다 작거나 %.1f와 같아야 함."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "%1.f 및 %.1f 사이에서 지정합니다."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "%.1f 이상 이어야 합니다."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "다음 중 하나 이어야 함:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "인식되지 않은 프락시 형식"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "인식되지 않은 프락시 형식"
diff --git a/po/nl.po b/po/nl.po
index 14b418fc..de9bbb0c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2008-03-03 14:10+0000\n"
 "Last-Translator: Joram Pereira <joramrp@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -18,30 +18,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-03-15 07:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr ""
 
@@ -57,56 +57,6 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "moet tussen %s en %s zitten."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "moet kleiner dan of gelijk aan %s zijn."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "moet groter dan of gelijk aan %s zijn."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "moet een nummer zijn"
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "moet kleiner of gelijk aan %.1f zijn."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "moet tussen %.1f en %.1f zitten."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "moet groter of gelijk aan %.1f zijn."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "moet een van de volgende zijn"
-
-#: src/OptionHandlerImpl.h:529
-msgid "Unrecognized format"
-msgstr ""
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr ""
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -127,7 +77,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -318,7 +268,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -326,12 +276,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -407,7 +358,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -415,7 +366,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -428,7 +379,8 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc Schakel netrc ondersteuning uit."
 
 #: src/usage_text.h:213
@@ -479,7 +431,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -522,12 +474,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -537,7 +483,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -547,7 +493,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -556,13 +502,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -577,7 +523,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -589,15 +535,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -607,7 +553,7 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -618,12 +564,12 @@ msgstr ""
 "                              connectie mee te maken.\n"
 "                              Standaard: 5"
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -633,15 +579,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -654,7 +601,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 #, fuzzy
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
@@ -665,13 +612,13 @@ msgstr ""
 "                              connectie mee te maken.\n"
 "                              Standaard: 5"
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 #, fuzzy
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
@@ -683,7 +630,7 @@ msgstr ""
 "                              connectie mee te maken.\n"
 "                              Standaard: 5"
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 #, fuzzy
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
@@ -692,7 +639,7 @@ msgid ""
 msgstr ""
 " -M, --metalink-file=METALINK_BESTAND Het pad naar het .metalink bestand."
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -706,34 +653,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSIE De versie van het te downloaden betand."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=TAAL De taal van het te downloaden bestand."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr " --metalink-os=OS Het besturingssysteem van het te downloaden bestand."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -749,9 +696,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -759,11 +707,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version Toon het versie nummer en sluit."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -776,23 +724,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -804,30 +752,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -836,7 +784,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -847,7 +795,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -860,7 +808,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -890,7 +838,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -899,7 +847,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -909,7 +857,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -917,7 +865,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -928,7 +876,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -937,14 +885,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -956,14 +904,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -971,18 +919,18 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 #, fuzzy
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
@@ -993,7 +941,7 @@ msgstr ""
 "                              connectie mee te maken.\n"
 "                              Standaard: 5"
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1003,7 +951,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1011,15 +959,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1029,7 +977,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1044,7 +992,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1057,7 +1005,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1068,7 +1016,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1084,47 +1032,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1133,7 +1082,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1141,7 +1090,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1149,7 +1098,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1171,18 +1120,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1199,7 +1148,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1211,7 +1160,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1221,18 +1170,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1242,45 +1191,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1290,7 +1239,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1307,7 +1256,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1320,11 +1269,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1335,11 +1284,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1349,7 +1298,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1361,7 +1310,7 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 #, fuzzy
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
@@ -1372,7 +1321,7 @@ msgstr ""
 "                              connectie mee te maken.\n"
 "                              Standaard: 5"
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1389,7 +1338,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1398,21 +1347,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1421,7 +1370,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1430,7 +1379,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1438,7 +1387,7 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 #, fuzzy
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
@@ -1449,12 +1398,12 @@ msgstr ""
 "                              connectie mee te maken.\n"
 "                              Standaard: 5"
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1465,7 +1414,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1478,7 +1427,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1537,26 +1486,26 @@ msgstr "Opties:"
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1570,13 +1519,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2079,199 +2028,184 @@ msgstr "%s is geen map."
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "Kon socket niet openen, oorzaak: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Kon niet luisteren op socket, oorzaak: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Download afgebroken."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2280,6 +2214,30 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 
+#~ msgid "must be between %s and %s."
+#~ msgstr "moet tussen %s en %s zitten."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "moet kleiner dan of gelijk aan %s zijn."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "moet groter dan of gelijk aan %s zijn."
+
+#~ msgid "must be a number."
+#~ msgstr "moet een nummer zijn"
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "moet kleiner of gelijk aan %.1f zijn."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "moet tussen %.1f en %.1f zitten."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "moet groter of gelijk aan %.1f zijn."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "moet een van de volgende zijn"
+
 #~ msgid "CUID#%d - The download for one segment completed successfully."
 #~ msgstr "CUID#%d - Het downloaden van een segment is voltooid."
 
diff --git a/po/nn.po b/po/nn.po
index 53739ba1..363ead56 100644
--- a/po/nn.po
+++ b/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: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2009-03-17 21:14+0000\n"
 "Last-Translator: Tor Christian Tovslid <tctovsli@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-01 11:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr "Avsluttingssekvens undervegs... Trykk Ctrl-C att for nødavslutning."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Nødavslutning undervegs..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 vil fortsette nedlastinga dersom overføringa vert omstarta."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -39,11 +39,11 @@ msgstr ""
 "Dersom det er nokon feil, sjå loggfila. Sjå '-l' val i hjelp/manual for "
 "detaljar."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Nedlastingsresultat:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Statusforklaring:"
 
@@ -59,57 +59,6 @@ msgstr "                              Taggar: "
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "må anten vere 'true' eller 'false'."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "må vere mellom %s og %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "må vere mindre enn eller lik %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "må vere større enn eller lik %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "må vere eit nummer."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "må vere mindre enn eller lik %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "må vere mellom %.1f og %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "må vere større eller lik %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "må vere ein av følgande:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "ugjenkjenneleg proxyformat"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "ugjenkjenneleg proxyformat"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -129,7 +78,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -320,7 +269,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -328,12 +277,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -409,7 +359,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -417,7 +367,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -430,7 +380,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -477,7 +427,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -520,12 +470,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -535,7 +479,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -545,7 +489,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -554,13 +498,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -575,7 +519,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -587,15 +531,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -605,19 +549,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -627,15 +571,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -648,20 +593,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -669,14 +614,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -690,34 +635,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -733,9 +678,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -743,11 +689,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -760,23 +706,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -788,30 +734,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -820,7 +766,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -831,7 +777,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -844,7 +790,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -874,7 +820,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -883,7 +829,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -893,7 +839,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -901,7 +847,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -912,7 +858,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -921,14 +867,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -940,14 +886,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -955,25 +901,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -983,7 +929,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -991,15 +937,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1009,7 +955,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1024,7 +970,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1037,7 +983,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1048,7 +994,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1064,47 +1010,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1113,7 +1060,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1121,7 +1068,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1129,7 +1076,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1151,18 +1098,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1179,7 +1126,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1191,7 +1138,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1201,18 +1148,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1222,45 +1169,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1270,7 +1217,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1287,7 +1234,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1300,11 +1247,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1315,11 +1262,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1329,7 +1276,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1341,14 +1288,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1365,7 +1312,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1374,21 +1321,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1397,7 +1344,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1406,7 +1353,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1414,19 +1361,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1437,7 +1384,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1450,7 +1397,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1508,26 +1455,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1541,13 +1488,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2044,199 +1991,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2245,6 +2177,40 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "må anten vere 'true' eller 'false'."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "må vere mellom %s og %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "må vere mindre enn eller lik %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "må vere større enn eller lik %s."
+
+#~ msgid "must be a number."
+#~ msgstr "må vere eit nummer."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "må vere mindre enn eller lik %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "må vere mellom %.1f og %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "må vere større eller lik %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "må vere ein av følgande:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "ugjenkjenneleg proxyformat"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "ugjenkjenneleg proxyformat"
+
 #~ msgid "CUID#%d - The download for one segment completed successfully."
 #~ msgstr "CUID#%d - Nedlastinga av eit segment er vellykka fullført."
 
diff --git a/po/pl.po b/po/pl.po
index 85067b54..9a81dc9f 100644
--- a/po/pl.po
+++ b/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: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-07-13 17:50+0000\n"
 "Last-Translator: Twojwujaszek <twojwujaszek@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -18,31 +18,31 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-08-29 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Kończenie... Wciśnij Ctrl-C ponownie aby wykonać awaryjne zakończenie ."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Kończenie awaryjne..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 wznowi pobieranie jeśli transfer zostanie zrestartowany."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Wyniki Pobierania:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Legenda Statusu:"
 
@@ -58,56 +58,6 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "musisz wpisać \"true\" (ang. prawda) lub \"false\" (ang. fałsz)"
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "musi zawierać wartość między %s a %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "musi być mniejsze, lub równe %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "musi być większe, lub równe %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "musi być mniejsze lub równe %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "musi zawierać wartość między %.1f a %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "musi być większe, lub równe %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "musi być jednym z wymienionych"
-
-#: src/OptionHandlerImpl.h:529
-msgid "Unrecognized format"
-msgstr ""
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr ""
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -127,7 +77,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -318,7 +268,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -326,12 +276,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -407,7 +358,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -415,7 +366,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -428,7 +379,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -475,7 +426,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -518,12 +469,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -533,7 +478,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -543,7 +488,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -552,13 +497,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -573,7 +518,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -585,15 +530,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -603,19 +548,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -625,15 +570,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -646,20 +592,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -667,14 +613,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -688,34 +634,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -731,9 +677,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -741,11 +688,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -758,23 +705,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -786,30 +733,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -818,7 +765,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -829,7 +776,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -842,7 +789,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -872,7 +819,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -881,7 +828,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -891,7 +838,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -899,7 +846,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -910,7 +857,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -919,14 +866,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -938,14 +885,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -953,25 +900,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -981,7 +928,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -989,15 +936,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1007,7 +954,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1022,7 +969,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1035,7 +982,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1046,7 +993,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1062,47 +1009,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1111,7 +1059,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1119,7 +1067,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1127,7 +1075,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1149,18 +1097,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1177,7 +1125,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1189,7 +1137,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1199,18 +1147,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1220,45 +1168,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1268,7 +1216,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1285,7 +1233,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1298,11 +1246,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1313,11 +1261,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1327,7 +1275,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1339,14 +1287,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1363,7 +1311,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1372,21 +1320,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1395,7 +1343,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1404,7 +1352,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1412,19 +1360,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1435,7 +1383,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1448,7 +1396,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1506,26 +1454,26 @@ msgstr "Opcje:"
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1539,13 +1487,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2046,199 +1994,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2246,3 +2179,27 @@ msgstr ""
 #: src/BtSetup.cc:212
 msgid "Errors occurred while binding port.\n"
 msgstr ""
+
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "musisz wpisać \"true\" (ang. prawda) lub \"false\" (ang. fałsz)"
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "musi zawierać wartość między %s a %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "musi być mniejsze, lub równe %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "musi być większe, lub równe %s."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "musi być mniejsze lub równe %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "musi zawierać wartość między %.1f a %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "musi być większe, lub równe %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "musi być jednym z wymienionych"
diff --git a/po/pt.po b/po/pt.po
index 5d5f9fff..c5c39a1f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-01-25 12:49+0000\n"
 "Last-Translator: Sérgio Marques <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-02-03 13:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 irá retomar a transferência se reiniciar."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -39,11 +39,11 @@ msgstr ""
 "Se ocorrerem erros, veja o ficheiro de registo. Veja a opção '-l'  na página "
 "help/man para detalhes."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Resultados de Transferência"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Legenda de Estado:"
 
@@ -59,57 +59,6 @@ msgstr "                              Etiquetas: "
 msgid "                              Possible Values: "
 msgstr "                              Valores Possíveis: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "deve ser verdadeiro ou falso"
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "deve estar entre %s e %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "deve ser menor ou igual a %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "deve ser maior ou igual a %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "deve ser um número."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "deve ser menor ou igual a %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "deve estar entre %.1f e %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "deve ser maior ou igual a %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "deve ser um dos seguintes:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "formato de proxy desconhecido"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "formato de proxy desconhecido"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -133,8 +82,9 @@ msgstr ""
 "stdout."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -332,7 +282,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -340,12 +290,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -422,7 +373,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -430,7 +381,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -445,7 +396,8 @@ msgstr ""
 "http(s)."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc Inactiva o suporte netrc.."
 
 #: src/usage_text.h:213
@@ -492,7 +444,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -535,12 +487,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -550,7 +496,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -560,7 +506,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -569,13 +515,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -590,7 +536,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -602,17 +548,17 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 " --enable-http-keep-alive[=true|false] Activa a ligação persistente HTTP/1.1."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -622,19 +568,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -644,15 +590,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -665,20 +612,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -686,14 +633,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -707,34 +654,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -750,9 +697,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -760,11 +708,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -777,23 +725,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -805,30 +753,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -837,7 +785,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -848,7 +796,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -861,7 +809,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -891,7 +839,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -900,7 +848,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -910,7 +858,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -918,7 +866,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -929,7 +877,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -938,14 +886,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -957,14 +905,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -972,25 +920,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1000,7 +948,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1008,15 +956,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1026,7 +974,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1041,7 +989,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1054,7 +1002,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1065,7 +1013,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1081,47 +1029,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1130,7 +1079,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1138,7 +1087,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1146,7 +1095,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1168,18 +1117,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1196,7 +1145,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1208,7 +1157,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1218,20 +1167,20 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 #, fuzzy
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 " --enable-http-keep-alive[=true|false] Activa a ligação persistente HTTP/1.1."
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1241,47 +1190,47 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 #, fuzzy
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr " --ftp-passwd=PASSWD Define a palavra-passe FTP. Afecta todas as URLs."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 #, fuzzy
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr " --ftp-passwd=PASSWD Define a palavra-passe FTP. Afecta todas as URLs."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1291,7 +1240,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1308,7 +1257,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1321,12 +1270,12 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 #, fuzzy
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr " -t, --timeout=SEC Define o tempo limite em segundos."
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1337,12 +1286,12 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 #, fuzzy
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr " -t, --timeout=SEC Define o tempo limite em segundos."
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1352,7 +1301,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1364,14 +1313,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1388,7 +1337,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1397,21 +1346,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1420,7 +1369,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1429,7 +1378,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1437,19 +1386,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1460,7 +1409,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1473,7 +1422,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1531,26 +1480,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1564,13 +1513,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2067,122 +2016,107 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "Falha ao definir a socket como não bloqueadora. Causa: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "Falha ao ligar à socket. Causa: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Falha ao escutar a socket. Causa: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "Falha ao aceitar a ligação peer. Causa: %s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "Falha ao obter o nome da socket. Causa: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "Falha ao obter o nome do peer. Causa: %s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "Falha ao verificar permissões de escrita na socket. causa: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "Falha ao verificar as permissões de leitura na socket. Causa: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "Falha ao enviar dados. Causa: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "Falha ao receber dados. Causa: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "Falha ao espreitar dados. Causa: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Erro de socket desconhecido %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "O ficheiro %s existe mas %s  não."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr "Tamanho inválido para %s, tamanho=%d. Devia ser %d."
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "ID Inválida=%d para %s. Devia ser %d."
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2191,78 +2125,78 @@ msgstr ""
 "Falha durante a validação checksum. checksumIndex=%d, offset=%s, "
 "expectedHash=%s, actualHash=%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Transferência abortada."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "O ficheiro %s está a ser transferido por outro comando."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "Checksum insuficiente."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "O acompanhante retornou a razão: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr "O infoHash no ficheiro torrent não coincide com o do ficheiro .aria2."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "Nenhuma entrada %s"
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "Velocidade de transferência muito baixa: %d <= %d(B/s), anfitrião:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "Nenhuma HttpRequestEntry encontrada."
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "Obteve o estado %d, mas sem cabeçalho fornecido."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 "Cabeçalho com um intervalo inválido. Pedido: %s-%s/%s, Resposta: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "Nenhum ficheiro coincidente com a sua preferência."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "Apanhada a excepção."
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr "Quantidade máxima excedida ou inválida. quantidade = %u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2272,3 +2206,37 @@ msgstr ""
 #: src/BtSetup.cc:212
 msgid "Errors occurred while binding port.\n"
 msgstr "Ocorreram erros ao ligar à porta.\n"
+
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "deve ser verdadeiro ou falso"
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "deve estar entre %s e %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "deve ser menor ou igual a %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "deve ser maior ou igual a %s."
+
+#~ msgid "must be a number."
+#~ msgstr "deve ser um número."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "deve ser menor ou igual a %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "deve estar entre %.1f e %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "deve ser maior ou igual a %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "deve ser um dos seguintes:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "formato de proxy desconhecido"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "formato de proxy desconhecido"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fe86159b..be5405ae 100644
--- a/po/pt_BR.po
+++ b/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: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2009-05-11 18:09+0000\n"
 "Last-Translator: elchevive <elchevive68@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -18,30 +18,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-31 13:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr ""
 
@@ -57,57 +57,6 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr "                              Possíveis valores: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "deve ser 'true' ou 'false'."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "deve estar entre %s e %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "deve ser menor que, ou igual a %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "deve ser maior que, ou igual a %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "deve ser um número."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "deve ser menor que, ou igual a %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "deve estar entre %.1f e %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "deve ser maior que, ou igual a %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "deve ser um dos seguintes:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "formato proxy não reconhecido"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "formato proxy não reconhecido"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -127,7 +76,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -318,7 +267,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -326,12 +275,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -407,7 +357,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -415,7 +365,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -428,7 +378,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -475,7 +425,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -518,12 +468,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -533,7 +477,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -543,7 +487,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -552,13 +496,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -573,7 +517,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -585,15 +529,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -603,19 +547,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -625,15 +569,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -646,20 +591,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -667,14 +612,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -688,34 +633,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -731,9 +676,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -741,11 +687,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -758,23 +704,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -786,30 +732,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -818,7 +764,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -829,7 +775,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -842,7 +788,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -872,7 +818,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -881,7 +827,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -891,7 +837,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -899,7 +845,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -910,7 +856,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -919,14 +865,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -938,14 +884,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -953,25 +899,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -981,7 +927,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -989,15 +935,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1007,7 +953,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1022,7 +968,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1035,7 +981,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1046,7 +992,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1062,47 +1008,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1111,7 +1058,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1119,7 +1066,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1127,7 +1074,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1149,18 +1096,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1177,7 +1124,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1189,7 +1136,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1199,18 +1146,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1220,45 +1167,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1268,7 +1215,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1285,7 +1232,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1298,11 +1245,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1313,11 +1260,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1327,7 +1274,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1339,14 +1286,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1363,7 +1310,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1372,21 +1319,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1395,7 +1342,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1404,7 +1351,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1412,19 +1359,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1435,7 +1382,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1448,7 +1395,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1506,26 +1453,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1539,13 +1486,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2042,199 +1989,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2243,6 +2175,40 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "deve ser 'true' ou 'false'."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "deve estar entre %s e %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "deve ser menor que, ou igual a %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "deve ser maior que, ou igual a %s."
+
+#~ msgid "must be a number."
+#~ msgstr "deve ser um número."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "deve ser menor que, ou igual a %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "deve estar entre %.1f e %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "deve ser maior que, ou igual a %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "deve ser um dos seguintes:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "formato proxy não reconhecido"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "formato proxy não reconhecido"
+
 #~ msgid "CUID#%d - The download for one segment completed successfully."
 #~ msgstr "CUID#%d - O download de um segmento terminou finalizou com sucesso."
 
diff --git a/po/ru.po b/po/ru.po
index e4ba1d7c..c1f8e17f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-09-17 04:25+0000\n"
 "Last-Translator: Andrew Zhuravlev <Unknown>\n"
 "Language-Team: <ru@li.org>\n"
@@ -21,21 +21,21 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-10-12 11:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Завершаем выполнение программы... Нажмите Ctrl-C для экстренного завершения."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Экстренное завершение..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 продолжит загрузку, если передача будет перезапущена."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -43,11 +43,11 @@ msgstr ""
 "Если возникли какие-либо ошибки, проверьте log-файл. Для более подробной "
 "информации смотрите описание опции '-l'."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Результат загрузки:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Использованные обозначения:"
 
@@ -63,56 +63,6 @@ msgstr "                              Метки: "
 msgid "                              Possible Values: "
 msgstr "                              Возможные значения: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "должно быть 'true' или 'false'."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "должно быть между %s и %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "должно быть меньше или равно %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "должно быть больше или равно %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "должно быть числом."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "должно быть меньше или равно %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "должно быть между %.1f и %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "должно быть больше или равно %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "должно быть одним из следующих:"
-
-#: src/OptionHandlerImpl.h:529
-msgid "Unrecognized format"
-msgstr "Неизвестный формат"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "неизвестный формат прокси"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -136,8 +86,9 @@ msgstr ""
 "                              логи будут выведены в stdout."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -423,8 +374,9 @@ msgstr ""
 "                              Выключите, если произошла какая-либо ошибка"
 
 #: src/usage_text.h:150
+#, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -435,13 +387,15 @@ msgstr ""
 "                    См. также параметр --auto-file-renaming"
 
 #: src/usage_text.h:154
+#, fuzzy
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 " --allow-piece-length-change=true|false Если установлено false (ложь), aria2 "
 "останавливает загрузку,\n"
@@ -572,8 +526,9 @@ msgstr ""
 "                              загрузки."
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -585,8 +540,9 @@ msgstr ""
 "                              контрольная сумма блоков."
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -608,7 +564,8 @@ msgstr ""
 " -U, --user-agent=USER_AGENT Указать агент пользователя для http(s) загрузок."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc Отключить поддержку netrc."
 
 #: src/usage_text.h:213
@@ -679,8 +636,9 @@ msgstr ""
 "                              значение ее окончания будет трактоваться как 0."
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -750,15 +708,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-" --direct-file-mapping=true|false Напрямую считывать из и записывать в "
-"каждый файл,\n"
-"                              упомянутый в .torrent файле."
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -775,7 +724,7 @@ msgstr ""
 "'-' могут\n"
 "                              быть использованы вместе."
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -793,7 +742,7 @@ msgstr ""
 "торента, используйте\n"
 "                              параметр --max-upload-limit."
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -802,7 +751,7 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -811,7 +760,7 @@ msgstr ""
 "также\n"
 "                              параметр --seed-ratio."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -836,7 +785,7 @@ msgstr ""
 "когда хотя бы одно\n"
 "                              условие будет удовлетворено."
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -856,16 +805,16 @@ msgstr ""
 "                              меньше 20, то они будут дополнены случайными "
 "данными до 20 байт."
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 " --enable-peer-exchange[=true|false] Разрешить расширение прямого обмена."
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr " --enable-dht[=true|false] Использовать IPv4 DHT."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -882,7 +831,7 @@ msgstr ""
 "\"6881-6885\".\n"
 "                              \".\" и \"-\" можно использовать одновременно."
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
@@ -890,13 +839,13 @@ msgid ""
 msgstr ""
 " --dht-entry-point=HOST:PORT Установить адрес и порт для входа в сеть DHT."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 " --dht-file-path=PATH Изменить файл таблицы маршрутов для IPv4 DHT на PATH."
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -913,9 +862,11 @@ msgstr ""
 "удовлетворяет\n"
 "                              заданный уровень."
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
+#, fuzzy
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
@@ -927,7 +878,7 @@ msgstr ""
 "обфускацию\n"
 "                              начального обмена."
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -951,7 +902,7 @@ msgstr ""
 "                              Вы можете добавить K или M(1K = 1024, 1M = "
 "1024K)."
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
@@ -961,7 +912,7 @@ msgstr ""
 "в каждой\n"
 "                              BitTorrent загрузке."
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
@@ -969,7 +920,7 @@ msgstr ""
 " --bt-seed-unverified[=true|false] Сидер первоначально загружает файлы\n"
 "                              без проверки хеша блока."
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -981,7 +932,7 @@ msgstr ""
 "                              Смотрите также параметр --bt-request-peer-"
 "speed-limit."
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
@@ -991,7 +942,7 @@ msgstr ""
 "                              ввод из stdin, если в качестве имени файла "
 "указано '-'."
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -1016,20 +967,20 @@ msgstr ""
 "                              атрибута maxconnections вместо NUM_SERVERS.\n"
 "                              Смотрите также параметры -s и -j."
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   Версия файла для скачивания."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE Язык файла для скачивания."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr " --metalink-os=OS             Целевая операционная система файла."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
@@ -1040,7 +991,7 @@ msgstr ""
 "                              Перечень с запятыми разделителями есть\n"
 "                              приемлемым."
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
@@ -1050,7 +1001,7 @@ msgstr ""
 "Укажите 'none',\n"
 "                              если у Вас нет желаемого протокола."
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -1078,9 +1029,11 @@ msgstr ""
 "операция \n"
 "                              не производится."
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
+#, fuzzy
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -1095,11 +1048,11 @@ msgstr ""
 "protocol, чтобы\n"
 "                              указать предпочитаемый протокол."
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Вывести номер версии и выйти."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -1123,16 +1076,17 @@ msgstr ""
 "                              выведена справка по опциям, содержащим это "
 "слово."
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr " --no-conf Отменить загрузку файла aria2.conf."
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr " --conf-path=PATH Сменить путь к файлу конфигурации на PATH."
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
@@ -1142,7 +1096,7 @@ msgstr ""
 "                              Если указан 0, эта возможность будет не "
 "доступна."
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -1162,21 +1116,21 @@ msgstr ""
 "9J1\"\n"
 "                              http://host/file"
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 " -q, --quiet[=true|false] Сделать aria2 молчаливым (без консольного вывода)."
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr " --async-dns[=true|false] Разрешить асинхронный DNS."
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 " --ftp-reuse-connection[=true|false] Повторно использовать FTP соединение."
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
@@ -1186,11 +1140,11 @@ msgstr ""
 "прогресс загрузки.\n"
 "                              Использование 0 запрещает вывод."
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr " --log-level=LEVEL Указать уровень вывода лога."
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -1203,7 +1157,7 @@ msgstr ""
 "доступно,\n"
 "                              применяет ее к локальному файлу."
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -1219,7 +1173,7 @@ msgstr ""
 "значения,\n"
 "                              и вместо него используется параметр --timeout."
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -1242,7 +1196,7 @@ msgstr ""
 "используются\n"
 "                              HTTP/FTP сервера."
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -1299,7 +1253,7 @@ msgstr ""
 "используются\n"
 "                              настройки профиля сервера."
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -1312,7 +1266,7 @@ msgstr ""
 "сохраненные данные,\n"
 "                              используя параметр --server-stat-if."
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -1328,7 +1282,7 @@ msgstr ""
 "'feedback'.\n"
 "                              Смотрите также параметр --uri-selector"
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -1341,7 +1295,7 @@ msgstr ""
 "состоялся последний\n"
 "                              контакт с ним."
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1359,7 +1313,7 @@ msgstr ""
 "тогда, когда останавливается,\n"
 "                              не смотря на значение."
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1373,7 +1327,7 @@ msgstr ""
 "чтоб указать\n"
 "                              закрытый ключ."
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 msgid ""
 " --private-key=FILE           Use the private key in FILE.\n"
 "                              The private key must be decrypted and in PEM\n"
@@ -1384,7 +1338,7 @@ msgstr ""
 "PEM\n"
 "                              формате. Смотрите также параметр --certificate."
 
-#: src/usage_text.h:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1404,7 +1358,7 @@ msgstr ""
 "разрешить\n"
 "                              проверку."
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
@@ -1414,7 +1368,7 @@ msgstr ""
 "сертификатов, которые указаны\n"
 "                              в параметре --ca-certificate."
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1422,7 +1376,7 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
@@ -1431,11 +1385,11 @@ msgstr ""
 " --use-head[=true|false] Использовать метод HEAD для первого запроса к HTTP\n"
 "                              серверу."
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr " --event-poll=POLL Указать метод опроса событий."
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
@@ -1444,7 +1398,7 @@ msgstr ""
 " --xml-rpc-listen-port=PORT Указать номер порта для прослушивания XML-RPC\n"
 "                              сервером."
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1461,7 +1415,7 @@ msgstr ""
 "                              --xml-rpc-passwd. Смотрите также параметр --"
 "xml-rpc-listen-port."
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1474,15 +1428,15 @@ msgstr ""
 "байт, тогда\n"
 "                              соединение будет отменено."
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr " --xml-rpc-user=USER Указать XML-RPC пользователя."
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr " --xml-rpc-passwd=PASSWD Указать XML-RPC пароль."
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1498,7 +1452,7 @@ msgstr ""
 "принимать любой IP\n"
 "                              адрес."
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1526,7 +1480,7 @@ msgstr ""
 "этого\n"
 "                              параметра."
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1548,7 +1502,7 @@ msgstr ""
 "параметр много\n"
 "                              раз."
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1566,7 +1520,7 @@ msgstr ""
 "                              BitTorrent загрузки отменяются, если true\n"
 "                              задано."
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1593,11 +1547,12 @@ msgstr ""
 "                              основываясь на ответе трекера и прогрессе\n"
 "                              загрузки."
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
+#, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1609,23 +1564,28 @@ msgstr ""
 "                              прояснить требования к COMMAND.\n"
 "                              Смотрите также параметр --on-download-stop."
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
+#, fuzzy
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
-" --on-download-start=COMMAND Указать команду, которую будет выполнено тогда, "
-"когда начнется\n"
-"                              загрузка. COMMAND должна содержать только один "
-"аргумент и\n"
-"                              GID добавляется к COMMAND как первый аргумент."
+" --on-download-pause=COMMAND Указать команду, которая будет выполнена тогда, "
+"когда загрузка\n"
+"                              будет приостановлена.\n"
+"                              Смотрите параметр --on-download-start, чтоб\n"
+"                              прояснить требования к COMMAND.\n"
+"                              Смотрите также параметр --on-download-stop"
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
+#, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1636,10 +1596,11 @@ msgstr ""
 "                              прояснить требования к COMMAND.\n"
 "                              Смотрите также параметр --on-download-stop"
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
+#, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1651,12 +1612,12 @@ msgstr ""
 "                              прояснить требования к COMMAND.\n"
 "                              Смотрите также параметр --on-download-stop.."
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
+#, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1677,7 +1638,7 @@ msgstr ""
 "чтобы узнать требования\n"
 "                              к команде COMMAND"
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1690,7 +1651,7 @@ msgstr ""
 "эта возможность \n"
 "                              не будет использоваться."
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1702,7 +1663,7 @@ msgstr ""
 "слушать только на\n"
 "                              локальном петлевом интерфейсе (loopback)."
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1745,7 +1706,7 @@ msgstr ""
 "                              будет использовано по умолчанию значение: "
 "SIZE=1M."
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
@@ -1755,11 +1716,11 @@ msgstr ""
 "можете указать\n"
 "                              имя интерфейса, IP-адрес и имя хоста."
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr " --disable-ipv6[=true|false]  Отключить IPv6."
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1776,7 +1737,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1788,7 +1749,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1798,18 +1759,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr " --bt-enable-lpd[=true|false] Разрешить поиск локальных пиров."
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1824,51 +1785,51 @@ msgstr ""
 "интерфейс по умолчанию.\n"
 "                              Можно указать имя интерфейса и IP-адрес."
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 " --all-proxy-user=USER Указать имя пользователя для параметра --all-proxy."
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr " --all-proxy-passwd=PASSWD Указать пароль для параметра --all-proxy."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 " --http-proxy-user=USER Указать имя пользователя для параметра --http-proxy."
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr " --http-proxy-passwd=PASSWD Указать пароль для параметра --http-proxy."
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 " --https-proxy-user=USER Указать имя пользователя для параметра --https-"
 "proxy."
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 " --https-proxy-passwd=PASSWD Указать пароль для параметра --https-proxy."
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 " --ftp-proxy-user=USER Указать имя пользователя для параметра --ftp-proxy."
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr " --ftp-proxy-passwd=PASSWD Указать пароль для параметра --ftp-proxy."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1885,7 +1846,7 @@ msgstr ""
 "пользователям\n"
 "                              за прокси-сервером, не поддерживающим докачку."
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1902,7 +1863,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1915,11 +1876,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr " --bt-tracker-timeout=SEC     Указать ожидание в секундах."
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1930,11 +1891,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr " --dht-message-timeout=SEC    Указать ожидание в секундах.."
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1944,7 +1905,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1956,7 +1917,7 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 #, fuzzy
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
@@ -1967,7 +1928,7 @@ msgstr ""
 "в каждой\n"
 "                              BitTorrent загрузке."
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 #, fuzzy
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
@@ -1996,7 +1957,7 @@ msgstr ""
 "                              Вы можете добавить K или M(1K = 1024, 1M = "
 "1024K)."
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -2005,21 +1966,34 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
+#, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --on-download-stop=COMMAND Указать команду, которая будет выполняться при "
+"остановке загрузки.\n"
+"                              Вы можете переопределить команду для "
+"конкретных причин остановки\n"
+"                              используя опции --on-download-complete (по "
+"завершении загрузки) и --on-download-error\n"
+"                              (остановка по ошибке). Если эти опции заданы, "
+"то команда, указанная в этой опции,\n"
+"                              не выполняется.\n"
+"                              Смотрите справку по опции --on-download-start, "
+"чтобы узнать требования\n"
+"                              к команде COMMAND"
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -2028,7 +2002,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -2037,7 +2011,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -2045,19 +2019,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -2068,7 +2042,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -2081,7 +2055,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -2141,12 +2115,12 @@ msgstr "Параметры:"
 msgid "Printing options whose name includes '%s'."
 msgstr "Вывод опций, имя которых содержит '%s'."
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr "Нет подходящей опции к '%s'."
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
@@ -2157,7 +2131,7 @@ msgstr ""
 " URI должны указывать на один и тот же файл, в ином случае загрузка "
 "завершится неудачей."
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
@@ -2167,7 +2141,7 @@ msgstr ""
 "файлов torrent/metalink, хранящихся на диске. Учитывайте, что они всегда "
 "рассматриваются как отдельные загрузки."
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -2181,7 +2155,7 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
@@ -2191,7 +2165,7 @@ msgstr ""
 " содержит \"&\" или любое другой символ считающийся специальным в "
 "интерпретаторе команд."
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "Обратитесь к странице man для более подробной информации"
 
@@ -2703,122 +2677,107 @@ msgstr "%s не является каталогом."
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "Ошибка создания каталога %s: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "Ошибка открытия сегмента файла %s: %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "Ошибка записи сегмента файла %s: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "Ошибка чтения сегмента файла %s: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "Ошибка открытия сокета: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "Ошибка установки настроек для сокета: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "Ошибка в установлении блокируещего сокета: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "Ошибка в установлении неблокируещего сокета: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "Ошибка инициализации сокета: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Ошибка прослушивания сокета: %s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "Ошибка принятия подлючения от узла: %s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "Ошибка получения имени сокета: %s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "Ошибка получения имени подключенного узла: %s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "Ошибка преобразования имени узла %s, причина: %s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "Ошибка подключения к хосту %s: %s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "Ошибка проверки сокета на запись: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "Ошибка проверки сокета на чтение: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "Ошибка отправки данных: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "Ошибка получения данных: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "Ошибка запроса данных: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Неизвестная ошибка сокета %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "Файл %s существует, а %s - нет."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr "Не действительный размер загрузки для %s,  розмер=%d. Должен быть %d."
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "Неправильный ID=%d для %s. Должен быть %d."
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2827,29 +2786,29 @@ msgstr ""
 "Контрольная сумма блока не прошла подтверждения. checksumIndex=%d, offset="
 "%s, expectedHash=%s, actualHash=%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Загрузка отменена."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "Файл %s загружается другой программой."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "Нехватает контрольных сумм."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "Трекер вернул информацию про сбой, причина: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "Обнаружен флудинг."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -2858,51 +2817,51 @@ msgstr ""
 "Потеряно соединение из-за отсутствия запросов/частей сообщений, которыми "
 "обменивались бы за определённый период (%d секунд)."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 "infoHash в файле торента не идентичный тому, который находится в файле ."
 "aria2."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "Нет такого файла %s"
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "Слишком медленная скорость скачивания: %d <= %d(B/s), хост:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "Не найдено HttpRequestEntry"
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "Получен статус %d, но не обеспечено местонахождение заголовка."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr "Неправильный диапазон в заголовке. Запрос: %s-%s/%s, Ответ: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "Нет файла соответствующего Вашим настройкам."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "Обнаружено исключение"
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 "Максимальная длина полезной загрузки превышена или неправильная. длина = %u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2913,6 +2872,72 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr "Ошибка при открытии порта.\n"
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "должно быть 'true' или 'false'."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "должно быть между %s и %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "должно быть меньше или равно %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "должно быть больше или равно %s."
+
+#~ msgid "must be a number."
+#~ msgstr "должно быть числом."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "должно быть меньше или равно %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "должно быть между %.1f и %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "должно быть больше или равно %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "должно быть одним из следующих:"
+
+#~ msgid "Unrecognized format"
+#~ msgstr "Неизвестный формат"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "неизвестный формат прокси"
+
+#~ msgid ""
+#~ " --direct-file-mapping=true|false Directly read from and write to each "
+#~ "file\n"
+#~ "                              mentioned in .torrent file."
+#~ msgstr ""
+#~ " --direct-file-mapping=true|false Напрямую считывать из и записывать в "
+#~ "каждый файл,\n"
+#~ "                              упомянутый в .torrent файле."
+
+#~ msgid ""
+#~ " --on-download-start=COMMAND  Set the command to be executed when "
+#~ "download\n"
+#~ "                              starts up. COMMAND must take just one "
+#~ "argument and\n"
+#~ "                              GID is passed to COMMAND as a first "
+#~ "argument."
+#~ msgstr ""
+#~ " --on-download-start=COMMAND Указать команду, которую будет выполнено "
+#~ "тогда, когда начнется\n"
+#~ "                              загрузка. COMMAND должна содержать только "
+#~ "один аргумент и\n"
+#~ "                              GID добавляется к COMMAND как первый "
+#~ "аргумент."
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "Ошибка открытия сегмента файла %s: %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "Ошибка записи сегмента файла %s: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "Ошибка чтения сегмента файла %s: %s"
+
 #~ msgid "Certificate verification failed. Cause: %s"
 #~ msgstr "Проверка сертификата не состоялась. Причина: %s"
 
diff --git a/po/sk.po b/po/sk.po
index bb244853..2eb03df8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2009-09-05 14:29+0000\n"
 "Last-Translator: minkob <minkobasa@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -18,21 +18,21 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-09-20 09:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Spúšťa sa vypínacia sekvencia... Stlačte znovu Ctrl-C pre núdzové vypnutie."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Spúšťa sa sekvencia núdzového vypnutia."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 obnoví sťahovanie, ak je reštartovaný prenos."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 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 ""
 "Ak máte nejaké chybové hlášky, pozrite si log súbor. Pozrite možnosť '-l' v "
 "help/man stránkach kvôli detailom."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Výsledky sťahovania:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Stavová legenda:"
 
@@ -60,57 +60,6 @@ msgstr "                              Tagy: "
 msgid "                              Possible Values: "
 msgstr "                              Možné hodnoty: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "musí byť buď 'true' alebo 'false'."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "musí byť medzi %s a %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "musí byť menšie ako alebo rovné %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "musí byť väčšie ako alebo rovné %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "musí byť číslo."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "musí byť menšie ako alebo rovné %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "musí byť medzi %.1f a %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "musí byť väčšie ako alebo rovné %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "musí byť jedno z následujúcich:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "nerozpoznaný proxy formát"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "nerozpoznaný proxy formát"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -135,7 +84,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -338,7 +287,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -346,12 +295,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -427,7 +377,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -435,7 +385,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -448,7 +398,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -495,7 +445,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -538,12 +488,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -553,7 +497,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -563,7 +507,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -572,13 +516,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -593,7 +537,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -605,15 +549,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -623,19 +567,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -645,15 +589,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -666,20 +611,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -687,14 +632,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -708,34 +653,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -751,9 +696,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -761,11 +707,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -778,23 +724,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -806,30 +752,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -838,7 +784,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -849,7 +795,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -862,7 +808,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -892,7 +838,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -901,7 +847,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -911,7 +857,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -919,7 +865,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -930,7 +876,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -939,14 +885,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -958,14 +904,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -973,25 +919,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1001,7 +947,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1009,15 +955,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1027,7 +973,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1042,7 +988,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1055,7 +1001,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1066,7 +1012,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1082,29 +1028,39 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
+#, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --ftp-proxy=PROXY Použije tento proxy server pre FTP.\n"
+"                              Pozrite tiež možnosť --all-proxy .\n"
+"                              Toto ovplyvní všetky URL."
 
-#: src/usage_text.h:550
-msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
-msgstr ""
-
-#: src/usage_text.h:554
+#: src/usage_text.h:547
 #, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
+msgstr ""
+" --ftp-proxy=PROXY Použije tento proxy server pre FTP.\n"
+"                              Pozrite tiež možnosť --all-proxy .\n"
+"                              Toto ovplyvní všetky URL."
+
+#: src/usage_text.h:552
+#, fuzzy
+msgid ""
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1112,21 +1068,25 @@ msgstr ""
 "                              Pozrite tiež možnosť --all-proxy .\n"
 "                              Toto ovplyvní všetky URL."
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
+#, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --ftp-proxy=PROXY Použije tento proxy server pre FTP.\n"
+"                              Pozrite tiež možnosť --all-proxy .\n"
+"                              Toto ovplyvní všetky URL."
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
+#, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1134,8 +1094,11 @@ msgid ""
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --ftp-proxy=PROXY Použije tento proxy server pre FTP.\n"
+"                              Pozrite tiež možnosť --all-proxy .\n"
+"                              Toto ovplyvní všetky URL."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1143,7 +1106,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1151,7 +1114,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1173,18 +1136,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1201,7 +1164,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1213,7 +1176,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1223,18 +1186,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1244,45 +1207,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1292,7 +1255,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1309,7 +1272,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1322,11 +1285,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1337,11 +1300,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1351,7 +1314,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1363,14 +1326,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1387,7 +1350,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1396,17 +1359,17 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 #, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1414,7 +1377,7 @@ msgstr ""
 "                              Pozrite tiež možnosť --all-proxy .\n"
 "                              Toto ovplyvní všetky URL."
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1423,7 +1386,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1432,7 +1395,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1440,19 +1403,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1463,7 +1426,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1476,7 +1439,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1534,26 +1497,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1567,13 +1530,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2070,199 +2033,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2270,3 +2218,37 @@ msgstr ""
 #: src/BtSetup.cc:212
 msgid "Errors occurred while binding port.\n"
 msgstr ""
+
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "musí byť buď 'true' alebo 'false'."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "musí byť medzi %s a %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "musí byť menšie ako alebo rovné %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "musí byť väčšie ako alebo rovné %s."
+
+#~ msgid "must be a number."
+#~ msgstr "musí byť číslo."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "musí byť menšie ako alebo rovné %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "musí byť medzi %.1f a %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "musí byť väčšie ako alebo rovné %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "musí byť jedno z následujúcich:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "nerozpoznaný proxy formát"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "nerozpoznaný proxy formát"
diff --git a/po/sr.po b/po/sr.po
index 2efe5d87..5309ffcd 100644
--- a/po/sr.po
+++ b/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: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2008-10-15 12:33+0000\n"
 "Last-Translator: Marko <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-19 15:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Започиње след хитног искључивања..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 ће наставити преузимање уколико пренос буде рестартован."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -39,11 +39,11 @@ msgstr ""
 "Уколико постоје било какве грешке, онда погледај log фајл.  Погледај '-l'  "
 "опцију у помоћним man страницама за детаље."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Резултати преузимања"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Статусна легенда"
 
@@ -59,57 +59,6 @@ msgstr "                              Ознаке: "
 msgid "                              Possible Values: "
 msgstr "                              Могуће вредности: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "мора бити или \"тачно\" или \"нетачно\"."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "мора бити између %s и %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "мора бити мање или једнако са %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "мора бити веће или једнако са %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "мора бити број."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "мора бити мање или једнако са %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "мора бити између %.1f и %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "мора бити веће или једнако са %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "мора бити једно од следећег:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "Не препознатљив proxy формат."
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "Не препознатљив proxy формат."
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -134,7 +83,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -352,7 +301,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -360,12 +309,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -441,7 +391,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -449,7 +399,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -462,7 +412,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -509,7 +459,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -563,12 +513,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -578,7 +522,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -588,7 +532,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -597,13 +541,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 #, fuzzy
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
@@ -629,7 +573,7 @@ msgstr ""
 "                              истовремено.  Молим вас погледајте и -j опцију "
 "такође."
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -641,15 +585,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -659,7 +603,7 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -670,12 +614,12 @@ msgstr ""
 "грешке\n"
 "                              је прошло."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -685,15 +629,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -706,20 +651,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -727,14 +672,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 #, fuzzy
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
@@ -759,34 +704,34 @@ msgstr ""
 "                              истовремено.  Молим вас погледајте и -j опцију "
 "такође."
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 #, fuzzy
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
@@ -813,9 +758,10 @@ msgstr ""
 "                              истовремено.  Молим вас погледајте и -j опцију "
 "такође."
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -823,11 +769,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -840,23 +786,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -868,30 +814,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -900,7 +846,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -911,7 +857,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -924,7 +870,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -954,7 +900,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -963,7 +909,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -973,7 +919,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -981,7 +927,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -992,7 +938,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1001,14 +947,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1020,14 +966,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1035,25 +981,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1063,7 +1009,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1071,17 +1017,17 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 #, fuzzy
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr " --ftp-user=USER Подеси FTP корисника. Ово утиче на све URL-ове."
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 #, fuzzy
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr " --ftp-passwd=PASSWD Подеси FTP лозинку. Ово утиче на све URL-ове."
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1091,7 +1037,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1106,7 +1052,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1119,7 +1065,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1130,7 +1076,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1146,48 +1092,71 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
+#, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" -s, --split=N Преузми фајл користећи N конекција. Уколико више\n"
+"                              онда N URL-ова је дато, прво N URL-ова је "
+"коришћено и\n"
+"                              остаје URL-ова је коришћено за бекап. Уколико "
+"је мање\n"
+"                              N URL-ова је дато, ови URL-уови су коришћени "
+"више од\n"
+"                              једном тако да је N конекција укупно начињено\n"
+"                              истовремено.  Молим вас погледајте и -j опцију "
+"такође."
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
+#, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" -s, --split=N Преузми фајл користећи N конекција. Уколико више\n"
+"                              онда N URL-ова је дато, прво N URL-ова је "
+"коришћено и\n"
+"                              остаје URL-ова је коришћено за бекап. Уколико "
+"је мање\n"
+"                              N URL-ова је дато, ови URL-уови су коришћени "
+"више од\n"
+"                              једном тако да је N конекција укупно начињено\n"
+"                              истовремено.  Молим вас погледајте и -j опцију "
+"такође."
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 #, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1206,7 +1175,7 @@ msgstr ""
 "                              истовремено.  Молим вас погледајте и -j опцију "
 "такође."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1214,7 +1183,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1222,7 +1191,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1244,18 +1213,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1272,7 +1241,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1284,7 +1253,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1294,18 +1263,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1315,69 +1284,69 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 #, fuzzy
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 " --http-proxy-user=USER Подеси HTTP proxy корисника. Ово утиче на све URL-"
 "ове."
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 #, fuzzy
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 " --http-proxy-passwd=PASSWD Подеси HTTP proxy лозинку. Ово утиче на све URL-"
 "ове."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 #, fuzzy
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 " --http-proxy-user=USER Подеси HTTP proxy корисника. Ово утиче на све URL-"
 "ове."
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 #, fuzzy
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 " --http-proxy-passwd=PASSWD Подеси HTTP proxy лозинку. Ово утиче на све URL-"
 "ове."
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 #, fuzzy
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 " --http-proxy-user=USER Подеси HTTP proxy корисника. Ово утиче на све URL-"
 "ове."
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 #, fuzzy
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 " --http-proxy-passwd=PASSWD Подеси HTTP proxy лозинку. Ово утиче на све URL-"
 "ове."
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 #, fuzzy
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 " --http-proxy-user=USER Подеси HTTP proxy корисника. Ово утиче на све URL-"
 "ове."
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 #, fuzzy
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 " --http-proxy-passwd=PASSWD Подеси HTTP proxy лозинку. Ово утиче на све URL-"
 "ове."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1387,7 +1356,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 #, fuzzy
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
@@ -1415,7 +1384,7 @@ msgstr ""
 "                              истовремено.  Молим вас погледајте и -j опцију "
 "такође."
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1428,12 +1397,12 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 #, fuzzy
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr " -t, --timeout=SEC Подеси време прекида у секундама."
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1444,12 +1413,12 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 #, fuzzy
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr " -t, --timeout=SEC Подеси време прекида у секундама."
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1459,7 +1428,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1471,14 +1440,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1495,7 +1464,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1504,17 +1473,17 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 #, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1529,7 +1498,7 @@ msgstr ""
 "                              истовремено.  Молим вас погледајте и -j опцију "
 "такође."
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1538,7 +1507,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1547,7 +1516,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1555,19 +1524,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1578,7 +1547,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1591,7 +1560,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1649,26 +1618,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1682,13 +1651,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2185,199 +2154,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2386,6 +2340,40 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "мора бити или \"тачно\" или \"нетачно\"."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "мора бити између %s и %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "мора бити мање или једнако са %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "мора бити веће или једнако са %s."
+
+#~ msgid "must be a number."
+#~ msgstr "мора бити број."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "мора бити мање или једнако са %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "мора бити између %.1f и %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "мора бити веће или једнако са %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "мора бити једно од следећег:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "Не препознатљив proxy формат."
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "Не препознатљив proxy формат."
+
 #~ msgid " -o, --out=FILE               The file name of the downloaded file."
 #~ msgstr " -o, --out=FILE Име преузетог фајла."
 
diff --git a/po/sv.po b/po/sv.po
index 0a713866..66ce8bc4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-01-23 21:17+0900\n"
 "Last-Translator: Swedie <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -18,30 +18,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-01-23 09:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr "Avslut påbörjat... Tryck ner Ctrl-C igen för att tvinga fram avslut."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Avslut tvingas..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Nedladdningsresultat:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Statusförklaring:"
 
@@ -57,57 +57,6 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "måste vara mellan %s och %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "måste vara mindre än eller lika med %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "måste vara större än eller lika med %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "måste vara ett numeriskt värde."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "måste vara mindre än eller lika med %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "måste vara mellan %.1f och %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "måste vara större än eller lika med %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "måste vara ett av följande:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "Okänt format för proxy."
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "Okänt format för proxy."
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -127,7 +76,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -389,7 +338,7 @@ msgstr ""
 #: src/usage_text.h:150
 #, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -404,12 +353,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -522,8 +472,9 @@ msgstr ""
 "                              nedladdningar."
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -534,8 +485,9 @@ msgstr ""
 "                              delchecksumman är tillgänglig."
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -559,7 +511,7 @@ msgstr ""
 "                              för http(s)-nedladdningar."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -615,13 +567,21 @@ msgstr ""
 "                              som 0 (=aldrig)."
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
 "                              in case of torrent file."
 msgstr ""
+" --allow-overwrite[=true|false] Om 'false' används och filen redan "
+"existerar \n"
+"                              men tillhörande kontrollfil (filenamn.aria2) \n"
+"                              fattas kommer inte aria2 att ladda ner filen "
+"på \n"
+"                              nytt. Se även alternativet: \n"
+"                              --auto-file-renaming."
 
 #: src/usage_text.h:238
 msgid ""
@@ -672,12 +632,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -687,7 +641,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -697,7 +651,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -706,13 +660,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -727,7 +681,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -739,18 +693,18 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 " --enable-http-pipelining[=true|false] Aktivera stöd för samtidiga "
 "förfrågningar med HTTP/1.1."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -760,7 +714,7 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -770,12 +724,12 @@ msgstr ""
 " --retry-wait=SEC Anger väntetid i sekunder efter att ett fel \n"
 "                              har inträffat."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -785,15 +739,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -806,20 +761,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -827,14 +782,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -848,34 +803,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -891,9 +846,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -901,11 +857,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -918,23 +874,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -946,30 +902,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -978,7 +934,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -989,7 +945,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -1002,7 +958,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -1032,7 +988,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -1041,7 +997,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -1051,7 +1007,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -1059,7 +1015,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1070,7 +1026,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1079,14 +1035,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1098,14 +1054,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1113,25 +1069,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1141,7 +1097,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1149,15 +1105,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1167,7 +1123,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1182,7 +1138,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1195,7 +1151,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1206,7 +1162,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1222,47 +1178,67 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
+#, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --max-download-limit=SPEED Anger högsta tillåtna nedladdningshastighet \n"
+"                              per nedladdning i bytes per sekund. Värdet 0 \n"
+"                              innebär en obegränsad hastighet. Du kan "
+"avsluta \n"
+"                              med antingen ett K eller M (1K = 1024 bytes, \n"
+"                              1M = 1024K). För att begränsa hastigheten \n"
+"                              överlag, använd alternativet: \n"
+"                              --max-overall-download-limit."
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
+#, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --max-download-limit=SPEED Anger högsta tillåtna nedladdningshastighet \n"
+"                              per nedladdning i bytes per sekund. Värdet 0 \n"
+"                              innebär en obegränsad hastighet. Du kan "
+"avsluta \n"
+"                              med antingen ett K eller M (1K = 1024 bytes, \n"
+"                              1M = 1024K). För att begränsa hastigheten \n"
+"                              överlag, använd alternativet: \n"
+"                              --max-overall-download-limit."
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
+#, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1270,8 +1246,19 @@ msgid ""
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --bt-hash-check-seed[=true|false] Om 'true' används kommer filen att ligga "
+"öppen \n"
+"                              även efter att hashnycklar verifierats med \n"
+"                              alternativet --check-integrity och filen "
+"laddats \n"
+"                              ner i sin helhet. Om du endast vill "
+"verifiera \n"
+"                              och ladda ner filen om den är skadad eller \n"
+"                              ofullständig ska du använda värdet 'false'. \n"
+"                              Detta alternativ används bara vid BitTorrent-\n"
+"                              nedladdningar."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1279,7 +1266,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1287,7 +1274,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1309,18 +1296,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1337,7 +1324,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1349,7 +1336,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1359,18 +1346,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1380,49 +1367,49 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 #, fuzzy
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 " --ftp-passwd=PASSWD Anger FTP-lösenord. Angivet värde påverkar alla URL:er."
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 #, fuzzy
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 " --ftp-passwd=PASSWD Anger FTP-lösenord. Angivet värde påverkar alla URL:er."
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1432,7 +1419,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1449,7 +1436,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1462,11 +1449,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1477,11 +1464,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1491,7 +1478,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1503,14 +1490,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1527,7 +1514,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 #, fuzzy
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
@@ -1544,17 +1531,17 @@ msgstr ""
 "                              nytt. Se även alternativet: \n"
 "                              --auto-file-renaming."
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 #, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
@@ -1570,7 +1557,7 @@ msgstr ""
 "                              Detta alternativ används bara vid BitTorrent-\n"
 "                              nedladdningar."
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 #, fuzzy
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
@@ -1586,7 +1573,7 @@ msgstr ""
 "                              Använd 'false' om du får problem med \n"
 "                              nedladdningen."
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1595,7 +1582,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1603,19 +1590,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1626,7 +1613,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1639,7 +1626,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1697,26 +1684,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1730,13 +1717,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2233,199 +2220,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2433,3 +2405,34 @@ msgstr ""
 #: src/BtSetup.cc:212
 msgid "Errors occurred while binding port.\n"
 msgstr "Ett fel inträffade vid anslutning till port.\n"
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "måste vara mellan %s och %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "måste vara mindre än eller lika med %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "måste vara större än eller lika med %s."
+
+#~ msgid "must be a number."
+#~ msgstr "måste vara ett numeriskt värde."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "måste vara mindre än eller lika med %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "måste vara mellan %.1f och %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "måste vara större än eller lika med %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "måste vara ett av följande:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "Okänt format för proxy."
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "Okänt format för proxy."
diff --git a/po/th.po b/po/th.po
index 5b7e4b21..9f178d2c 100644
--- a/po/th.po
+++ b/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: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2007-12-29 20:22+0000\n"
 "Last-Translator: pruet <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -18,30 +18,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr ""
 
@@ -57,58 +57,6 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:137
-#, fuzzy
-msgid "must be either 'true' or 'false'."
-msgstr "ต้องเป็น 'true' หรือ 'false'"
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "ต้องอยู่ระหว่าง %s และ  %s"
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "ต้องน้อยกว่าหรือเท่ากับ %s"
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "ต้องมากกว่าหรือเท่ากับ %s"
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "ต้องเป็นตัวเลข"
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "ต้องน้อยกว่าหรือเท่ากับ %.1f"
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "ต้องอยู่ระหว่าง %.1f และ %.1f"
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "ต้องมากกว่าหรือเท่ากับ %.1f"
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "ต้องเลือกหนึ่งตัวเลือกจากรายการต่อไปนี้"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "รูปแบบพร๊อกซีไม่ถูกต้อง"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "รูปแบบพร๊อกซีไม่ถูกต้อง"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -128,7 +76,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -319,7 +267,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -327,12 +275,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -408,7 +357,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -416,7 +365,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -429,7 +378,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -476,7 +425,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -519,12 +468,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -534,7 +477,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -544,7 +487,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -553,13 +496,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -574,7 +517,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -586,15 +529,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -604,19 +547,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -626,15 +569,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -647,20 +591,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -668,14 +612,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -689,34 +633,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -732,9 +676,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -742,11 +687,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -759,23 +704,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -787,30 +732,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -819,7 +764,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -830,7 +775,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -843,7 +788,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -873,7 +818,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -882,7 +827,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -892,7 +837,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -900,7 +845,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -911,7 +856,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -920,14 +865,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -939,14 +884,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -954,25 +899,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -982,7 +927,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -990,15 +935,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1008,7 +953,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1023,7 +968,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1036,7 +981,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1047,7 +992,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1063,47 +1008,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1112,7 +1058,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1120,7 +1066,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1128,7 +1074,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1150,18 +1096,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1178,7 +1124,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1190,7 +1136,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1200,18 +1146,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1221,45 +1167,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1269,7 +1215,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1286,7 +1232,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1299,11 +1245,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1314,11 +1260,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1328,7 +1274,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1340,14 +1286,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1364,7 +1310,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1373,21 +1319,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1396,7 +1342,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1405,7 +1351,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1413,19 +1359,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1436,7 +1382,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1449,7 +1395,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1507,26 +1453,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1540,13 +1486,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2043,199 +1989,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2244,6 +2175,41 @@ msgstr ""
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "ต้องเป็น 'true' หรือ 'false'"
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "ต้องอยู่ระหว่าง %s และ  %s"
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "ต้องน้อยกว่าหรือเท่ากับ %s"
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "ต้องมากกว่าหรือเท่ากับ %s"
+
+#~ msgid "must be a number."
+#~ msgstr "ต้องเป็นตัวเลข"
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "ต้องน้อยกว่าหรือเท่ากับ %.1f"
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "ต้องอยู่ระหว่าง %.1f และ %.1f"
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "ต้องมากกว่าหรือเท่ากับ %.1f"
+
+#~ msgid "must be one of the following:"
+#~ msgstr "ต้องเลือกหนึ่งตัวเลือกจากรายการต่อไปนี้"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "รูปแบบพร๊อกซีไม่ถูกต้อง"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "รูปแบบพร๊อกซีไม่ถูกต้อง"
+
 #~ msgid "CUID#%d - The download for one segment completed successfully."
 #~ msgstr "CUID#%d - การดาวน์โหลดหนึ่งเซ็กเมนท์เสร็จสิ้นสมบูรณ์"
 
diff --git a/po/tr.po b/po/tr.po
index 1fa7cf16..144194e3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-07-19 18:10+0000\n"
 "Last-Translator: Fatih Aşıcı <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -18,21 +18,21 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-08-29 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Kapanış işlemleri başlıyor... Acil kapanış için Ctrl-C'ye tekrar basın."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Acil kapanış başlıyor..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "Transferi tekrar başlatırsanız, aria2 indirmeye devam edecek."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 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 ""
 "Bir hatayla karşılaşırsanız log dosyasına bakın. Detaylar için yardım ve man "
 "sayfalarındaki '-l' seçeneğine bakın."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "İndirme Sonuçları:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Durum Kısaltmaları:"
 
@@ -60,57 +60,6 @@ msgstr "                              Etiketler: "
 msgid "                              Possible Values: "
 msgstr "                              Alabileceği Değerler: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "ya 'true' ya da 'false' olmalı."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "%s ve %s arasında olmalı."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "en fazla %s değerini almalı."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "en az %s değerini almalı."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "bir sayı olmalı."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "en fazla %.1f değerini almalı."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "%.1f ve %.1f arasında olmalı."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "en az %.1f değerini almalı."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "şunlardan biri olmalı:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "tanınmayan proxy biçimi"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "tanınmayan proxy biçimi"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -133,8 +82,9 @@ msgstr ""
 "                              standart çıktıya yazılır."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -354,21 +304,27 @@ msgstr ""
 "                              gücü kullanılır.Eğer bir hata olursa kapatın."
 
 #: src/usage_text.h:150
+#, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
 msgstr ""
+" --enable-direct-io=true|false Direk G/Ç belirle.True yapılırsa\n"
+"                              dosya yer ayrımlarında düşük işlemci\n"
+"                              gücü kullanılır.Eğer bir hata olursa kapatın."
 
 #: src/usage_text.h:154
+#, fuzzy
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 " --allow-piece-length-change=true|false False seçilirse, aria2 parça "
 "uzunluğunun\n"
@@ -450,16 +406,21 @@ msgid ""
 msgstr ""
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
 msgstr ""
+" --enable-direct-io=true|false Direk G/Ç belirle.True yapılırsa\n"
+"                              dosya yer ayrımlarında düşük işlemci\n"
+"                              gücü kullanılır.Eğer bir hata olursa kapatın."
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -481,7 +442,8 @@ msgstr ""
 " -U, --user-agent=TARAYICI_KİMLİĞİ HTTP(S) için tarayıcı kimliğini belirler."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc netrc desteğini kapatır."
 
 #: src/usage_text.h:213
@@ -527,8 +489,9 @@ msgid ""
 msgstr ""
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -584,12 +547,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -606,7 +563,7 @@ msgstr ""
 "                              örnek: '6881-6999'. '-' ve ',' birlikte de "
 "kullanılabilir."
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -616,7 +573,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -625,7 +582,7 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -633,7 +590,7 @@ msgstr ""
 " --speed-time=DAKİKA Tohumlama(seed) zamanını belirler. \n"
 "                              --seed-ratio seçeneğine de bakınız."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -648,7 +605,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -660,16 +617,16 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr " --enable-peer-exchange=true|false Peer değişim eklentisini aç."
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr " --enable-dht=true|false DHT özelliklerini aç."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 #, fuzzy
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
@@ -680,7 +637,7 @@ msgid ""
 "                              and '-' can be used together."
 msgstr " --dht-listen-port=PORT... DHT için UDP dinleme portunu aç."
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 #, fuzzy
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
@@ -690,13 +647,13 @@ msgstr ""
 " --dht-entry-point=MAKİNE:PORT Makine ve portu DHT ağına giriş noktası "
 "olarak belirle."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 #, fuzzy
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr " --conf-path=YOL Konfigürasyon dosyasının yerini belirle."
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -706,9 +663,11 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
+#, fuzzy
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
@@ -719,7 +678,7 @@ msgstr ""
 "aria2\n"
 "                              her zaman obfuskasyon tokalaşmasını kullanır."
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -732,7 +691,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
@@ -741,7 +700,7 @@ msgstr ""
 " --bt-max-open-files=SAYI Bir BitTorrent downloadında açılacak maksimum \n"
 "                              dosya sayısını belirle."
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
@@ -749,7 +708,7 @@ msgstr ""
 " --bt-seed-unverified=true|false Daha önce indirilmiş dosyaları \n"
 "                              parça hashlerini kontrol etmeden tohumla."
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -757,14 +716,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -778,34 +737,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=SÜRÜM İndirilecek dosyanın sürümü."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=DİL İndirilecek dosyanın dili."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr " --metalink-os=OS İndirilecek dosyanın işletim sistemi."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -821,9 +780,11 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
+#, fuzzy
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -838,11 +799,11 @@ msgstr ""
 "protocol seçeneğini\n"
 "                              kullanın."
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version Sürüm numarasını göster ve çık."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -855,16 +816,17 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr " --no-conf aria2.conf dosyasını yüklemeyi kapa."
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr " --conf-path=YOL Konfigürasyon dosyasının yerini belirle."
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
@@ -873,7 +835,7 @@ msgstr ""
 " --stop=SANİYE SANİYE geçtiğinde uygulamayı durdur. 0 girilirse\n"
 "                              bu özellik kapatılır."
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -891,19 +853,19 @@ msgstr ""
 "\"X-B 9j1\" \n"
 "                              http://host/file"
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr " --async-dns=true|false Asenkronize DNSi açar."
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr " --ftp-reuse-connection=true|false FTPde bağlantıyı tekrar kullanır."
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
@@ -913,11 +875,11 @@ msgstr ""
 "                              zaman aralığını belirler. 0 seçilirse çıktı "
 "gönderilmez."
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr " --log-level=SEVİYE Çıktı için log seviyesini belirler."
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -926,7 +888,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -937,7 +899,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -950,7 +912,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -980,7 +942,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -989,7 +951,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -999,7 +961,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -1007,7 +969,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1018,7 +980,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1027,14 +989,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1046,14 +1008,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1061,25 +1023,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1089,7 +1051,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1097,15 +1059,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1115,7 +1077,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1130,7 +1092,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1143,7 +1105,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1154,7 +1116,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1170,47 +1132,54 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
+#, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --ftp-proxy=VEKİL            FTP için bu vekil sunucusunu kullan. Daha\n"
+"                              önce verilmiş bir vekili silmek için \"\"\n"
+"                              kullanın. Ayrıca --all-proxy seçeneğine\n"
+"                              bakın. Bu, tüm URL'leri etkiler."
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
+#, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1218,8 +1187,18 @@ msgid ""
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --follow-torrent=true|false|mem  True veya mem seçilirse, .torrent uzantılı "
+"bir dosya ya da \n"
+"                              içerik tipi application/x-bittorrent olan bir "
+"dosya indirildiğinde, aria2\n"
+"                              onu bir torrent dosyası olarak okur ve "
+"içindeki dosyaları indirir.\n"
+"                              Eğer mem seçilirse, torrent dosyası diske "
+"yazılmaz sadece hafızada\n"
+"                              tutulur.Eğer false seçilirse, yukarıda "
+"anlatılan işler yapılmaz."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1227,7 +1206,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1235,7 +1214,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1257,18 +1236,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1285,7 +1264,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1297,7 +1276,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1307,18 +1286,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1328,45 +1307,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1376,7 +1355,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1393,7 +1372,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1406,11 +1385,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1421,11 +1400,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1435,7 +1414,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1447,7 +1426,7 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 #, fuzzy
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
@@ -1457,7 +1436,7 @@ msgstr ""
 " --bt-max-open-files=SAYI Bir BitTorrent downloadında açılacak maksimum \n"
 "                              dosya sayısını belirle."
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1474,7 +1453,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 #, fuzzy
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
@@ -1487,21 +1466,21 @@ msgstr ""
 "                              dosya yer ayrımlarında düşük işlemci\n"
 "                              gücü kullanılır.Eğer bir hata olursa kapatın."
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 #, fuzzy
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
@@ -1514,7 +1493,7 @@ msgstr ""
 "                              dosya yer ayrımlarında düşük işlemci\n"
 "                              gücü kullanılır.Eğer bir hata olursa kapatın."
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 #, fuzzy
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
@@ -1529,7 +1508,7 @@ msgstr ""
 "aria2\n"
 "                              her zaman obfuskasyon tokalaşmasını kullanır."
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1537,7 +1516,7 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 #, fuzzy
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
@@ -1547,13 +1526,13 @@ msgstr ""
 " --dht-entry-point=MAKİNE:PORT Makine ve portu DHT ağına giriş noktası "
 "olarak belirle."
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 #, fuzzy
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr " --conf-path=YOL Konfigürasyon dosyasının yerini belirle."
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1564,7 +1543,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1577,7 +1556,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1636,26 +1615,26 @@ msgstr "Seçenekler:"
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1669,13 +1648,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "Detaylı bilgi için man sayfasına bakınız."
 
@@ -2182,122 +2161,107 @@ msgstr "%s bir dizin değil"
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "%s dizini %s sebebiyle oluşturulamadı"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "%s parça dosyası %s sebebiyle açılamadı"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "%s parça dosyasına %s sebebiyle yazılamadı"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "%s parça dosyasından %s sebebiyle okunamadı"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "%s sebebiyle soket açılamadı"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "%s sebebiyle soket yerleştirilemedi"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "%s sebebiyle soket bloke edilemedi"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "%s sebebiyle soket bloke olmayan olarak ayarlanamadı"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "%s sebebiyle soket tutulamadı"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "%s sebebiyle soket dinlenemedi"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "%s sebebiyle peer bağlantısı kabul edilmedi"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "%s sebeiyle soketin adı alınamadı"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "%s sebebiyle bağlanılan peer in adı alınamadı"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "%s makinesinin adı çözülemedi sebep: %s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "%s makinesine %s sebebinden dolayı bağlanılamyor"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "%s sebebinden dolayı soketin yazılabilir olduğu anlaşılamıyor"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "%s sebebinden dolayı soketin okunabilir olduğu anlaşılamıyor"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "%s sebebiyle veri gönderilemiyor"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "%s sebebinden dolayı veri alınamıyor"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "%s sebebinden dolayı veri gözlenemiyor"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Bilinmeyen soket hatası %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "%s dosyası var ama %s dosyası yok."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr "%s için geçersiz payload büyüklüğü,büyüklük=%d. %d olmalıydı."
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "Geçersiz ID=%d %s için . %d olmalıydı."
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2306,29 +2270,29 @@ msgstr ""
 "Parça checksum doğrulaması başarısız. checksumindeks=%d artış=%s, "
 "beklenenHash=%s, eldekıhash=%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "İndirme iptal edildi."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "%s dosyası başka bir komut tarafından indiriliyor."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "Yetersiz checksumlar."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "İzleyici başarısızlık sebebi olarak %s gönderdi."
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "Flooding algılandı."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -2337,48 +2301,48 @@ msgstr ""
 "%d saniyede herhangi istek/parça mesajı alişverişi yapılmadığı için bağlantı "
 "kapatıldı."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr "Torrent dosyasındaki infoHash .aria2 dosyasındaki ile tutmuyor."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "%s dosya girdisi yok."
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "Download hızı çok yavaş: %d <= %d(B/s), makine:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "HttpRequestEntry bulunamadı."
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "%d durumu alındı ama yer başlığı gönderilmedi."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr "Geçersiz başlık aralığı.İstek: %s-%s/%s, Cevap: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "Tercihlerinizle eşleşen dosya yok."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "Öngörülmeyen hata algılandı."
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr "Maksimum payload uzunluğu aşıldı ve geçersiz. uzunluk= %u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2387,3 +2351,46 @@ msgstr ""
 #: src/BtSetup.cc:212
 msgid "Errors occurred while binding port.\n"
 msgstr "Port bağlanırken hata oldu.\n"
+
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "ya 'true' ya da 'false' olmalı."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "%s ve %s arasında olmalı."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "en fazla %s değerini almalı."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "en az %s değerini almalı."
+
+#~ msgid "must be a number."
+#~ msgstr "bir sayı olmalı."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "en fazla %.1f değerini almalı."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "%.1f ve %.1f arasında olmalı."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "en az %.1f değerini almalı."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "şunlardan biri olmalı:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "tanınmayan proxy biçimi"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "tanınmayan proxy biçimi"
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "%s parça dosyası %s sebebiyle açılamadı"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "%s parça dosyasına %s sebebiyle yazılamadı"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "%s parça dosyasından %s sebebiyle okunamadı"
diff --git a/po/uk.po b/po/uk.po
index c0b3c112..4bae36fa 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-10-20 11:34+0000\n"
 "Last-Translator: Localizator <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-11-01 11:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Розпочинається послідовність операцій термінового вимкнення... Натисніть "
 "знов Ctrl-C для невідкладного вимкнення."
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Розпочинається послідовність операцій термінового вимкнення..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 відновить завантаження, якщо трансфер буде перезапущено."
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -41,11 +41,11 @@ msgstr ""
 "При наявності помилок дивіться log файл. Дивіться параметр '-l' в допомозі "
 "(help/man-сторінки) для детальнішої інформації."
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Результати завантаження:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Роз'яснення позначень:"
 
@@ -61,56 +61,6 @@ msgstr "                              Ознаки: "
 msgid "                              Possible Values: "
 msgstr "                              Можливі значення: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "має бути 'true' або 'false' (так чи ні)."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "має бути між %s та %s."
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "має бути менше або дорівнювати %s."
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "має бути більше або дорівнювати %s."
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "має бути числом."
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "має бути менше або дорівнювати %.1f."
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "має бути між %.1f та %.1f."
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "має бути більше або дорівнювати %.1f."
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "має бути одним із наступних:"
-
-#: src/OptionHandlerImpl.h:529
-msgid "Unrecognized format"
-msgstr "Невідомий формат"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "невідомий формат проксі"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -134,8 +84,9 @@ msgstr ""
 "потоку виводу)."
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -398,21 +349,28 @@ msgstr ""
 "якась помилка"
 
 #: src/usage_text.h:150
+#, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
 msgstr ""
+" -R, --remote-time[=true|false] Шукає хронометраж віддаленого файлу з\n"
+"                              віддаленого HTTP/FTP серверу та, якщо це "
+"доступно,\n"
+"                              застосовує його на локальному файлі."
 
 #: src/usage_text.h:154
+#, fuzzy
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 " --allow-piece-length-change=true|false Якщо встановлено false (ні), aria2 "
 "припиняє завантаження,\n"
@@ -542,8 +500,9 @@ msgstr ""
 "                              завантаження."
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -555,8 +514,9 @@ msgstr ""
 "                              контрольна сума блоків."
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -578,7 +538,8 @@ msgstr ""
 "завантажень."
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc Вимкнути підтримку netrc."
 
 #: src/usage_text.h:213
@@ -652,8 +613,9 @@ msgstr ""
 "                              значення її закінчення трактуватиметься як 0."
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -724,14 +686,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-" --direct-file-mapping=true|false Пряме читання з та запис до кожного файлу\n"
-"                              згаданого в .torrent файлі."
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -750,7 +704,7 @@ msgstr ""
 "'-' можуть\n"
 "                              бути використані разом."
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -768,7 +722,7 @@ msgstr ""
 "торенту, використовуйте\n"
 "                              параметр --max-upload-limit."
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -785,7 +739,7 @@ msgstr ""
 "використовуйте\n"
 "                              параметр --max-overall-upload-limit."
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -794,7 +748,7 @@ msgstr ""
 "також\n"
 "                              параметр --seed-ratio."
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -820,7 +774,7 @@ msgstr ""
 "коли хоча б одну\n"
 "                              умову буде задоволено."
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -840,16 +794,16 @@ msgstr ""
 "                              менше 20, то вони будуть доповнені "
 "випадколвими даними до 20 байтів."
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 " --enable-peer-exchange[=true|false] Дозволити розширення прямого обміну."
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr " --enable-dht[=true|false]    Включити DHT IPv4 функціональність."
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -859,7 +813,7 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
@@ -869,13 +823,13 @@ msgstr ""
 "точки для IPv4 DHT\n"
 "                              мережі."
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 " --dht-file-path=PATH         Зміна IPv4 DHT таблиці маршрутизації шляху."
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -891,9 +845,11 @@ msgstr ""
 "                              aria2 обирає найменший, який задовольняє\n"
 "                              наданий рівень."
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
+#, fuzzy
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
@@ -904,7 +860,7 @@ msgstr ""
 "                              Бо aria2 завжди використовує обфускацію\n"
 "                              початкового обміну."
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -929,7 +885,7 @@ msgstr ""
 "                              Ви можете додати K або M(1K = 1024, 1M = "
 "1024K)."
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
@@ -939,7 +895,7 @@ msgstr ""
 "кожному\n"
 "                              BitTorrent завантаженні."
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
@@ -947,7 +903,7 @@ msgstr ""
 " --bt-seed-unverified[=true|false] Сідер по-перше завантажує файли\n"
 "                              без перевірки хешу блоку."
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -959,7 +915,7 @@ msgstr ""
 "                              Дивіться також параметр --bt-request-peer-"
 "speed-limit."
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
@@ -969,7 +925,7 @@ msgstr ""
 "                              ввод з stdin, якщо у якості імені вказано \"-"
 "\"."
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -993,20 +949,20 @@ msgstr ""
 "                              атрибуту maxconnections замість NUM_SERVERS.\n"
 "                              Дивіться також параметри -s та -j."
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   Версія файлу для завантаження."
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE Мова файлу для завантаження."
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr " --metalink-os=OS Операційна система файлу, який завантажуватиметься."
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
@@ -1016,7 +972,7 @@ msgstr ""
 "                              Перелік, із розмежуванням комами є\n"
 "                              прийнятним."
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
@@ -1026,7 +982,7 @@ msgstr ""
 "'none'\n"
 "                              якщо у Вас нема бажаного протоколу."
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -1042,9 +998,11 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
+#, fuzzy
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -1059,11 +1017,11 @@ msgstr ""
 "protocol, щоб\n"
 "                              вказати бажаний протокол."
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version Надрукувати номер версії та вийти."
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -1086,16 +1044,17 @@ msgstr ""
 "друкується допомога вживання\n"
 "                              для параметрів, чиї назви вміщують те слово."
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr " --no-conf Скасувати завантаження файлу aria2.conf."
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr " --conf-path=PATH Змінити шлях до файлу конфігурації на PATH."
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
@@ -1104,7 +1063,7 @@ msgstr ""
 " --stop=SEC Зупинити програму після того, як мине SEC секунд.\n"
 "                              Якщо вказано 0, ця можливість буде усунена."
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -1124,22 +1083,22 @@ msgstr ""
 "9J1\"\n"
 "                              http://host/file"
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 " -q, --quiet[=true|false] Зробити aria2 мовчазним (без консольного "
 "виведення)."
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr " --async-dns[=true|false] Дозволити асинхронний DNS."
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 " --ftp-reuse-connection[=true|false] Повторно використовувати FTP з'єднання."
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
@@ -1149,11 +1108,11 @@ msgstr ""
 "прогресування завантаження.\n"
 "                              Використання 0 забороняє виведення."
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr " --log-level=LEVEL Вказати рівень виведення логу."
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -1166,7 +1125,7 @@ msgstr ""
 "доступно,\n"
 "                              застосовує його на локальному файлі."
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -1183,7 +1142,7 @@ msgstr ""
 "                              та замість нього використовується параметр --"
 "timeout."
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -1206,7 +1165,7 @@ msgstr ""
 "використовуються\n"
 "                              HTTP/FTP сервера."
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -1264,7 +1223,7 @@ msgstr ""
 "використовуються\n"
 "                              налаштування профілю сервара."
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -1277,7 +1236,7 @@ msgstr ""
 "збережені дані,\n"
 "                              використовуючи параметр --server-stat-if."
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -1293,7 +1252,7 @@ msgstr ""
 "                              деяких URI селекторах, таких як 'feedback'.\n"
 "                              Дивіться також параметр --uri-selector"
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -1306,7 +1265,7 @@ msgstr ""
 "відбувся останній\n"
 "                              контакт з ним."
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1324,7 +1283,7 @@ msgstr ""
 "тоді, коли зупиняється,\n"
 "                              не зважаючи на значення."
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1338,7 +1297,7 @@ msgstr ""
 "key, щоб вказати\n"
 "                              приватного ключа."
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 msgid ""
 " --private-key=FILE           Use the private key in FILE.\n"
 "                              The private key must be decrypted and in PEM\n"
@@ -1348,7 +1307,7 @@ msgstr ""
 "                              Приватний ключ має бути дешифрованим та у PEM\n"
 "                              форматі. Дивіться також параметр --certificate."
 
-#: src/usage_text.h:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1368,7 +1327,7 @@ msgstr ""
 "аби дозволити\n"
 "                              перевірку."
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
@@ -1378,7 +1337,7 @@ msgstr ""
 "сертифікатів, які вказані\n"
 "                              у параметрі --ca-certificate."
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1386,7 +1345,7 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
@@ -1396,11 +1355,11 @@ msgstr ""
 "HTTP\n"
 "                              серверу."
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr " --event-poll=POLL Вказати метод для опитування подій."
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
@@ -1409,7 +1368,7 @@ msgstr ""
 " --xml-rpc-listen-port=PORT Вказати номер порта для прослуховування XML-RPC\n"
 "                              сервера."
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1426,7 +1385,7 @@ msgstr ""
 "                              --xml-rpc-passwd. Дивіться також параметр --"
 "xml-rpc-listen-port."
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1439,15 +1398,15 @@ msgstr ""
 "байтів, тоді\n"
 "                              з'єднання буде скасовано."
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr " --xml-rpc-user=USER Встановити XML-RPC користувача."
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr " --xml-rpc-passwd=PASSWD Вказати XML-RPC пароль."
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1463,7 +1422,7 @@ msgstr ""
 "приймати будь-яку IP\n"
 "                              адресу."
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1491,7 +1450,7 @@ msgstr ""
 "цього\n"
 "                              параметру."
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1513,7 +1472,7 @@ msgstr ""
 "параметр багато\n"
 "                              разів."
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1531,7 +1490,7 @@ msgstr ""
 "true\n"
 "                              вказано."
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1558,11 +1517,12 @@ msgstr ""
 "                              беручи за основу відповідь трекера та прогрес\n"
 "                              завантаження."
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
+#, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1574,12 +1534,15 @@ msgstr ""
 "                              з'ясувати вимоги до COMMAND.\n"
 "                              Дивіться також параметр --on-download-stop."
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
+#, fuzzy
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 " --on-download-start=COMMAND Вказати команду, яку буде виконано тоді, коли "
 "розпочнеться\n"
@@ -1588,18 +1551,26 @@ msgstr ""
 "                              GID додається до COMMAND у якості першого "
 "аргументу."
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
+#, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --on-download-complete=COMMAND Вказати команду, яку буде виконано тоді, "
+"коли завантаження\n"
+"                              закінчиться.\n"
+"                              Дивіться параметр --on-download-start аби\n"
+"                              з'ясувати вимоги до COMMAND.\n"
+"                              Дивіться також параметр --on-download-stop."
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
+#, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
@@ -1612,12 +1583,12 @@ msgstr ""
 "                              вимоги до COMMAND.\n"
 "                              Дивіться також параметр --on-download-stop."
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
+#, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1639,7 +1610,7 @@ msgstr ""
 "того, щоб з'ясувати\n"
 "                              вимоги до COMMAND."
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1651,7 +1622,7 @@ msgstr ""
 "                              SEC секунд підряд. Якщо вказано 0, тоді ця\n"
 "                              можливість вимкнена."
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1664,7 +1635,7 @@ msgstr ""
 "прослуховує лишень\n"
 "                              на локальному loopback (127.0.0.1) інтерфейсі."
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1710,7 +1681,7 @@ msgstr ""
 "                              за замовчуванням буде використано значення: "
 "SIZE=1M."
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
@@ -1721,11 +1692,11 @@ msgstr ""
 "                              назву інтерфейсу, IP-адресу та ім'я хосту "
 "(hostname)."
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr " --disable-ipv6[=true|false]  Вимкнути IPv6."
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1742,7 +1713,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1754,7 +1725,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1764,18 +1735,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1785,45 +1756,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1833,7 +1804,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1850,7 +1821,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1863,11 +1834,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1878,11 +1849,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1892,7 +1863,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1904,14 +1875,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1928,7 +1899,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1937,21 +1908,35 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
+#, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --on-download-stop=COMMAND Встановити команду, яку буде виконано тоді, коли "
+"завантаження\n"
+"                              зупиниться. Ви можете відмінити команду для "
+"виконання\n"
+"                              цодо особливих результатів завантаження за "
+"допомогою\n"
+"                              --on-download-complete та --on-download-error. "
+"Якщо\n"
+"                              вони вказані, то команда, що задана у цьому \n"
+"                              параметрі не виконується.\n"
+"                              Дивіться параметр --on-download-start для "
+"того, щоб з'ясувати\n"
+"                              вимоги до COMMAND."
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1960,7 +1945,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1969,7 +1954,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1977,19 +1962,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -2000,7 +1985,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -2013,7 +1998,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -2072,26 +2057,26 @@ msgstr "Параметри:"
 msgid "Printing options whose name includes '%s'."
 msgstr "Друк параметрів, ім'я яких вміщує у собі '%s'."
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr "Жодна опція не відповідає '%s'."
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -2105,13 +2090,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "Зверніться до сторінок man задля отримання ширшої інформації."
 
@@ -2622,122 +2607,107 @@ msgstr "%s не є каталогом."
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "Помилка утворення каталогу %s, обумовлена: %s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "Помилка відкриття сегменту файлу %s, обумовлена: %s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "Помилка запису до сегменту файлу %s, обумовлена: %s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "Помилка читання із сегменту файлу %s, обумовлена: %s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "Помилка відкриття сокету, обумовлена: %s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "Помилка встановлення налаштувань сокету, обумовлена: %s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "Помилка встановлення блокувального сокету, обумовлена: %s"
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "Помилка встановлення не-блокувального сокету, обумовлена: %s"
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "Помилка прив'язки до сокету, обумовлена: %s"
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "Помилка прослуховування сокету, обумовлена:%s"
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "Помилка прийняття підключення від вузла:%s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "Помилка під час отримання ім'я сокету, обумовлена:%s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "Помилка під час отримання ім'я підключеної точки, обумовлена:%s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "Помилка перетворення імені вузла %s, обумовлена:%s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "Помилка підключення до вузла %s, обумовлена: %s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "Помилка перевірки сокету на можливість запису, обумовлена: %s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "Помилка перевірки сокету на можливість читання, обумовлена: %s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "Помилка пересилання даних, обумовлена: %s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "Помилка отримання даних, обумовлена: %s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr "Помилка запиту даних, обумовлена: %s"
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "Невідома помилка сокету %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "Файл %s існує, проте %s не існує."
 
-#: src/message.h:255
+#: src/message.h:254
 #, fuzzy, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr "Не дійсний розмір завантаження для %s,  розмір=%d. Має бути %d."
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr "Не дійсний ID=%d для %s. Має бути %d."
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2746,29 +2716,29 @@ msgstr ""
 "Контрольна сума блоку не пройшла підтвердження. checksumIndex=%d, offset=%s, "
 "expectedHash=%s, actualHash=%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "Завантаження скасовано."
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "Файл %s було завантажено із використанням іншої команди."
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr "Недостатня контрольна сума."
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "Трекер повернув інформацію про збій з причини: %s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr "Виявлено флудінг (лавинну адресацію)."
 
-#: src/message.h:264
+#: src/message.h:263
 #, fuzzy, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
@@ -2777,51 +2747,51 @@ msgstr ""
 "Втрачено з'єднання через відсутність запитів/частин повідомлень, якими "
 "обмінювались би за визначений період (%d секунд)."
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 "infoHash в файлі торенту не тотожній до того, що знаходиться в файлі .aria2."
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "Нема такого файлу %s"
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "Занадто мала швидкість завантаження: %d <= %d(Б/с), хост:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "Не знайдено HttpRequestEntry (входження Http запиту)"
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr "Отримано %d статус, проте не забезпечено місцезнаходження заголовку."
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr "Невірний діапазон в назві. Запит: %s-%s/%s, Відповідь: %s-%s/%s"
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "Нема файлу відповідного до Ваших налаштувань."
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "Виявлено виняток"
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 "Максимальна довжина корисного завантаження завищена або не вірна. довжина = "
 "%u"
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2831,3 +2801,54 @@ msgstr ""
 #: src/BtSetup.cc:212
 msgid "Errors occurred while binding port.\n"
 msgstr "Помилка при відкритті порту.\n"
+
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "має бути 'true' або 'false' (так чи ні)."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "має бути між %s та %s."
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "має бути менше або дорівнювати %s."
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "має бути більше або дорівнювати %s."
+
+#~ msgid "must be a number."
+#~ msgstr "має бути числом."
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "має бути менше або дорівнювати %.1f."
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "має бути між %.1f та %.1f."
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "має бути більше або дорівнювати %.1f."
+
+#~ msgid "must be one of the following:"
+#~ msgstr "має бути одним із наступних:"
+
+#~ msgid "Unrecognized format"
+#~ msgstr "Невідомий формат"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "невідомий формат проксі"
+
+#~ msgid ""
+#~ " --direct-file-mapping=true|false Directly read from and write to each "
+#~ "file\n"
+#~ "                              mentioned in .torrent file."
+#~ msgstr ""
+#~ " --direct-file-mapping=true|false Пряме читання з та запис до кожного "
+#~ "файлу\n"
+#~ "                              згаданого в .torrent файлі."
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "Помилка відкриття сегменту файлу %s, обумовлена: %s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "Помилка запису до сегменту файлу %s, обумовлена: %s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "Помилка читання із сегменту файлу %s, обумовлена: %s"
diff --git a/po/vi.po b/po/vi.po
index 0fee4ffc..aaeb354f 100644
--- a/po/vi.po
+++ b/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: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+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"
@@ -18,33 +18,33 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-14 11:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 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:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Quá trình đóng chương trình bắt đầu..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 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:116
+#: src/MultiUrlRequestInfo.cc:111
 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:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "Kết quả tải tập tin"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "Tình trạng"
 
@@ -60,56 +60,6 @@ msgstr "                              Ghi chú "
 msgid "                              Possible Values: "
 msgstr "                              Giá trị có thể "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "Giá trị phải là \"true\" (đúng) hoặc \"falsa\" (sai)"
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "phải ở giữa %s và %s"
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr ""
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr ""
-
-#: src/OptionHandlerImpl.h:529
-msgid "Unrecognized format"
-msgstr ""
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr ""
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -129,7 +79,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -320,7 +270,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -328,12 +278,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -409,7 +360,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -417,7 +368,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -430,7 +381,7 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr ""
 
 #: src/usage_text.h:213
@@ -477,7 +428,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -520,12 +471,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -535,7 +480,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -545,7 +490,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -554,13 +499,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -575,7 +520,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -587,15 +532,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -605,19 +550,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -627,15 +572,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -648,20 +594,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -669,14 +615,14 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -690,34 +636,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -733,9 +679,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -743,11 +690,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -760,23 +707,23 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -788,30 +735,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr ""
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -820,7 +767,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -831,7 +778,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -844,7 +791,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -874,7 +821,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -883,7 +830,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -893,7 +840,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -901,7 +848,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -912,7 +859,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -921,14 +868,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -940,14 +887,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -955,25 +902,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -983,7 +930,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -991,15 +938,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1009,7 +956,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1024,7 +971,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1037,7 +984,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1048,7 +995,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1064,47 +1011,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1113,7 +1061,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1121,7 +1069,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1129,7 +1077,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1151,18 +1099,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1179,7 +1127,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1191,7 +1139,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1201,18 +1149,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1222,45 +1170,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1270,7 +1218,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1287,7 +1235,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1300,11 +1248,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1315,11 +1263,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1329,7 +1277,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1341,14 +1289,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1365,7 +1313,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1374,21 +1322,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1397,7 +1345,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1406,7 +1354,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1414,19 +1362,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1437,7 +1385,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1450,7 +1398,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1508,26 +1456,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1541,13 +1489,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2044,199 +1992,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
@@ -2244,3 +2177,9 @@ msgstr ""
 #: src/BtSetup.cc:212
 msgid "Errors occurred while binding port.\n"
 msgstr ""
+
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "Giá trị phải là \"true\" (đúng) hoặc \"falsa\" (sai)"
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "phải ở giữa %s và %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f30f10e1..5b035083 100644
--- a/po/zh_CN.po
+++ b/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: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2010-09-21 11:03+0000\n"
 "Last-Translator: Iven Day <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-10-12 11:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr "正在关闭程序... 紧急关闭请再按Ctrl-C"
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "紧急关闭程序..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "重新启动aria2,自动继续下载文件"
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -39,11 +39,11 @@ msgstr ""
 "如果发生任何错误,请参阅日志文件。要了解详细信息,请在help/man页面中参阅'-"
 "l'选项。"
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "下载结果:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "状态标识:"
 
@@ -59,56 +59,6 @@ msgstr "                              标记: "
 msgid "                              Possible Values: "
 msgstr "                              可能的取值: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "必须为'true'或'false'."
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "必须在%s和%s之间。"
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "必须小于或等于%s。"
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "必须大于或等于%s。"
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "必须是一个数字。"
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "必须小于或等于%.1f。"
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "必须在%.1f 和%.1f之间。"
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "必须大于或等于%.1f。"
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "必须是下列取值之一:"
-
-#: src/OptionHandlerImpl.h:529
-msgid "Unrecognized format"
-msgstr ""
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "无法识别的代理格式"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -131,8 +81,9 @@ msgstr ""
 "                              日志将被写到标准输出(通常是显示器)。"
 
 #: src/usage_text.h:45
+#, fuzzy
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -368,21 +319,27 @@ msgstr ""
 "                              如果遇到任何错误,请关闭。"
 
 #: src/usage_text.h:150
+#, fuzzy
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
 msgstr ""
+" -R, --remote-time[=true|false] 从远程HTTP/FTP服务器检索远程\n"
+"                              文件的时间戳以及其是否有效,将\n"
+"                              之应用到本地文件。"
 
 #: src/usage_text.h:154
+#, fuzzy
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 " --allow-piece-length-change=true|false 如果选择false,当来自控制文件\n"
 "                              中的片段长度不相同时,aria2会放弃下\n"
@@ -490,8 +447,9 @@ msgstr ""
 "                              此设置仅对BT下载有效。"
 
 #: src/usage_text.h:198
+#, fuzzy
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -501,8 +459,9 @@ msgstr ""
 "                              校验数据块。"
 
 #: src/usage_text.h:202
+#, fuzzy
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -520,7 +479,8 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr " -U, --user-agent=USER_AGENT 为http(s)下载设置用户代理。"
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc 禁止netrc支持。"
 
 #: src/usage_text.h:213
@@ -579,8 +539,9 @@ msgid ""
 msgstr ""
 
 #: src/usage_text.h:234
+#, fuzzy
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -643,14 +604,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-" --direct-file-mapping=true|false 直接读写.torrent文件中\n"
-"                              提及的每个文件。"
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -665,7 +618,7 @@ msgstr ""
 "                              指定一个范围:\"6881-6999\"。','\n"
 "                              和'-'可以一起使用。"
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -675,7 +628,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -689,7 +642,7 @@ msgstr ""
 "                              要限制总体上传速度,使用\n"
 "                              --max-overall-upload-limit option.选项。"
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -697,7 +650,7 @@ msgstr ""
 " --seed-time=MINUTES 指定做种时间(以分钟计)。也可以\n"
 "                              参阅--seed-ratio选项。"
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -720,7 +673,7 @@ msgstr ""
 "                              选项,在链接中至少有一个被\n"
 "                              满足时,做种结束。"
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -732,15 +685,15 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr " --enable-peer-exchange[=true|false] 启用Peer交换扩展。"
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -750,19 +703,19 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -776,9 +729,11 @@ msgstr ""
 "                              aria2会选择满足给定级别中最低\n"
 "                              的一个。"
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
+#, fuzzy
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
@@ -788,7 +743,7 @@ msgstr ""
 "                              连接。因此aria2问题使用\n"
 "                              模糊握手。"
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -808,7 +763,7 @@ msgstr ""
 "                              \n"
 "                              您可以附加K或M(1K=1024,1M=1024K)。"
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
@@ -817,7 +772,7 @@ msgstr ""
 " --bt-max-open-files=NUM 指定每个BT下载可以打开的\n"
 "                              文件的最多数目。"
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
@@ -825,7 +780,7 @@ msgstr ""
 " --bt-seed-unverified[=true|false] 不验证片段的哈希值,直接以上\n"
 "                              一个下载文件做种子。"
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -836,14 +791,14 @@ msgstr ""
 "                              0意味着不限制。\n"
 "                              也可以参阅--bt-request-peer-speed-limit选项。"
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
 "Reads\n"
 "                              input from stdin when '-' is specified."
 msgstr ""
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -865,20 +820,20 @@ msgstr ""
 "                              替NUM_SERVERS。\n"
 "                              也可以参阅-s和-j选项。"
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION 要下载的文件的版本。"
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE 要下载的文件的语言。"
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr " --metalink-os=OS 要下载的文件的操作系统。"
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
@@ -888,7 +843,7 @@ msgstr ""
 "                              可以使用以英文逗号分隔\n"
 "                              位置的列表。"
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
@@ -897,7 +852,7 @@ msgstr ""
 " --metalink-preferred-protocol=PROTO 指定首选的协议。如果没\n"
 "                              有首选协议,请指定'none'。"
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -913,9 +868,11 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
+#, fuzzy
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -929,11 +886,11 @@ msgstr ""
 "                              使用--metalink-preferred-protocol选项可\n"
 "                              以指定协议的首选项。"
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version 打印版本号并退出。"
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -946,16 +903,17 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr " --no-conf 禁止加载aria2.conf文件。"
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr " --conf-path=PATH 将配置文件的路径修改为PATH的值。"
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
@@ -964,7 +922,7 @@ msgstr ""
 " --stop=SEC 在经过SEC秒之后停止程序。\n"
 "                              如果给定的值是0,此功能将被禁止。"
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -982,19 +940,19 @@ msgstr ""
 "9J1\"\n"
 "                              http://host/file"
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr " -q, --quiet[=true|false] 使aria2安静(即不在控制台输出)。"
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr " --async-dns[=true|false] 启用异步DNS。"
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr " --ftp-reuse-connection[=true|false] 重新使用FTP中的链接。"
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
@@ -1003,11 +961,11 @@ msgstr ""
 " --summary-interval=SEC 设置下载过程摘要的输出间隔。\n"
 "                              设置0会禁止输出。"
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr " --log-level=LEVEL 设置输出的日志级别。"
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -1019,7 +977,7 @@ msgstr ""
 "                              文件的时间戳以及其是否有效,将\n"
 "                              之应用到本地文件。"
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -1034,7 +992,7 @@ msgstr ""
 "                              接建立之后,此选项将失效\n"
 "                              并以--timeout选项替代。"
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -1053,7 +1011,7 @@ msgstr ""
 "                              此选项仅在使用HTTP/FTP服务器\n"
 "                              时有效。"
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -1101,7 +1059,7 @@ msgstr ""
 "                              就像'feedback',将使用服务器的\n"
 "                              性能配置文件。"
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -1113,7 +1071,7 @@ msgstr ""
 "                              您也可以使用--server-stat-if\n"
 "                              选项加载保存的数据。"
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -1127,7 +1085,7 @@ msgstr ""
 "                              某些URI选择器之中,比如'feedback'。\n"
 "                              也可以参阅--uri-selector选项"
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -1138,7 +1096,7 @@ msgstr ""
 "                              来,废止性能配置文件\n"
 "                              的超时(以秒计)。"
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -1149,7 +1107,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -1158,14 +1116,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -1177,14 +1135,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -1192,25 +1150,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -1220,7 +1178,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -1228,15 +1186,15 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr ""
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr ""
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1246,7 +1204,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1261,7 +1219,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1274,7 +1232,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1285,7 +1243,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1301,47 +1259,65 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
+#, fuzzy
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --max-overall-download-limit=SPEED 设置最大总体下载速度,以b/秒计。\n"
+"                              0意味着不限制。\n"
+"                              您可以附加K或M(1K = 1024, 1M = 1024K)。\n"
+"                              要限制每个下载的下载速度,请使用\n"
+"                              --max-download-limit选项。"
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
+#, fuzzy
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --ftp-proxy=PROXY 设置FTP代理服务器。要覆盖\n"
+"                              之前设置的代理,请使用\"\"。也请\n"
+"                              参阅影响全部URL的--all-proxy选项。"
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
+#, fuzzy
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
+" --max-overall-download-limit=SPEED 设置最大总体下载速度,以b/秒计。\n"
+"                              0意味着不限制。\n"
+"                              您可以附加K或M(1K = 1024, 1M = 1024K)。\n"
+"                              要限制每个下载的下载速度,请使用\n"
+"                              --max-download-limit选项。"
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
+#, fuzzy
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1349,8 +1325,17 @@ msgid ""
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --follow-torrent=true|false|mem 如果指定true或mem,当后缀为.torrent\n"
+"                              或内容类型是application/x-bittorrent的文\n"
+"                              件被下载时,aria2将分析其为torrent文件\n"
+"                              并下载其中提及的文件。\n"
+"                              \n"
+"                              如果指定mem,torrent文件不会被写入\n"
+"                              到磁盘,但只保留在内存中。\n"
+"                              如果指定false,上面提到的动作\n"
+"                              将不会被采取。"
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1358,7 +1343,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1366,7 +1351,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1388,18 +1373,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1416,7 +1401,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1428,7 +1413,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1438,18 +1423,18 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr ""
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1459,45 +1444,45 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr ""
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr ""
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr ""
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr ""
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1507,7 +1492,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1524,7 +1509,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1537,11 +1522,11 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1552,11 +1537,11 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1566,7 +1551,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1578,7 +1563,7 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 #, fuzzy
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
@@ -1588,7 +1573,7 @@ msgstr ""
 " --bt-max-open-files=NUM 指定每个BT下载可以打开的\n"
 "                              文件的最多数目。"
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 #, fuzzy
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
@@ -1613,7 +1598,7 @@ msgstr ""
 "                              \n"
 "                              您可以附加K或M(1K=1024,1M=1024K)。"
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1622,21 +1607,28 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
+#, fuzzy
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
+" --bt-hash-check-seed[=true|false] 如果选择true,在使用--check-integrityer\n"
+"                              选项进行哈希检查后,且文件完整时,\n"
+"                              继续提供文件种子。如果您仅仅想检查并下\n"
+"                              载文件,当文件被损坏或不完整时,\n"
+"                              请设置此选项为false。\n"
+"                              此设置仅对BT下载有效。"
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1645,7 +1637,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1654,7 +1646,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1662,19 +1654,19 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1685,7 +1677,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1698,7 +1690,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1756,26 +1748,26 @@ msgstr ""
 msgid "Printing options whose name includes '%s'."
 msgstr ""
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, c-format
 msgid "No option matching with '%s'."
 msgstr ""
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
 "all\n"
 " URIs must point to the same file or downloading will fail."
 msgstr ""
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1789,13 +1781,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr ""
 
@@ -2292,199 +2284,184 @@ msgstr ""
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr ""
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
 "%s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr "捕捉到异常"
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr "无效的文件长度。不能继续下载%s:本地%s,远程%s"
@@ -2492,3 +2469,41 @@ msgstr "无效的文件长度。不能继续下载%s:本地%s,远程%s"
 #: src/BtSetup.cc:212
 msgid "Errors occurred while binding port.\n"
 msgstr "绑定端口时发生错误。\n"
+
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "必须为'true'或'false'."
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "必须在%s和%s之间。"
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "必须小于或等于%s。"
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "必须大于或等于%s。"
+
+#~ msgid "must be a number."
+#~ msgstr "必须是一个数字。"
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "必须小于或等于%.1f。"
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "必须在%.1f 和%.1f之间。"
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "必须大于或等于%.1f。"
+
+#~ msgid "must be one of the following:"
+#~ msgstr "必须是下列取值之一:"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "无法识别的代理格式"
+
+#~ msgid ""
+#~ " --direct-file-mapping=true|false Directly read from and write to each "
+#~ "file\n"
+#~ "                              mentioned in .torrent file."
+#~ msgstr ""
+#~ " --direct-file-mapping=true|false 直接读写.torrent文件中\n"
+#~ "                              提及的每个文件。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 791be3b7..211163d9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2010-11-01 20:48+0900\n"
+"POT-Creation-Date: 2010-12-05 15:54+0900\n"
 "PO-Revision-Date: 2008-10-08 08:24+0000\n"
 "Last-Translator: snufkinto <Unknown>\n"
 "Language-Team: Traditional Chinese <zh_TW@li.org>\n"
@@ -18,31 +18,31 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-14 11:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:224
+#: src/DownloadEngine.cc:220
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr "關閉序列開始...如要緊急關閉,請再次按Ctrl-C。"
 
-#: src/DownloadEngine.cc:231
+#: src/DownloadEngine.cc:227
 msgid "Emergency shutdown sequence commencing..."
 msgstr "緊急關閉序列開始..."
 
-#: src/MultiUrlRequestInfo.cc:114
+#: src/MultiUrlRequestInfo.cc:109
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2將於傳輸重新開始後恢復下載。"
 
-#: src/MultiUrlRequestInfo.cc:116
+#: src/MultiUrlRequestInfo.cc:111
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 "如有錯誤,請查看日誌記錄檔案。詳細資訊請參考幫助/man page內的 '-l' 選項。"
 
-#: src/RequestGroupMan.cc:609
+#: src/RequestGroupMan.cc:608
 msgid "Download Results:"
 msgstr "下載結果:"
 
-#: src/RequestGroupMan.cc:669
+#: src/RequestGroupMan.cc:649
 msgid "Status Legend:"
 msgstr "狀態說明:"
 
@@ -58,57 +58,6 @@ msgstr "                              標籤: "
 msgid "                              Possible Values: "
 msgstr "                              有效值: "
 
-#: src/OptionHandlerImpl.h:137
-msgid "must be either 'true' or 'false'."
-msgstr "必須為'true'或'false'。"
-
-#: src/OptionHandlerImpl.h:171 src/OptionHandlerImpl.h:220
-#, c-format
-msgid "must be between %s and %s."
-msgstr "必須在%s和%s之間。"
-
-#: src/OptionHandlerImpl.h:217
-#, c-format
-msgid "must be smaller than or equal to %s."
-msgstr "必須小於或等於%s。"
-
-#: src/OptionHandlerImpl.h:223
-#, c-format
-msgid "must be greater than or equal to %s."
-msgstr "必須大於或等於%s。"
-
-#: src/OptionHandlerImpl.h:226 src/OptionHandlerImpl.h:304
-msgid "must be a number."
-msgstr "必須是一個數字。"
-
-#: src/OptionHandlerImpl.h:295
-#, c-format
-msgid "must be smaller than or equal to %.1f."
-msgstr "必須小於或等於%.1f。"
-
-#: src/OptionHandlerImpl.h:298
-#, c-format
-msgid "must be between %.1f and %.1f."
-msgstr "必須在%.1f和%.1f之間。"
-
-#: src/OptionHandlerImpl.h:301
-#, c-format
-msgid "must be greater than or equal to %.1f."
-msgstr "必須大於或等於%.1f。"
-
-#: src/OptionHandlerImpl.h:479
-msgid "must be one of the following:"
-msgstr "必須為以下其中之一:"
-
-#: src/OptionHandlerImpl.h:529
-#, fuzzy
-msgid "Unrecognized format"
-msgstr "無法識別的代理伺服器格式"
-
-#: src/OptionHandlerImpl.h:665
-msgid "unrecognized proxy format"
-msgstr "無法識別的代理伺服器格式"
-
 #: src/usage_text.h:37
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
@@ -129,7 +78,7 @@ msgstr ""
 
 #: src/usage_text.h:45
 msgid ""
-" -D, --daemon                 Run as daemon. The current working directory "
+" -D, --daemon[=true|false]    Run as daemon. The current working directory "
 "will\n"
 "                              be changed to \"/\" and standard input, "
 "standard\n"
@@ -321,7 +270,7 @@ msgstr ""
 
 #: src/usage_text.h:150
 msgid ""
-" --allow-overwrite=true|false Restart download from scratch if the\n"
+" --allow-overwrite[=true|false] Restart download from scratch if the\n"
 "                              corresponding control file doesn't exist.  "
 "See\n"
 "                              also --auto-file-renaming option."
@@ -329,12 +278,13 @@ msgstr ""
 
 #: src/usage_text.h:154
 msgid ""
-" --allow-piece-length-change=true|false If false is given, aria2 aborts "
-"download\n"
-"                              when a piece length is different from one in\n"
-"                              a control file. If true is given, you can "
-"proceed\n"
-"                              but some download progress will be lost."
+" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n"
+"                              download when a piece length is different "
+"from\n"
+"                              one in a control file. If true is given, you "
+"can\n"
+"                              proceed but some download progress will be "
+"lost."
 msgstr ""
 
 #: src/usage_text.h:159
@@ -411,7 +361,7 @@ msgstr ""
 
 #: src/usage_text.h:198
 msgid ""
-" --realtime-chunk-checksum=true|false  Validate chunk of data by "
+" --realtime-chunk-checksum[=true|false]  Validate chunk of data by "
 "calculating\n"
 "                              checksum while downloading a file if chunk\n"
 "                              checksums are provided."
@@ -419,7 +369,7 @@ msgstr ""
 
 #: src/usage_text.h:202
 msgid ""
-" -c, --continue               Continue downloading a partially downloaded\n"
+" -c, --continue[=true|false]  Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
 "                              started by a web browser or another program\n"
 "                              which downloads files sequentially from the\n"
@@ -432,7 +382,8 @@ msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr " -U, --user-agent=USER_AGENT 為http(s)下載設定使用者識別字串。"
 
 #: src/usage_text.h:211
-msgid " -n, --no-netrc               Disables netrc support."
+#, fuzzy
+msgid " -n, --no-netrc[=true|false]  Disables netrc support."
 msgstr " -n, --no-netrc 停用netrc支援。"
 
 #: src/usage_text.h:213
@@ -479,7 +430,7 @@ msgstr ""
 
 #: src/usage_text.h:234
 msgid ""
-" -S, --show-files             Print file listing of .torrent or .metalink "
+" -S, --show-files[=true|false] Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit. More detailed information will be "
 "listed\n"
@@ -522,12 +473,6 @@ msgstr ""
 
 #: src/usage_text.h:259
 msgid ""
-" --direct-file-mapping=true|false Directly read from and write to each file\n"
-"                              mentioned in .torrent file."
-msgstr ""
-
-#: src/usage_text.h:262
-msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
 "                              for example: \"6881,6885\". You can also use "
@@ -537,7 +482,7 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:268
+#: src/usage_text.h:265
 msgid ""
 " --max-overall-upload-limit=SPEED Set max overall upload speed in bytes/"
 "sec.\n"
@@ -547,7 +492,7 @@ msgid ""
 "                              --max-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:274
+#: src/usage_text.h:271
 msgid ""
 " -u, --max-upload-limit=SPEED Set max upload speed per each torrent in\n"
 "                              bytes/sec. 0 means unrestricted.\n"
@@ -556,13 +501,13 @@ msgid ""
 "                              --max-overall-upload-limit option."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:277
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:283
+#: src/usage_text.h:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO.\n"
@@ -577,7 +522,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:292
+#: src/usage_text.h:289
 msgid ""
 " --peer-id-prefix=PEER_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -589,16 +534,16 @@ msgid ""
 "bytes."
 msgstr ""
 
-#: src/usage_text.h:298
+#: src/usage_text.h:295
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr " --enable-peer-exchange[=true|false] 使用Peer Exchange擴充套件。"
 
-#: src/usage_text.h:300
+#: src/usage_text.h:297
 #, fuzzy
 msgid " --enable-dht[=true|false]    Enable IPv4 DHT functionality."
 msgstr " --enable-dht[=true|false] 使用DHT功能。"
 
-#: src/usage_text.h:302
+#: src/usage_text.h:299
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for both IPv4 and IPv6\n"
 "                              DHT. Multiple ports can be specified by using\n"
@@ -608,20 +553,20 @@ msgid ""
 "                              and '-' can be used together."
 msgstr ""
 
-#: src/usage_text.h:308
+#: src/usage_text.h:305
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to IPv4 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:311
+#: src/usage_text.h:308
 #, fuzzy
 msgid ""
 " --dht-file-path=PATH         Change the IPv4 DHT routing table file to PATH."
 msgstr " --conf-path=PATH 更改設定檔案路徑至PATH。"
 
-#: src/usage_text.h:313
+#: src/usage_text.h:310
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -631,15 +576,16 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:318
+#: src/usage_text.h:315
 msgid ""
-" --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
+" --bt-require-crypto[=true|false] If true is given, aria2 doesn't accept "
+"and\n"
 "                              establish connection with legacy BitTorrent\n"
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:323
+#: src/usage_text.h:320
 msgid ""
 " --bt-request-peer-speed-limit=SPEED If the whole download speed of every\n"
 "                              torrent is lower than SPEED, aria2 "
@@ -652,20 +598,20 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:331
+#: src/usage_text.h:328
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:334
+#: src/usage_text.h:331
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:334
 msgid ""
 " --bt-max-peers=NUM           Specify the maximum number of peers per "
 "torrent.\n"
@@ -673,7 +619,7 @@ msgid ""
 "                              See also --bt-request-peer-speed-limit option."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:338
 #, fuzzy
 msgid ""
 " -M, --metalink-file=METALINK_FILE The file path to the .metalink file. "
@@ -681,7 +627,7 @@ msgid ""
 "                              input from stdin when '-' is specified."
 msgstr " -M, --metalink-file=METALINK_FILE .metalink檔案路徑。"
 
-#: src/usage_text.h:344
+#: src/usage_text.h:341
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously. Some Metalinks regulate the\n"
@@ -695,34 +641,34 @@ msgid ""
 "                              See also -s and -j options."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:350
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION 指定要下載的檔案版本。"
 
-#: src/usage_text.h:355
+#: src/usage_text.h:352
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE 指定要下載的檔案語言。"
 
-#: src/usage_text.h:357
+#: src/usage_text.h:354
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr " --metalink-os=OS 指定要下載的檔案作業系統。"
 
-#: src/usage_text.h:359
+#: src/usage_text.h:356
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-delimited list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:363
+#: src/usage_text.h:360
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specify "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:366
+#: src/usage_text.h:363
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metalink or content type of\n"
@@ -738,9 +684,10 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:376
+#: src/usage_text.h:373
 msgid ""
-" --metalink-enable-unique-protocol=true|false If true is given and several\n"
+" --metalink-enable-unique-protocol[=true|false] If true is given and "
+"several\n"
 "                              protocols are available for a mirror in a "
 "metalink\n"
 "                              file, aria2 uses one of them.\n"
@@ -748,11 +695,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:382
+#: src/usage_text.h:379
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version 列印版本號後退出。"
 
-#: src/usage_text.h:384
+#: src/usage_text.h:381
 msgid ""
 " -h, --help[=TAG|KEYWORD]     Print usage and exit.\n"
 "                              The help messages are classified with tags. A "
@@ -765,23 +712,24 @@ msgid ""
 "                              for the options whose name includes that word."
 msgstr ""
 
-#: src/usage_text.h:391
-msgid " --no-conf                    Disable loading aria2.conf file."
+#: src/usage_text.h:388
+#, fuzzy
+msgid " --no-conf[=true|false]       Disable loading aria2.conf file."
 msgstr " --no-conf 停止載入aria2.conf設定檔。"
 
-#: src/usage_text.h:393
+#: src/usage_text.h:390
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr " --conf-path=PATH 更改設定檔案路徑至PATH。"
 
-#: src/usage_text.h:395
+#: src/usage_text.h:392
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:398
+#: src/usage_text.h:395
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -793,31 +741,31 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:404
+#: src/usage_text.h:401
 #, fuzzy
 msgid " -q, --quiet[=true|false]     Make aria2 quiet(no console output)."
 msgstr " -q, --quiet[=true|false] 使用aria2安靜模式(無終端輸出)。"
 
-#: src/usage_text.h:406
+#: src/usage_text.h:403
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr " --async-dns[=true|false] 使用非同步DNS。"
 
-#: src/usage_text.h:408
+#: src/usage_text.h:405
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr " --ftp-reuse-connection[=true|false] 重用FTP的連接。"
 
-#: src/usage_text.h:410
+#: src/usage_text.h:407
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr " --summary-interval=SEC 設定輸出下載進度摘要的間隔。"
 
-#: src/usage_text.h:413
+#: src/usage_text.h:410
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr " --log-level=LEVEL 設定輸出記錄日誌級別。"
 
-#: src/usage_text.h:415
+#: src/usage_text.h:412
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -826,7 +774,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:419
+#: src/usage_text.h:416
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -837,7 +785,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:424
+#: src/usage_text.h:421
 msgid ""
 " --max-file-not-found=NUM     If aria2 receives `file not found' status from "
 "the\n"
@@ -850,7 +798,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:431
+#: src/usage_text.h:428
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -880,7 +828,7 @@ msgid ""
 "                              performance profile of servers."
 msgstr ""
 
-#: src/usage_text.h:450
+#: src/usage_text.h:447
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -889,7 +837,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:454
+#: src/usage_text.h:451
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -899,7 +847,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:459
+#: src/usage_text.h:456
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -907,7 +855,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:463
+#: src/usage_text.h:460
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -918,7 +866,7 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
-#: src/usage_text.h:468
+#: src/usage_text.h:465
 msgid ""
 " --certificate=FILE           Use the client certificate in FILE.\n"
 "                              The certificate must be in PEM format.\n"
@@ -927,14 +875,14 @@ msgid ""
 "                              private key."
 msgstr ""
 
-#: src/usage_text.h:473
+#: src/usage_text.h:470
 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:477
+#: src/usage_text.h:474
 msgid ""
 " --ca-certificate=FILE        Use the certificate authorities in FILE to "
 "verify\n"
@@ -946,14 +894,14 @@ msgid ""
 "                              verification."
 msgstr ""
 
-#: src/usage_text.h:483
+#: src/usage_text.h:480
 msgid ""
 " --check-certificate[=true|false] Verify the peer using certificates "
 "specified\n"
 "                              in --ca-certificate option."
 msgstr ""
 
-#: src/usage_text.h:486
+#: src/usage_text.h:483
 msgid ""
 " --no-proxy=DOMAINS           Specify comma separated hostnames, domains or\n"
 "                              network address with or without CIDR block "
@@ -961,25 +909,25 @@ msgid ""
 "                              proxy should not be used."
 msgstr ""
 
-#: src/usage_text.h:490
+#: src/usage_text.h:487
 msgid ""
 " --use-head[=true|false]      Use HEAD method for the first request to the "
 "HTTP\n"
 "                              server."
 msgstr ""
 
-#: src/usage_text.h:493
+#: src/usage_text.h:490
 msgid " --event-poll=POLL            Specify the method for polling events."
 msgstr ""
 
-#: src/usage_text.h:495
+#: src/usage_text.h:492
 msgid ""
 " --xml-rpc-listen-port=PORT   Specify a port number for XML-RPC server to "
 "listen\n"
 "                              to."
 msgstr ""
 
-#: src/usage_text.h:498
+#: src/usage_text.h:495
 msgid ""
 " --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"
 "                              It is strongly recommended to set username "
@@ -989,7 +937,7 @@ msgid ""
 "                              option. See also --xml-rpc-listen-port option."
 msgstr ""
 
-#: src/usage_text.h:503
+#: src/usage_text.h:500
 msgid ""
 " --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"
 "                              detects the request is more than SIZE bytes, "
@@ -997,17 +945,17 @@ msgid ""
 "                              drops connection."
 msgstr ""
 
-#: src/usage_text.h:507
+#: src/usage_text.h:504
 #, fuzzy
 msgid " --xml-rpc-user=USER          Set XML-RPC user."
 msgstr " --ftp-user=USER 設定FTP用戶(對所有URL有效)。"
 
-#: src/usage_text.h:509
+#: src/usage_text.h:506
 #, fuzzy
 msgid " --xml-rpc-passwd=PASSWD      Set XML-RPC password."
 msgstr " --ftp-passwd=PASSWD 設定FTP密碼(對所有URL有效)。"
 
-#: src/usage_text.h:511
+#: src/usage_text.h:508
 msgid ""
 " --bt-external-ip=IPADDRESS   Specify the external IP address to report to "
 "a\n"
@@ -1017,7 +965,7 @@ msgid ""
 "                              addresses."
 msgstr ""
 
-#: src/usage_text.h:516
+#: src/usage_text.h:513
 msgid ""
 " --http-auth-challenge[=true|false] Send HTTP authorization header only when "
 "it\n"
@@ -1032,7 +980,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:524
+#: src/usage_text.h:521
 msgid ""
 " -O, --index-out=INDEX=PATH   Set file path for file with index=INDEX. You "
 "can\n"
@@ -1045,7 +993,7 @@ msgid ""
 "                              times."
 msgstr ""
 
-#: src/usage_text.h:530
+#: src/usage_text.h:527
 msgid ""
 " --dry-run[=true|false]       If true is given, aria2 just checks whether "
 "the\n"
@@ -1056,7 +1004,7 @@ msgid ""
 "                              specified."
 msgstr ""
 
-#: src/usage_text.h:536
+#: src/usage_text.h:533
 msgid ""
 " --bt-tracker-interval=SEC    Set the interval in seconds between tracker\n"
 "                              requests. This completely overrides interval "
@@ -1072,47 +1020,48 @@ msgid ""
 "                              progress."
 msgstr ""
 
-#: src/usage_text.h:544
+#: src/usage_text.h:541
 msgid ""
-" --on-download-complete=COMMAND Set the command to be executed when "
+" --on-download-complete=COMMAND Set the command to be executed after "
 "download\n"
-"                              completes.\n"
+"                              completed.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:550
+#: src/usage_text.h:547
 msgid ""
-" --on-download-start=COMMAND  Set the command to be executed when download\n"
-"                              starts up. COMMAND must take just one argument "
-"and\n"
-"                              GID is passed to COMMAND as a first argument."
+" --on-download-start=COMMAND  Set the command to be executed after download\n"
+"                              got started. aria2 passes 3 arguments to "
+"COMMAND:\n"
+"                              GID, the nubmer of files and file path. See "
+"Event\n"
+"                              Hook in man page for more details."
 msgstr ""
 
-#: src/usage_text.h:554
+#: src/usage_text.h:552
 msgid ""
-" --on-download-pause=COMMAND  Set the command to be executed when download\n"
-"                              is paused.\n"
+" --on-download-pause=COMMAND  Set the command to be executed after download\n"
+"                              was paused.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:559
+#: src/usage_text.h:557
 msgid ""
-" --on-download-error=COMMAND  Set the command to be executed when download\n"
-"                              aborts due to error.\n"
+" --on-download-error=COMMAND  Set the command to be executed after download\n"
+"                              aborted due to error.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND.\n"
 "                              See also --on-download-stop option."
 msgstr ""
 
-#: src/usage_text.h:565
+#: src/usage_text.h:563
 msgid ""
-" --on-download-stop=COMMAND   Set the command to be executed when download\n"
-"                              stops. You can override the command to be "
-"executed\n"
-"                              for particular download result using\n"
+" --on-download-stop=COMMAND   Set the command to be executed after download\n"
+"                              stopped. You can override the command to be\n"
+"                              executed for particular download result using\n"
 "                              --on-download-complete and --on-download-"
 "error. If\n"
 "                              they are specified, command specified in this\n"
@@ -1121,7 +1070,7 @@ msgid ""
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:574
+#: src/usage_text.h:572
 msgid ""
 " --bt-stop-timeout=SEC        Stop BitTorrent download if download speed is "
 "0 in\n"
@@ -1129,7 +1078,7 @@ msgid ""
 "                              feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:578
+#: src/usage_text.h:576
 msgid ""
 " --xml-rpc-listen-all[=true|false] Listen incoming XML-RPC requests on all\n"
 "                              network interfaces. If false is given, listen "
@@ -1137,7 +1086,7 @@ msgid ""
 "                              on local loopback interface."
 msgstr ""
 
-#: src/usage_text.h:582
+#: src/usage_text.h:580
 msgid ""
 " --bt-prioritize-piece=head[=SIZE],tail[=SIZE] Try to download first and "
 "last\n"
@@ -1159,18 +1108,18 @@ msgid ""
 "                              1024K). If SIZE is omitted, SIZE=1M is used."
 msgstr ""
 
-#: src/usage_text.h:594
+#: src/usage_text.h:592
 msgid ""
 " --interface=INTERFACE        Bind sockets to given interface. You can "
 "specify\n"
 "                              interface name, IP address and hostname."
 msgstr ""
 
-#: src/usage_text.h:597
+#: src/usage_text.h:595
 msgid " --disable-ipv6[=true|false]  Disable IPv6."
 msgstr ""
 
-#: src/usage_text.h:599
+#: src/usage_text.h:597
 msgid ""
 " --bt-save-metadata[=true|false] Save metadata as .torrent file. This option "
 "has\n"
@@ -1187,7 +1136,7 @@ msgid ""
 "                              See also --bt-metadata-only option."
 msgstr ""
 
-#: src/usage_text.h:607
+#: src/usage_text.h:605
 msgid ""
 " --http-no-cache[=true|false] Send Cache-Control: no-cache and Pragma: no-"
 "cache\n"
@@ -1199,7 +1148,7 @@ msgid ""
 "                              using --header option."
 msgstr ""
 
-#: src/usage_text.h:613
+#: src/usage_text.h:611
 msgid ""
 " --bt-metadata-only[=true|false] Download metadata only. The file(s) "
 "described\n"
@@ -1209,19 +1158,19 @@ msgid ""
 "                              used. See also --bt-save-metadata option."
 msgstr ""
 
-#: src/usage_text.h:618
+#: src/usage_text.h:616
 msgid ""
 " --human-readable[=true|false] Print sizes and speed in human readable "
 "format\n"
 "                              (e.g., 1.2Ki, 3.4Mi) in the console readout."
 msgstr ""
 
-#: src/usage_text.h:621
+#: src/usage_text.h:619
 #, fuzzy
 msgid " --bt-enable-lpd[=true|false] Enable Local Peer Discovery."
 msgstr " --enable-dht[=true|false] 使用DHT功能。"
 
-#: src/usage_text.h:623
+#: src/usage_text.h:621
 msgid ""
 " --bt-lpd-interface=INTERFACE Use given interface for Local Peer Discovery. "
 "If\n"
@@ -1231,53 +1180,53 @@ msgid ""
 "                              name and IP address."
 msgstr ""
 
-#: src/usage_text.h:628
+#: src/usage_text.h:626
 msgid ""
 " --reuse-uri[=true|false]     Reuse already used URIs if no unused URIs are\n"
 "                              left."
 msgstr ""
 
-#: src/usage_text.h:631
+#: src/usage_text.h:629
 #, fuzzy
 msgid " --all-proxy-user=USER        Set user for --all-proxy option."
 msgstr " --http-proxy-user=USER 設定HTTP代理伺服器用戶(對所有URL有效)。"
 
-#: src/usage_text.h:633
+#: src/usage_text.h:631
 #, fuzzy
 msgid " --all-proxy-passwd=PASSWD    Set password for --all-proxy option."
 msgstr " --http-proxy-passwd=PASSWD 設定HTTP代理伺服器密碼(對所有URL有效)。"
 
-#: src/usage_text.h:635
+#: src/usage_text.h:633
 #, fuzzy
 msgid " --http-proxy-user=USER       Set user for --http-proxy option."
 msgstr " --http-proxy-user=USER 設定HTTP代理伺服器用戶(對所有URL有效)。"
 
-#: src/usage_text.h:637
+#: src/usage_text.h:635
 #, fuzzy
 msgid " --http-proxy-passwd=PASSWD   Set password for --http-proxy option."
 msgstr " --http-proxy-passwd=PASSWD 設定HTTP代理伺服器密碼(對所有URL有效)。"
 
-#: src/usage_text.h:639
+#: src/usage_text.h:637
 #, fuzzy
 msgid " --https-proxy-user=USER      Set user for --https-proxy option."
 msgstr " --http-proxy-user=USER 設定HTTP代理伺服器用戶(對所有URL有效)。"
 
-#: src/usage_text.h:641
+#: src/usage_text.h:639
 #, fuzzy
 msgid " --https-proxy-passwd=PASSWD  Set password for --https-proxy option."
 msgstr " --http-proxy-passwd=PASSWD 設定HTTP代理伺服器密碼(對所有URL有效)。"
 
-#: src/usage_text.h:643
+#: src/usage_text.h:641
 #, fuzzy
 msgid " --ftp-proxy-user=USER        Set user for --ftp-proxy option."
 msgstr " --http-proxy-user=USER 設定HTTP代理伺服器用戶(對所有URL有效)。"
 
-#: src/usage_text.h:645
+#: src/usage_text.h:643
 #, fuzzy
 msgid " --ftp-proxy-passwd=PASSWD    Set password for --ftp-proxy option."
 msgstr " --http-proxy-passwd=PASSWD 設定HTTP代理伺服器密碼(對所有URL有效)。"
 
-#: src/usage_text.h:647
+#: src/usage_text.h:645
 msgid ""
 " --remove-control-file[=true|false] Remove control file before download. "
 "Using\n"
@@ -1287,7 +1236,7 @@ msgid ""
 "resume."
 msgstr ""
 
-#: src/usage_text.h:652
+#: src/usage_text.h:650
 msgid ""
 " --always-resume[=true|false] Always resume download. If true is given, "
 "aria2\n"
@@ -1304,7 +1253,7 @@ msgid ""
 "                              See --max-resume-failure-tries option."
 msgstr ""
 
-#: src/usage_text.h:662
+#: src/usage_text.h:660
 msgid ""
 " --max-resume-failure-tries=N When used with --always-resume=false, aria2\n"
 "                              downloads file from scratch when aria2 detects "
@@ -1317,12 +1266,12 @@ msgid ""
 "                              See --always-resume option."
 msgstr ""
 
-#: src/usage_text.h:669
+#: src/usage_text.h:667
 #, fuzzy
 msgid " --bt-tracker-timeout=SEC     Set timeout in seconds."
 msgstr " -t, --timeout=SEC 設定超時(秒)。"
 
-#: src/usage_text.h:671
+#: src/usage_text.h:669
 msgid ""
 " --bt-tracker-connect-timeout=SEC Set the connect timeout in seconds to\n"
 "                              establish connection to tracker. After the\n"
@@ -1333,12 +1282,12 @@ msgid ""
 "                              instead."
 msgstr ""
 
-#: src/usage_text.h:677
+#: src/usage_text.h:675
 #, fuzzy
 msgid " --dht-message-timeout=SEC    Set timeout in seconds."
 msgstr " -t, --timeout=SEC 設定超時(秒)。"
 
-#: src/usage_text.h:679
+#: src/usage_text.h:677
 msgid ""
 " --http-accept-gzip[=true|false] Send 'Accept: deflate, gzip' request "
 "header\n"
@@ -1348,7 +1297,7 @@ msgid ""
 "                              'Content-Encoding: deflate'."
 msgstr ""
 
-#: src/usage_text.h:684
+#: src/usage_text.h:682
 msgid ""
 " --save-session=FILE          Save error/unfinished downloads to FILE on "
 "exit.\n"
@@ -1360,14 +1309,14 @@ msgid ""
 "                              XML-RPC method are not saved."
 msgstr ""
 
-#: src/usage_text.h:690
+#: src/usage_text.h:688
 msgid ""
 " -x, --max-connection-per-server=NUM The maximum number of connections to "
 "one\n"
 "                              server for each download."
 msgstr ""
 
-#: src/usage_text.h:693
+#: src/usage_text.h:691
 msgid ""
 " -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte "
 "range.\n"
@@ -1384,7 +1333,7 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:702
+#: src/usage_text.h:700
 msgid ""
 " --conditional-get[=true|false] Download file only when the local file is "
 "older\n"
@@ -1393,21 +1342,21 @@ msgid ""
 "                              many limitations. See man page for details."
 msgstr ""
 
-#: src/usage_text.h:706
+#: src/usage_text.h:704
 msgid ""
 " --on-bt-download-complete=COMMAND For BitTorrent, a command specified in\n"
-"                              --on-download-complete is called when "
+"                              --on-download-complete is called after "
 "download\n"
-"                              completes and seeding is over. On the other "
+"                              completed and seeding is over. On the other "
 "hand,\n"
 "                              this option sets the command to be executed "
-"when\n"
-"                              download completes but before seeding.\n"
+"after\n"
+"                              download completed but before seeding.\n"
 "                              See --on-download-start option for the\n"
 "                              requirement of COMMAND."
 msgstr ""
 
-#: src/usage_text.h:714
+#: src/usage_text.h:712
 msgid ""
 " --enable-async-dns6[=true|false] Enable IPv6 name resolution in "
 "asynchronous\n"
@@ -1416,7 +1365,7 @@ msgid ""
 "                              --async-dns=false."
 msgstr ""
 
-#: src/usage_text.h:718
+#: src/usage_text.h:716
 msgid ""
 " --enable-dht6[=true|false]   Enable IPv6 DHT functionality.\n"
 "                              Use --dht-listen-port option to specify port\n"
@@ -1425,7 +1374,7 @@ msgid ""
 "                              option."
 msgstr ""
 
-#: src/usage_text.h:723
+#: src/usage_text.h:721
 msgid ""
 " --dht-listen-addr6=ADDR      Specify address to bind socket for IPv6 DHT. \n"
 "                              It should be a global unicast IPv6 address of "
@@ -1433,20 +1382,20 @@ msgid ""
 "                              host."
 msgstr ""
 
-#: src/usage_text.h:727
+#: src/usage_text.h:725
 msgid ""
 " --dht-entry-point6=HOST:PORT Set host and port as an entry point to IPv6 "
 "DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:730
+#: src/usage_text.h:728
 #, fuzzy
 msgid ""
 " --dht-file-path6=PATH        Change the IPv6 DHT routing table file to PATH."
 msgstr " --conf-path=PATH 更改設定檔案路徑至PATH。"
 
-#: src/usage_text.h:732
+#: src/usage_text.h:730
 msgid ""
 " --bt-tracker=URI[,...]       Comma separated list of additional BitTorrent\n"
 "                              tracker's announce URI. These URIs are not\n"
@@ -1457,7 +1406,7 @@ msgid ""
 "                              option are removed."
 msgstr ""
 
-#: src/usage_text.h:738
+#: src/usage_text.h:736
 msgid ""
 " --bt-exclude-tracker=URI[,...] Comma separated list of BitTorrent "
 "tracker's\n"
@@ -1470,7 +1419,7 @@ msgid ""
 "                              See also --bt-tracker option."
 msgstr ""
 
-#: src/usage_text.h:745
+#: src/usage_text.h:743
 msgid ""
 " --max-download-result=NUM    Set maximum number of download result kept in\n"
 "                              memory. The download results are completed/"
@@ -1529,12 +1478,12 @@ msgstr "選項:"
 msgid "Printing options whose name includes '%s'."
 msgstr "列出包含'%s'的選項。"
 
-#: src/version_usage.cc:120
+#: src/version_usage.cc:121
 #, fuzzy, c-format
 msgid "No option matching with '%s'."
 msgstr "沒有幫助分類或選項名稱符合'%s'。"
 
-#: src/version_usage.cc:128
+#: src/version_usage.cc:129
 #, fuzzy
 msgid ""
 " You can specify multiple HTTP(S)/FTP URIs. Unless you specify -Z option, "
@@ -1544,14 +1493,14 @@ msgstr ""
 " 你可指定多個URL。除非使用了 -Z 選項,所有URL所指向的須為同一檔案,\n"
 " 否則將下載失敗。"
 
-#: src/version_usage.cc:130
+#: src/version_usage.cc:131
 msgid ""
 " You can also specify arbitrary number of BitTorrent Magnet URIs, torrent/\n"
 " metalink files stored in a local drive. Please note that they are always\n"
 " treated as a separate download."
 msgstr ""
 
-#: src/version_usage.cc:135
+#: src/version_usage.cc:136
 msgid ""
 " You can specify both torrent file with -T option and URIs. By doing this,\n"
 " download a file from both torrent swarm and HTTP/FTP server at the same "
@@ -1565,13 +1514,13 @@ msgid ""
 " 'path' in torrent are added to form a URI for each file."
 msgstr ""
 
-#: src/version_usage.cc:142
+#: src/version_usage.cc:143
 msgid ""
 " Make sure that URI is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
 
-#: src/version_usage.cc:152
+#: src/version_usage.cc:153
 msgid "Refer to man page for more information."
 msgstr "參考man page以獲取更多資訊。"
 
@@ -2072,122 +2021,107 @@ msgstr "%s 不是一個目錄。"
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "建立目錄 %s 失敗,原因:%s"
 
-#: src/message.h:232
-#, c-format
-msgid "Failed to open the segment file %s, cause: %s"
-msgstr "開啟分塊檔案 %s 失敗,原因:%s"
-
-#: src/message.h:233
-#, c-format
-msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "寫入分塊檔案 %s 失敗,原因:%s"
-
-#: src/message.h:234
-#, c-format
-msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "讀取分塊檔案 %s 失敗,原因:%s"
-
-#: src/message.h:236
+#: src/message.h:235
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "開啟通訊連接失敗,原因:%s"
 
-#: src/message.h:237
+#: src/message.h:236
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "設定通訊連接選項失敗,原因:%s"
 
-#: src/message.h:238
+#: src/message.h:237
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:239
+#: src/message.h:238
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:240
+#: src/message.h:239
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:241
+#: src/message.h:240
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:242
+#: src/message.h:241
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "接受使用者連接失敗,原因:%s"
 
-#: src/message.h:243
+#: src/message.h:242
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "取得通訊連接名稱失敗,原因:%s"
 
-#: src/message.h:244
+#: src/message.h:243
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr "取得已連接使用者名稱失敗,原因:%s"
 
-#: src/message.h:245
+#: src/message.h:244
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr "解析主機名稱 %s 失敗,原因:%s"
 
-#: src/message.h:246
+#: src/message.h:245
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr "連接主機 %s 失敗,原因:%s"
 
-#: src/message.h:247
+#: src/message.h:246
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr "檢查通訊連接是否可寫時失敗,原因:%s"
 
-#: src/message.h:248
+#: src/message.h:247
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr "檢查通訊連接是否可讀時失敗,原因:%s"
 
-#: src/message.h:249
+#: src/message.h:248
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr "傳送資料失敗,原因:%s"
 
-#: src/message.h:250
+#: src/message.h:249
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr "接受資料失敗,原因:%s"
 
-#: src/message.h:251
+#: src/message.h:250
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:252
+#: src/message.h:251
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "未知的通訊連接錯誤 %d (0x%x)"
 
-#: src/message.h:253
+#: src/message.h:252
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "找到檔案 %s ,但找不到 %s 。"
 
-#: src/message.h:255
+#: src/message.h:254
 #, c-format
 msgid "Invalid payload size for %s, size=%lu. It should be %lu."
 msgstr ""
 
-#: src/message.h:256
+#: src/message.h:255
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:257
+#: src/message.h:256
 #, fuzzy, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%lu, offset=%s, expectedHash="
@@ -2196,77 +2130,77 @@ msgstr ""
 "區塊checksum驗證失敗。checksumIndex=%d, offset=%s, expectedHash=%s, "
 "actualHash=%s"
 
-#: src/message.h:258
+#: src/message.h:257
 msgid "Download aborted."
 msgstr "下載已中斷。"
 
-#: src/message.h:259
+#: src/message.h:258
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr "檔案 %s 正被其他命令下載中。"
 
-#: src/message.h:260
+#: src/message.h:259
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:261
+#: src/message.h:260
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "Tracker返回錯誤原因:%s"
 
-#: src/message.h:262
+#: src/message.h:261
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:264
+#: src/message.h:263
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%ld seconds)."
 msgstr ""
 
-#: src/message.h:266
+#: src/message.h:265
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr "torrent檔案中的infoHash與.aria2檔案內的不相符。"
 
-#: src/message.h:267
+#: src/message.h:266
 #, c-format
 msgid "No such file entry %s"
 msgstr "無相關檔案項目 %s"
 
-#: src/message.h:268
+#: src/message.h:267
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr "下載速度太慢:%d <= %d(B/s), host:%s"
 
-#: src/message.h:269
+#: src/message.h:268
 msgid "No HttpRequestEntry found."
 msgstr "找不到HttpRequestEntry。"
 
-#: src/message.h:270
+#: src/message.h:269
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:271
+#: src/message.h:270
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:272
+#: src/message.h:271
 msgid "No file matched with your preference."
 msgstr "沒有符合的檔案。"
 
-#: src/message.h:273
+#: src/message.h:272
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:274
+#: src/message.h:273
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:275
+#: src/message.h:274
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr "無效的檔案長度,無法繼續下載 %s: local %s, remote %s"
@@ -2275,6 +2209,49 @@ msgstr "無效的檔案長度,無法繼續下載 %s: local %s, remote %s"
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 
+#~ msgid "must be either 'true' or 'false'."
+#~ msgstr "必須為'true'或'false'。"
+
+#~ msgid "must be between %s and %s."
+#~ msgstr "必須在%s和%s之間。"
+
+#~ msgid "must be smaller than or equal to %s."
+#~ msgstr "必須小於或等於%s。"
+
+#~ msgid "must be greater than or equal to %s."
+#~ msgstr "必須大於或等於%s。"
+
+#~ msgid "must be a number."
+#~ msgstr "必須是一個數字。"
+
+#~ msgid "must be smaller than or equal to %.1f."
+#~ msgstr "必須小於或等於%.1f。"
+
+#~ msgid "must be between %.1f and %.1f."
+#~ msgstr "必須在%.1f和%.1f之間。"
+
+#~ msgid "must be greater than or equal to %.1f."
+#~ msgstr "必須大於或等於%.1f。"
+
+#~ msgid "must be one of the following:"
+#~ msgstr "必須為以下其中之一:"
+
+#, fuzzy
+#~ msgid "Unrecognized format"
+#~ msgstr "無法識別的代理伺服器格式"
+
+#~ msgid "unrecognized proxy format"
+#~ msgstr "無法識別的代理伺服器格式"
+
+#~ msgid "Failed to open the segment file %s, cause: %s"
+#~ msgstr "開啟分塊檔案 %s 失敗,原因:%s"
+
+#~ msgid "Failed to write into the segment file %s, cause: %s"
+#~ msgstr "寫入分塊檔案 %s 失敗,原因:%s"
+
+#~ msgid "Failed to read from the segment file %s, cause: %s"
+#~ msgstr "讀取分塊檔案 %s 失敗,原因:%s"
+
 #~ msgid "CUID#%d - The download for one segment completed successfully."
 #~ msgstr "CUID#%d - 一個分塊已成功下載完畢。"