2007-09-03 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Disable parameterized URI support by default. Added -P option to
	enable the feature.
	* src/prefs.h: Added PREF_PARAMETERIZED_URI
	* src/OptionHandlerFactory.cc
	* src/main.cc: Also updated usages for -Z and 
--auto-file-renaming

	Updated Japanese translation.
	* po/ja.po

ChangeLog

@@ -6,6 +6,15 @@
 	* src/TimeBasedCommand.{h, cc}: New class.
 	* src/DownloadEngineFactory.cc (newConsoleEngine)
 
+	Disable parameterized URI support by default. Added -P option to
+	enable the feature.
+	* src/prefs.h: Added PREF_PARAMETERIZED_URI
+	* src/OptionHandlerFactory.cc
+	* src/main.cc: Also updated usages for -Z and --auto-file-renaming
+
+	Updated Japanese translation.
+	* po/ja.po
+	
 2007-09-02  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Now *.aria2 contorol file is first saved to *.aria2__temp and if

po/aria2c.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2007-08-29 00:46+0900\n"
+"POT-Creation-Date: 2007-09-03 20:34+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -789,7 +789,7 @@ msgstr ""
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/DownloadEngineFactory.cc:195
+#: src/DownloadEngineFactory.cc:197
 #, c-format
 msgid "Errors occurred while binding port.\n"
 msgstr ""
@@ -1009,8 +1009,9 @@ msgstr ""
 #: src/main.cc:199
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
-"sequentially and\n"
-"                              download each URI in a separate session, like\n"
+"sequentially\n"
+"                              and download each URI in a separate session, "
+"like\n"
 "                              the usual command-line download utilities.\n"
 "                              Default: false"
 msgstr ""
@@ -1023,11 +1024,29 @@ msgid ""
 "                              download.\n"
 "                              The new file name has a dot and a number"
 "(1..9999)\n"
-"                              appended. Default: true"
+"                              appended.\n"
+"                              Default: true"
 msgstr ""
 
 #: src/main.cc:209
 msgid ""
+" -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
+"                              You can specify set of parts:\n"
+"                              http://{sv1,sv2,sv3}/foo.iso\n"
+"                              Also you can specify numeric sequences with "
+"step\n"
+"                              counter:\n"
+"                              http://host/image[000-100:2].img\n"
+"                              A step counter can be omitted.\n"
+"                              If all URIs do not point to the same file, "
+"such\n"
+"                              as the second example above, -Z option is\n"
+"                              required.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/main.cc:221
+msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
 "hash.\n"
 "                              This option only affects in BitTorrent "
@@ -1042,7 +1061,7 @@ msgid ""
 "                              Default: false"
 msgstr ""
 
-#: src/main.cc:217
+#: src/main.cc:229
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -1052,7 +1071,7 @@ msgid ""
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:222
+#: src/main.cc:234
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1062,15 +1081,15 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/main.cc:228
+#: src/main.cc:240
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/main.cc:229
+#: src/main.cc:241
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:242
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1079,7 +1098,7 @@ msgid ""
 "                              Reads input from stdin when '-' is specified."
 msgstr ""
 
-#: src/main.cc:234
+#: src/main.cc:246
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
 "downloads.\n"
@@ -1087,20 +1106,20 @@ msgid ""
 "                              Default: 5"
 msgstr ""
 
-#: src/main.cc:237
+#: src/main.cc:249
 msgid ""
 " --load-cookies=FILE          Load cookies from FILE. The format of FILE is\n"
 "                              the same used by Netscape and Mozilla."
 msgstr ""
 
-#: src/main.cc:240
+#: src/main.cc:252
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit."
 msgstr ""
 
-#: src/main.cc:242
+#: src/main.cc:254
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -1114,11 +1133,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/main.cc:252
+#: src/main.cc:264
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/main.cc:253
+#: src/main.cc:265
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
 "                              entering BitTorrent mode even if the filename "
@@ -1127,20 +1146,20 @@ msgid ""
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:257
+#: src/main.cc:269
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:260
+#: src/main.cc:272
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
 "                              Default: 6881-6999"
 msgstr ""
 
-#: src/main.cc:262
+#: src/main.cc:274
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -1148,13 +1167,13 @@ msgid ""
 "                              Default: 0"
 msgstr ""
 
-#: src/main.cc:266
+#: src/main.cc:278
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/main.cc:268
+#: src/main.cc:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -1164,7 +1183,7 @@ msgid ""
 "                              least one of the conditions is satisfied."
 msgstr ""
 
-#: src/main.cc:273
+#: src/main.cc:285
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1177,35 +1196,35 @@ msgid ""
 "                              Default: -aria2-"
 msgstr ""
 
-#: src/main.cc:282
+#: src/main.cc:294
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/main.cc:283
+#: src/main.cc:295
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously.\n"
 "                              Default: 5"
 msgstr ""
 
-#: src/main.cc:286
+#: src/main.cc:298
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/main.cc:287
+#: src/main.cc:299
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/main.cc:288
+#: src/main.cc:300
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/main.cc:289
+#: src/main.cc:301
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr ""
 
-#: src/main.cc:290
+#: src/main.cc:302
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
 "                              entering Metalink mode even if the filename "
@@ -1214,93 +1233,93 @@ msgid ""
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:295
+#: src/main.cc:307
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/main.cc:296
+#: src/main.cc:308
 msgid " -h, --help                   Print this message and exit."
 msgstr ""
 
-#: src/main.cc:299
+#: src/main.cc:311
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
 " or downloading will fail."
 msgstr ""
 
-#: src/main.cc:304
+#: src/main.cc:316
 msgid ""
 " Specify files in multi-file torrent to download. Use in conjunction with "
 "the\n"
 " -T option. This argument is ignored if you specify the --select-file option."
 msgstr ""
 
-#: src/main.cc:308
+#: src/main.cc:320
 msgid "Examples:"
 msgstr ""
 
-#: src/main.cc:309
+#: src/main.cc:321
 msgid " Download a file using 1 connection:"
 msgstr ""
 
-#: src/main.cc:311
+#: src/main.cc:323
 msgid " Download a file using 2 connections:"
 msgstr ""
 
-#: src/main.cc:313
+#: src/main.cc:325
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
 msgstr ""
 
-#: src/main.cc:315
+#: src/main.cc:327
 msgid " You can mix up different protocols:"
 msgstr ""
 
-#: src/main.cc:317
+#: src/main.cc:329
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:319
-msgid " Parameterized URI. -Z option must be specified:"
+#: src/main.cc:331
+msgid " Parameterized URI. -Z option is required in this case:"
 msgstr ""
 
-#: src/main.cc:323
+#: src/main.cc:335
 msgid " Download a torrent:"
 msgstr ""
 
-#: src/main.cc:325
+#: src/main.cc:337
 msgid " Download a torrent using a local .torrent file:"
 msgstr ""
 
-#: src/main.cc:327 src/main.cc:340
+#: src/main.cc:339 src/main.cc:352
 msgid " Download only selected files:"
 msgstr ""
 
-#: src/main.cc:329
+#: src/main.cc:341
 msgid " Print file listing of .torrent file:"
 msgstr ""
 
-#: src/main.cc:334
+#: src/main.cc:346
 msgid " Metalink downloading:"
 msgstr ""
 
-#: src/main.cc:336
+#: src/main.cc:348
 msgid " Download a file using local .metalink file:"
 msgstr ""
 
-#: src/main.cc:338
+#: src/main.cc:350
 msgid " Metalink downloading with preferences:"
 msgstr ""
 
-#: src/main.cc:342
+#: src/main.cc:354
 msgid " Download only selected files using index:"
 msgstr ""
 
-#: src/main.cc:344
+#: src/main.cc:356
 msgid " Print file listing of .metalink file:"
 msgstr ""
 
-#: src/main.cc:348
+#: src/main.cc:360
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""

po/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2007-08-29 00:46+0900\n"
+"POT-Creation-Date: 2007-09-03 20:34+0900\n"
 "PO-Revision-Date: 2006-05-05 19:44+0900\n"
 "Last-Translator: Hermann J. Beckers <hj.beckers@onlinehome.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -813,7 +813,7 @@ msgstr ""
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/DownloadEngineFactory.cc:195
+#: src/DownloadEngineFactory.cc:197
 #, c-format
 msgid "Errors occurred while binding port.\n"
 msgstr "Fehler beim Binden an Port aufgetreten.\n"
@@ -1137,8 +1137,9 @@ msgstr ""
 #, fuzzy
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
-"sequentially and\n"
-"                              download each URI in a separate session, like\n"
+"sequentially\n"
+"                              and download each URI in a separate session, "
+"like\n"
 "                              the usual command-line download utilities.\n"
 "                              Default: false"
 msgstr ""
@@ -1158,7 +1159,8 @@ msgid ""
 "                              download.\n"
 "                              The new file name has a dot and a number"
 "(1..9999)\n"
-"                              appended. Default: true"
+"                              appended.\n"
+"                              Default: true"
 msgstr ""
 " --follow-torrent=true|false  Setzen dieser Option auf false verhindert die "
 "Nutzung\n"
@@ -1168,6 +1170,23 @@ msgstr ""
 "                              Fehlwert: true"
 
 #: src/main.cc:209
+msgid ""
+" -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
+"                              You can specify set of parts:\n"
+"                              http://{sv1,sv2,sv3}/foo.iso\n"
+"                              Also you can specify numeric sequences with "
+"step\n"
+"                              counter:\n"
+"                              http://host/image[000-100:2].img\n"
+"                              A step counter can be omitted.\n"
+"                              If all URIs do not point to the same file, "
+"such\n"
+"                              as the second example above, -Z option is\n"
+"                              required.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/main.cc:221
 #, fuzzy
 msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
@@ -1189,7 +1208,7 @@ msgstr ""
 "und 60 an.\n"
 "                              Fehlwert: 5"
 
-#: src/main.cc:217
+#: src/main.cc:229
 #, fuzzy
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
@@ -1206,7 +1225,7 @@ msgstr ""
 "                              auf .torrent endet.\n"
 "                              Fehlwert: true"
 
-#: src/main.cc:222
+#: src/main.cc:234
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1216,15 +1235,15 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/main.cc:228
+#: src/main.cc:240
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/main.cc:229
+#: src/main.cc:241
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:242
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1233,7 +1252,7 @@ msgid ""
 "                              Reads input from stdin when '-' is specified."
 msgstr ""
 
-#: src/main.cc:234
+#: src/main.cc:246
 #, fuzzy
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
@@ -1244,13 +1263,13 @@ msgstr ""
 " -m, --max-tries=N            Anzahl Versuche. 0 bedeutet unbegrenzt.\n"
 "                              Fehlwert: 5"
 
-#: src/main.cc:237
+#: src/main.cc:249
 msgid ""
 " --load-cookies=FILE          Load cookies from FILE. The format of FILE is\n"
 "                              the same used by Netscape and Mozilla."
 msgstr ""
 
-#: src/main.cc:240
+#: src/main.cc:252
 #, fuzzy
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
@@ -1260,7 +1279,7 @@ msgstr ""
 " -S, --show-files             Dateiliste der .torrent-Datei ausgeben und "
 "beenden."
 
-#: src/main.cc:242
+#: src/main.cc:254
 #, fuzzy
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
@@ -1283,12 +1302,12 @@ msgstr ""
 "                              Sie können auch '-' verwenden wie in \"1-5\".\n"
 "                              ',' und '-' können zusammen benutzt werden."
 
-#: src/main.cc:252
+#: src/main.cc:264
 #, fuzzy
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr " -T, --torrent-file=TORRENT_FILE  Datenpfad zur torrent-Datei."
 
-#: src/main.cc:253
+#: src/main.cc:265
 #, fuzzy
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
@@ -1304,7 +1323,7 @@ msgstr ""
 "                              auf .torrent endet.\n"
 "                              Fehlwert: true"
 
-#: src/main.cc:257
+#: src/main.cc:269
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
@@ -1314,7 +1333,7 @@ msgstr ""
 "                              .torrent-Datei erwähnten Datei.\n"
 "                              Fehlwert: true"
 
-#: src/main.cc:260
+#: src/main.cc:272
 #, fuzzy
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
@@ -1323,7 +1342,7 @@ msgstr ""
 " --listen-port=PORT           Port-Nummer zum Lauschen auf Peer-Verbindungen "
 "setzen."
 
-#: src/main.cc:262
+#: src/main.cc:274
 #, fuzzy
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
@@ -1337,7 +1356,7 @@ msgstr ""
 "und 60 an.\n"
 "                              Fehlwert: 5"
 
-#: src/main.cc:266
+#: src/main.cc:278
 #, fuzzy
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
@@ -1346,7 +1365,7 @@ msgstr ""
 " -m, --max-tries=N            Anzahl Versuche. 0 bedeutet unbegrenzt.\n"
 "                              Fehlwert: 5"
 
-#: src/main.cc:268
+#: src/main.cc:280
 #, fuzzy
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
@@ -1363,7 +1382,7 @@ msgstr ""
 "                              Daher verbindet sich aria2 zu jeder URL mit\n"
 "                              N Verbindungen."
 
-#: src/main.cc:273
+#: src/main.cc:285
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1376,12 +1395,12 @@ msgid ""
 "                              Default: -aria2-"
 msgstr ""
 
-#: src/main.cc:282
+#: src/main.cc:294
 #, fuzzy
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr " -T, --torrent-file=TORRENT_FILE  Datenpfad zur torrent-Datei."
 
-#: src/main.cc:283
+#: src/main.cc:295
 #, fuzzy
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
@@ -1395,24 +1414,24 @@ msgstr ""
 "                              auf .torrent endet.\n"
 "                              Fehlwert: true"
 
-#: src/main.cc:286
+#: src/main.cc:298
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/main.cc:287
+#: src/main.cc:299
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/main.cc:288
+#: src/main.cc:300
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/main.cc:289
+#: src/main.cc:301
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr ""
 
-#: src/main.cc:290
+#: src/main.cc:302
 #, fuzzy
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
@@ -1428,15 +1447,15 @@ msgstr ""
 "                              auf .torrent endet.\n"
 "                              Fehlwert: true"
 
-#: src/main.cc:295
+#: src/main.cc:307
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Versionsnummer ausgeben und beenden."
 
-#: src/main.cc:296
+#: src/main.cc:308
 msgid " -h, --help                   Print this message and exit."
 msgstr " -h, --help                   Diese Anzeige ausgeben und beenden."
 
-#: src/main.cc:299
+#: src/main.cc:311
 #, fuzzy
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
@@ -1446,7 +1465,7 @@ msgstr ""
 "verweisen\n"
 "oder der Abruf schlägt fehl."
 
-#: src/main.cc:304
+#: src/main.cc:316
 #, fuzzy
 msgid ""
 " Specify files in multi-file torrent to download. Use in conjunction with "
@@ -1458,21 +1477,21 @@ msgstr ""
 " -T-Option. Diese Argumente werden ignoriert, wenn sie die Option --select-"
 "file angeben."
 
-#: src/main.cc:308
+#: src/main.cc:320
 msgid "Examples:"
 msgstr "Beispiele:"
 
-#: src/main.cc:309
+#: src/main.cc:321
 #, fuzzy
 msgid " Download a file using 1 connection:"
 msgstr " Abruf einer Datei über 1 Verbindung:"
 
-#: src/main.cc:311
+#: src/main.cc:323
 #, fuzzy
 msgid " Download a file using 2 connections:"
 msgstr " Abruf einer Datei mit 2 Verbindungen:"
 
-#: src/main.cc:313
+#: src/main.cc:325
 #, fuzzy
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
@@ -1480,59 +1499,59 @@ msgstr ""
 " Abruf einer Datei über 2 Verbindungen, jede verbindet zu einem anderen "
 "Server:"
 
-#: src/main.cc:315
+#: src/main.cc:327
 msgid " You can mix up different protocols:"
 msgstr " Sie können verschiedene Protokolle mischen:"
 
-#: src/main.cc:317
+#: src/main.cc:329
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:319
-msgid " Parameterized URI. -Z option must be specified:"
+#: src/main.cc:331
+msgid " Parameterized URI. -Z option is required in this case:"
 msgstr ""
 
-#: src/main.cc:323
+#: src/main.cc:335
 msgid " Download a torrent:"
 msgstr " Einen torrent abrufen:"
 
-#: src/main.cc:325
+#: src/main.cc:337
 #, fuzzy
 msgid " Download a torrent using a local .torrent file:"
 msgstr " Einen torrent mit einer lokalen .torrent-Datei abrufen:"
 
-#: src/main.cc:327 src/main.cc:340
+#: src/main.cc:339 src/main.cc:352
 msgid " Download only selected files:"
 msgstr " Nur ausgewählte Dateien abrufen:"
 
-#: src/main.cc:329
+#: src/main.cc:341
 msgid " Print file listing of .torrent file:"
 msgstr " Dateiliste einer .torrent-Datei ausgeben:"
 
-#: src/main.cc:334
+#: src/main.cc:346
 msgid " Metalink downloading:"
 msgstr ""
 
-#: src/main.cc:336
+#: src/main.cc:348
 #, fuzzy
 msgid " Download a file using local .metalink file:"
 msgstr " Einen torrent mit einer lokalen .torrent-Datei abrufen:"
 
-#: src/main.cc:338
+#: src/main.cc:350
 msgid " Metalink downloading with preferences:"
 msgstr ""
 
-#: src/main.cc:342
+#: src/main.cc:354
 #, fuzzy
 msgid " Download only selected files using index:"
 msgstr " Nur ausgewählte Dateien abrufen:"
 
-#: src/main.cc:344
+#: src/main.cc:356
 #, fuzzy
 msgid " Print file listing of .metalink file:"
 msgstr " Dateiliste einer .torrent-Datei ausgeben:"
 
-#: src/main.cc:348
+#: src/main.cc:360
 #, c-format
 msgid "Report bugs to %s"
 msgstr "Fehler an %s melden"

po/fr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2 0.11.2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2007-08-29 00:46+0900\n"
+"POT-Creation-Date: 2007-09-03 20:34+0900\n"
 "PO-Revision-Date: 2007-08-16 01:11+0900\n"
 "Last-Translator: Charles <landemaine@gmail.com>\n"
 "Language-Team: Fran&ccedil;ais\n"
@@ -822,7 +822,7 @@ msgstr ""
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/DownloadEngineFactory.cc:195
+#: src/DownloadEngineFactory.cc:197
 #, c-format
 msgid "Errors occurred while binding port.\n"
 msgstr "La jonction du port a engendré des erreurs.\n"
@@ -1146,8 +1146,9 @@ msgstr ""
 #, fuzzy
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
-"sequentially and\n"
-"                              download each URI in a separate session, like\n"
+"sequentially\n"
+"                              and download each URI in a separate session, "
+"like\n"
 "                              the usual command-line download utilities.\n"
 "                              Default: false"
 msgstr ""
@@ -1168,7 +1169,8 @@ msgid ""
 "                              download.\n"
 "                              The new file name has a dot and a number"
 "(1..9999)\n"
-"                              appended. Default: true"
+"                              appended.\n"
+"                              Default: true"
 msgstr ""
 " --follow-metalink=true|false  Définir cette option comme false empêche à "
 "aria2\n"
@@ -1180,6 +1182,23 @@ msgstr ""
 
 #: src/main.cc:209
 msgid ""
+" -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
+"                              You can specify set of parts:\n"
+"                              http://{sv1,sv2,sv3}/foo.iso\n"
+"                              Also you can specify numeric sequences with "
+"step\n"
+"                              counter:\n"
+"                              http://host/image[000-100:2].img\n"
+"                              A step counter can be omitted.\n"
+"                              If all URIs do not point to the same file, "
+"such\n"
+"                              as the second example above, -Z option is\n"
+"                              required.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/main.cc:221
+msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
 "hash.\n"
 "                              This option only affects in BitTorrent "
@@ -1205,7 +1224,7 @@ msgstr ""
 "                              si le fichier .aria2 n'existe pas.\n"
 "                              Défaut: false"
 
-#: src/main.cc:217
+#: src/main.cc:229
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -1221,7 +1240,7 @@ msgstr ""
 "                              Metalink avec vérification d'intégrité.\n"
 "                              Défaut: true"
 
-#: src/main.cc:222
+#: src/main.cc:234
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1241,17 +1260,17 @@ msgstr ""
 "                              En ce moment cette option s'applique aux\n"
 "                              téléchargements http(s)/ftp."
 
-#: src/main.cc:228
+#: src/main.cc:240
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 " -U, --user-agent=USER_AGENT  Définit le nom du programme pour les "
 "téléchargements http(s)."
 
-#: src/main.cc:229
+#: src/main.cc:241
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr " -n, --no-netrc               Désactiver le support netrc."
 
-#: src/main.cc:230
+#: src/main.cc:242
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1266,7 +1285,7 @@ msgstr ""
 "                              URIs par des tabulations sur une seule ligne.\n"
 "                              Lit la sortie de stdin quand '-' est spécifié."
 
-#: src/main.cc:234
+#: src/main.cc:246
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
 "downloads.\n"
@@ -1278,7 +1297,7 @@ msgstr ""
 "                              Doit être utilisé avec l'option -i.\n"
 "                              Défaut: 5"
 
-#: src/main.cc:237
+#: src/main.cc:249
 msgid ""
 " --load-cookies=FILE          Load cookies from FILE. The format of FILE is\n"
 "                              the same used by Netscape and Mozilla."
@@ -1287,7 +1306,7 @@ msgstr ""
 "est\n"
 "                              celui utilisé par Netscape et Mozilla."
 
-#: src/main.cc:240
+#: src/main.cc:252
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -1297,7 +1316,7 @@ msgstr ""
 "metalink\n"
 "                              et quitte."
 
-#: src/main.cc:242
+#: src/main.cc:254
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -1324,12 +1343,12 @@ msgstr ""
 "varier selon\n"
 "                              la requête (consultez l'option --metalink-*)."
 
-#: src/main.cc:252
+#: src/main.cc:264
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 " -T, --torrent-file=TORRENT_FILE  Le chemin complet du fichier .torrent."
 
-#: src/main.cc:253
+#: src/main.cc:265
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
 "                              entering BitTorrent mode even if the filename "
@@ -1344,7 +1363,7 @@ msgstr ""
 "                              téléchargé termine pas l'extension .torrent.\n"
 "                              Défaut: true"
 
-#: src/main.cc:257
+#: src/main.cc:269
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
@@ -1355,7 +1374,7 @@ msgstr ""
 "                              mentioné dans le fichier .torrent.\n"
 "                              Défaut: true"
 
-#: src/main.cc:260
+#: src/main.cc:272
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
 "                              Default: 6881-6999"
@@ -1364,7 +1383,7 @@ msgstr ""
 "cas d'une connexion P2P.\n"
 "                              Default: 6881-6999"
 
-#: src/main.cc:262
+#: src/main.cc:274
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -1378,7 +1397,7 @@ msgstr ""
 "1024K).\n"
 "                              Défaut: 0"
 
-#: src/main.cc:266
+#: src/main.cc:278
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -1387,7 +1406,7 @@ msgstr ""
 "Consultez aussi\n"
 "                              l'option --seed-ratio."
 
-#: src/main.cc:268
+#: src/main.cc:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -1406,7 +1425,7 @@ msgstr ""
 "conditions\n"
 "                              est satisfaite."
 
-#: src/main.cc:273
+#: src/main.cc:285
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1419,12 +1438,12 @@ msgid ""
 "                              Default: -aria2-"
 msgstr ""
 
-#: src/main.cc:282
+#: src/main.cc:294
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 " -M, --metalink-file=METALINK_FILE Le chemin vers le fichier .metalink."
 
-#: src/main.cc:283
+#: src/main.cc:295
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously.\n"
@@ -1435,26 +1454,26 @@ msgstr ""
 "                              simultanément.\n"
 "                              Défaut: 5"
 
-#: src/main.cc:286
+#: src/main.cc:298
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   La version du fichier à télécharger."
 
-#: src/main.cc:287
+#: src/main.cc:299
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE La langua du fichier à télécharger."
 
-#: src/main.cc:288
+#: src/main.cc:300
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 " --metalink-os=OS             Le système d'exploitation auquel est destiné "
 "le fichier."
 
-#: src/main.cc:289
+#: src/main.cc:301
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr " --metalink-location=LOCATION La localisation du serveur préféré."
 
-#: src/main.cc:290
+#: src/main.cc:302
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
 "                              entering Metalink mode even if the filename "
@@ -1470,15 +1489,15 @@ msgstr ""
 "metalink.\n"
 "                              Défaut: true"
 
-#: src/main.cc:295
+#: src/main.cc:307
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Imprime le numéro de version et quitte."
 
-#: src/main.cc:296
+#: src/main.cc:308
 msgid " -h, --help                   Print this message and exit."
 msgstr " -h, --help                   Imprime ce message et quitte."
 
-#: src/main.cc:299
+#: src/main.cc:311
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
 " or downloading will fail."
@@ -1487,7 +1506,7 @@ msgstr ""
 "même fichier\n"
 " sinon le téléchargement échoue."
 
-#: src/main.cc:304
+#: src/main.cc:316
 msgid ""
 " Specify files in multi-file torrent to download. Use in conjunction with "
 "the\n"
@@ -1497,74 +1516,74 @@ msgstr ""
 "avec l'option\n"
 " -T. Ces arguments sont ignorés si vous spécifiez l'option --select-file."
 
-#: src/main.cc:308
+#: src/main.cc:320
 msgid "Examples:"
 msgstr "Exemples:"
 
-#: src/main.cc:309
+#: src/main.cc:321
 msgid " Download a file using 1 connection:"
 msgstr " Téléchargez un fichier avec 1 connexion:"
 
-#: src/main.cc:311
+#: src/main.cc:323
 msgid " Download a file using 2 connections:"
 msgstr " Téléchargez un fichier avec 2 connexion:"
 
-#: src/main.cc:313
+#: src/main.cc:325
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
 msgstr ""
 " Téléchargez un fichier avec 2 connexion, chacune se connectant à un serveur "
 "différent:"
 
-#: src/main.cc:315
+#: src/main.cc:327
 msgid " You can mix up different protocols:"
 msgstr " Vous pouvez mélanger différents protocoles:"
 
-#: src/main.cc:317
+#: src/main.cc:329
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:319
-msgid " Parameterized URI. -Z option must be specified:"
+#: src/main.cc:331
+msgid " Parameterized URI. -Z option is required in this case:"
 msgstr ""
 
-#: src/main.cc:323
+#: src/main.cc:335
 msgid " Download a torrent:"
 msgstr "Téléchargez un torrent:"
 
-#: src/main.cc:325
+#: src/main.cc:337
 msgid " Download a torrent using a local .torrent file:"
 msgstr "Téléchargez un torrent en utilisant un fichier local .torrent:"
 
-#: src/main.cc:327 src/main.cc:340
+#: src/main.cc:339 src/main.cc:352
 msgid " Download only selected files:"
 msgstr "Télécharger seulement les fichiers séléctionnés:"
 
-#: src/main.cc:329
+#: src/main.cc:341
 msgid " Print file listing of .torrent file:"
 msgstr "Imprimer la liste des fichiers .torrent:"
 
-#: src/main.cc:334
+#: src/main.cc:346
 msgid " Metalink downloading:"
 msgstr "Téléchargement Metalink:"
 
-#: src/main.cc:336
+#: src/main.cc:348
 msgid " Download a file using local .metalink file:"
 msgstr "Télécharger un fichier en utilisant un fichier local .metalink:"
 
-#: src/main.cc:338
+#: src/main.cc:350
 msgid " Metalink downloading with preferences:"
 msgstr "Téléchargement Metalink avec comme préférences:"
 
-#: src/main.cc:342
+#: src/main.cc:354
 msgid " Download only selected files using index:"
 msgstr "Télécharger seulement les fichiers sélectionnés en utilisant l'index:"
 
-#: src/main.cc:344
+#: src/main.cc:356
 msgid " Print file listing of .metalink file:"
 msgstr "Imprimer la liste de fichiers du fichier .metalink:"
 
-#: src/main.cc:348
+#: src/main.cc:360
 #, c-format
 msgid "Report bugs to %s"
 msgstr "Faire part des bugs à %s"

po/ja.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2c 0.2.1\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2007-08-29 00:46+0900\n"
-"PO-Revision-Date: 2007-08-10 00:08+0900\n"
+"POT-Creation-Date: 2007-09-03 20:34+0900\n"
+"PO-Revision-Date: 2007-09-03 20:36+0900\n"
 "Last-Translator: Tatsuhiro Tsujikawa <tujikawa@rednoah.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -839,7 +839,7 @@ msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 "ファイル長が不正です. %s のダウンロードを継続できません: local %s, remote %s"
 
-#: src/DownloadEngineFactory.cc:195
+#: src/DownloadEngineFactory.cc:197
 #, c-format
 msgid "Errors occurred while binding port.\n"
 msgstr "ポートをバインド中にエラーが発生しました.\n"
@@ -1176,23 +1176,30 @@ msgstr ""
 "                              デフォルト値: false"
 
 #: src/main.cc:199
-#, fuzzy
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
-"sequentially and\n"
-"                              download each URI in a separate session, like\n"
+"sequentially\n"
+"                              and download each URI in a separate session, "
+"like\n"
 "                              the usual command-line download utilities.\n"
 "                              Default: false"
 msgstr ""
-" --follow-metalink=true|false  このオプションを false に設定すると, ダウン"
-"ロード\n"
-"                              したファイルの拡張子が .metalink であっても, "
-"aria2\n"
-"                              は, Metalink モードに入りません.\n"
-"                              デフォルト値: true"
+" -Z, --force-sequential[=true|false] コマンドラインで指定された URI をそれぞ"
+"れ\n"
+"                              違うファイルであるとして扱う. aria2c のデフォ"
+"ル\n"
+"                              ト動作 (false 指定) とは, 指定された URI がす"
+"べ\n"
+"                              て同じファイルをさしているとして扱う点が異な"
+"る.\n"
+"                              大抵のコマンドライン型ダウンロードユーティリ"
+"ティ\n"
+"                              は, このオプションで true を指定したように振る"
+"舞\n"
+"                              うはずである.\n"
+"                              デフォルト値: false"
 
 #: src/main.cc:203
-#, fuzzy
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -1200,17 +1207,51 @@ msgid ""
 "                              download.\n"
 "                              The new file name has a dot and a number"
 "(1..9999)\n"
-"                              appended. Default: true"
+"                              appended.\n"
+"                              Default: true"
 msgstr ""
-" --follow-metalink=true|false  このオプションを false に設定すると, ダウン"
-"ロード\n"
-"                              したファイルの拡張子が .metalink であっても, "
-"aria2\n"
-"                              は, Metalink モードに入りません.\n"
-"                              デフォルト値: true"
+" --auto-file-renaming[=true|false] 同じファイル名のファイルがすでにファイルシ\n"
+"                             ステムに存在する場合, ファイル名を自動で変更する.\n"
+"                             http(s)/ftp のダウンロードのみで有効である.\n"
+"                             変更の仕方は, ファイル名末尾にドット (.) と番号\n"
+"                             (1..9999) を付加する.\n"
+"                             デフォルト値: true"
 
 #: src/main.cc:209
 msgid ""
+" -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
+"                              You can specify set of parts:\n"
+"                              http://{sv1,sv2,sv3}/foo.iso\n"
+"                              Also you can specify numeric sequences with "
+"step\n"
+"                              counter:\n"
+"                              http://host/image[000-100:2].img\n"
+"                              A step counter can be omitted.\n"
+"                              If all URIs do not point to the same file, "
+"such\n"
+"                              as the second example above, -Z option is\n"
+"                              required.\n"
+"                              Default: false"
+msgstr ""
+" -P, --parameterized-uri[=true|false] パラメータ化された URI の展開のサポー"
+"ト\n"
+"                              を有効にする.\n"
+"                              パラメータ化された URI では, URI の部分パーツ"
+"の\n"
+"                              集合を指定できる:\n"
+"                              http://{sv1,sv2,sv3}/foo.iso\n"
+"                              また, 数値のシーケンスも指定できる (ステップカ"
+"ウ\n"
+"                              ントを指定可能):\n"
+"                              http://host/image[000-100:2].img\n"
+"                              ステップカウントは省略可能である.\n"
+"                              展開結果のすべての URI が同じファイルを指して"
+"い\n"
+"                              ない場合は, -Z オプションが必要である.\n"
+"                              デフォルト値: false"
+
+#: src/main.cc:221
+msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
 "hash.\n"
 "                              This option only affects in BitTorrent "
@@ -1236,7 +1277,7 @@ msgstr ""
 "                              かもしれません.\n"
 "                              デフォルト値: false"
 
-#: src/main.cc:217
+#: src/main.cc:229
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -1252,7 +1293,7 @@ msgstr ""
 "                              Metalink でのみ使用できます.\n"
 "                              デフォルト値: true"
 
-#: src/main.cc:222
+#: src/main.cc:234
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1271,15 +1312,15 @@ msgstr ""
 "用\n"
 "                              できます."
 
-#: src/main.cc:228
+#: src/main.cc:240
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr " -U, --user-agent=USER_AGENT  ユーザーエージェントを設定します."
 
-#: src/main.cc:229
+#: src/main.cc:241
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr " -n, --no-netrc               netrc サポートを止めます."
 
-#: src/main.cc:230
+#: src/main.cc:242
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1299,7 +1340,7 @@ msgstr ""
 "ま\n"
 "                              す."
 
-#: src/main.cc:234
+#: src/main.cc:246
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
 "downloads.\n"
@@ -1311,7 +1352,7 @@ msgstr ""
 "                              と共に使ってください.\n"
 "                              デフォルト値: 5"
 
-#: src/main.cc:237
+#: src/main.cc:249
 msgid ""
 " --load-cookies=FILE          Load cookies from FILE. The format of FILE is\n"
 "                              the same used by Netscape and Mozilla."
@@ -1321,7 +1362,7 @@ msgstr ""
 "                              トは, Netscape や Mozilla で使われているもので"
 "す."
 
-#: src/main.cc:240
+#: src/main.cc:252
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -1330,7 +1371,7 @@ msgstr ""
 " -S, --show-files             .torrent/.metalink ファイルに含まれるファイル\n"
 "                              リストを出力し終了します."
 
-#: src/main.cc:242
+#: src/main.cc:254
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -1358,11 +1399,11 @@ msgstr ""
 "よっ\n"
 "                              てインデックスは変化する場合があります."
 
-#: src/main.cc:252
+#: src/main.cc:264
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr " -T, --torrent-file=TORRENT_FILE  .torrent ファイルのパスを指定."
 
-#: src/main.cc:253
+#: src/main.cc:265
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
 "                              entering BitTorrent mode even if the filename "
@@ -1377,7 +1418,7 @@ msgstr ""
 "                              は, BitTorrent モードに入りません.\n"
 "                              デフォルト値: true"
 
-#: src/main.cc:257
+#: src/main.cc:269
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
@@ -1388,7 +1429,7 @@ msgstr ""
 "                              します.\n"
 "                              デフォルト値: true"
 
-#: src/main.cc:260
+#: src/main.cc:272
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
 "                              Default: 6881-6999"
@@ -1396,7 +1437,7 @@ msgstr ""
 " --listen-port=PORT           ピアからの接続を受け付けるポート番号を指定.\n"
 "                              デフォルト値: 6881-6999"
 
-#: src/main.cc:262
+#: src/main.cc:274
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -1411,7 +1452,7 @@ msgstr ""
 "1024K).\n"
 "                              デフォルト値: 0"
 
-#: src/main.cc:266
+#: src/main.cc:278
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -1419,7 +1460,7 @@ msgstr ""
 " --seed-time=MINUTES          シードを行う時間を分単位で指定します. \n"
 "                              --seed-ratio オプションも参照してください."
 
-#: src/main.cc:268
+#: src/main.cc:280
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -1437,7 +1478,7 @@ msgstr ""
 "く\n"
 "                              とも一方の条件が成立するとシードを終了します."
 
-#: src/main.cc:273
+#: src/main.cc:285
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1461,11 +1502,11 @@ msgstr ""
 "す.\n"
 "                               デフォルト値: -aria2-"
 
-#: src/main.cc:282
+#: src/main.cc:294
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr " -M, --metalink-file=METALINK_FILE .metalink ファイルのパスを指定."
 
-#: src/main.cc:283
+#: src/main.cc:295
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously.\n"
@@ -1474,15 +1515,15 @@ msgstr ""
 " -C, --metalink-servers=NUM_SERVERS 同時に接続するサーバの数を指定します.\n"
 "                              デフォルト値: 5"
 
-#: src/main.cc:286
+#: src/main.cc:298
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   ダウンロードするファイルのバージョン."
 
-#: src/main.cc:287
+#: src/main.cc:299
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE ダウンロードするファイルの言語."
 
-#: src/main.cc:288
+#: src/main.cc:300
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
@@ -1490,11 +1531,11 @@ msgstr ""
 "レー\n"
 "                              ティング・システム."
 
-#: src/main.cc:289
+#: src/main.cc:301
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr " --metalink-location=LOCATION 優先的にダウンロードするサーバーの場所."
 
-#: src/main.cc:290
+#: src/main.cc:302
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
 "                              entering Metalink mode even if the filename "
@@ -1509,16 +1550,16 @@ msgstr ""
 "                              は, Metalink モードに入りません.\n"
 "                              デフォルト値: true"
 
-#: src/main.cc:295
+#: src/main.cc:307
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                バージョン番号を表示し, 終了します."
 
-#: src/main.cc:296
+#: src/main.cc:308
 msgid " -h, --help                   Print this message and exit."
 msgstr ""
 " -h, --help                   このヘルプメッセージを表示し, 終了します."
 
-#: src/main.cc:299
+#: src/main.cc:311
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
 " or downloading will fail."
@@ -1527,7 +1568,7 @@ msgstr ""
 "れ\n"
 " ばなりません. さもなくばダウンロードは失敗します."
 
-#: src/main.cc:304
+#: src/main.cc:316
 msgid ""
 " Specify files in multi-file torrent to download. Use in conjunction with "
 "the\n"
@@ -1537,72 +1578,72 @@ msgstr ""
 "ン\n"
 " と共に使用します. --select-file オプションと併用はできません."
 
-#: src/main.cc:308
+#: src/main.cc:320
 msgid "Examples:"
 msgstr "例:"
 
-#: src/main.cc:309
+#: src/main.cc:321
 msgid " Download a file using 1 connection:"
 msgstr " 1 コネクションでのダウンロード:"
 
-#: src/main.cc:311
+#: src/main.cc:323
 msgid " Download a file using 2 connections:"
 msgstr " 2 コネクションでのダウンロード:"
 
-#: src/main.cc:313
+#: src/main.cc:325
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
 msgstr " 二つの異なるサーバーに接続してダウンロード:"
 
-#: src/main.cc:315
+#: src/main.cc:327
 msgid " You can mix up different protocols:"
 msgstr " 異なるプロトコルを混合させてダウンロード:"
 
-#: src/main.cc:317
+#: src/main.cc:329
 msgid " Parameterized URI:"
-msgstr ""
+msgstr " パラメータ化された URI:"
 
-#: src/main.cc:319
-msgid " Parameterized URI. -Z option must be specified:"
-msgstr ""
+#: src/main.cc:331
+msgid " Parameterized URI. -Z option is required in this case:"
+msgstr " パラメータ化された URI. この場合, -Z オプションが必要:"
 
-#: src/main.cc:323
+#: src/main.cc:335
 msgid " Download a torrent:"
 msgstr " torrent をダウンロード:"
 
-#: src/main.cc:325
+#: src/main.cc:337
 msgid " Download a torrent using a local .torrent file:"
 msgstr " ローカル .torrent ファイルを使ってダウンロード:"
 
-#: src/main.cc:327 src/main.cc:340
+#: src/main.cc:339 src/main.cc:352
 msgid " Download only selected files:"
 msgstr " ファイルを指定してダウンロード:"
 
-#: src/main.cc:329
+#: src/main.cc:341
 msgid " Print file listing of .torrent file:"
 msgstr " この .torrent ファイルに含まれるファイルリストを表示:"
 
-#: src/main.cc:334
+#: src/main.cc:346
 msgid " Metalink downloading:"
 msgstr " Metalink でダウンロード:"
 
-#: src/main.cc:336
+#: src/main.cc:348
 msgid " Download a file using local .metalink file:"
 msgstr " ローカル .metalink ファイルを使ってダウンロード:"
 
-#: src/main.cc:338
+#: src/main.cc:350
 msgid " Metalink downloading with preferences:"
 msgstr " ユーザ設定による Metalink ダウンロード:"
 
-#: src/main.cc:342
+#: src/main.cc:354
 msgid " Download only selected files using index:"
 msgstr " ファイルのインデックスを指定してダウンロード:"
 
-#: src/main.cc:344
+#: src/main.cc:356
 msgid " Print file listing of .metalink file:"
 msgstr " この .metalink ファイルに含まれるファイルリストを表示:"
 
-#: src/main.cc:348
+#: src/main.cc:360
 #, c-format
 msgid "Report bugs to %s"
 msgstr "バグレポートはこちらへ: %s"

po/ru.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2007-08-29 00:46+0900\n"
+"POT-Creation-Date: 2007-09-03 20:34+0900\n"
 "PO-Revision-Date: 2006-07-28 18:04+0600\n"
 "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -815,7 +815,7 @@ msgstr ""
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/DownloadEngineFactory.cc:195
+#: src/DownloadEngineFactory.cc:197
 #, c-format
 msgid "Errors occurred while binding port.\n"
 msgstr "Ошибка при открытии порта.\n"
@@ -1132,8 +1132,9 @@ msgstr ""
 #, fuzzy
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
-"sequentially and\n"
-"                              download each URI in a separate session, like\n"
+"sequentially\n"
+"                              and download each URI in a separate session, "
+"like\n"
 "                              the usual command-line download utilities.\n"
 "                              Default: false"
 msgstr ""
@@ -1152,7 +1153,8 @@ msgid ""
 "                              download.\n"
 "                              The new file name has a dot and a number"
 "(1..9999)\n"
-"                              appended. Default: true"
+"                              appended.\n"
+"                              Default: true"
 msgstr ""
 " --follow-metalink=true|false При установке в \"false\" aria2 не переходит "
 "в\n"
@@ -1161,6 +1163,23 @@ msgstr ""
 "                              По умолчанию: true"
 
 #: src/main.cc:209
+msgid ""
+" -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
+"                              You can specify set of parts:\n"
+"                              http://{sv1,sv2,sv3}/foo.iso\n"
+"                              Also you can specify numeric sequences with "
+"step\n"
+"                              counter:\n"
+"                              http://host/image[000-100:2].img\n"
+"                              A step counter can be omitted.\n"
+"                              If all URIs do not point to the same file, "
+"such\n"
+"                              as the second example above, -Z option is\n"
+"                              required.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/main.cc:221
 #, fuzzy
 msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
@@ -1181,7 +1200,7 @@ msgstr ""
 "60.\n"
 "                              По умолчанию: 5"
 
-#: src/main.cc:217
+#: src/main.cc:229
 #, fuzzy
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
@@ -1197,7 +1216,7 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:222
+#: src/main.cc:234
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1207,15 +1226,15 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/main.cc:228
+#: src/main.cc:240
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/main.cc:229
+#: src/main.cc:241
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:242
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1224,7 +1243,7 @@ msgid ""
 "                              Reads input from stdin when '-' is specified."
 msgstr ""
 
-#: src/main.cc:234
+#: src/main.cc:246
 #, fuzzy
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
@@ -1235,13 +1254,13 @@ msgstr ""
 " -m, --max-tries=N            Установить число попыток. 0 означает\n"
 "                              неограниченное число. По умолчанию: 5"
 
-#: src/main.cc:237
+#: src/main.cc:249
 msgid ""
 " --load-cookies=FILE          Load cookies from FILE. The format of FILE is\n"
 "                              the same used by Netscape and Mozilla."
 msgstr ""
 
-#: src/main.cc:240
+#: src/main.cc:252
 #, fuzzy
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
@@ -1250,7 +1269,7 @@ msgid ""
 msgstr ""
 " -S, --show-files             Вывести перечисленные .torrent файлы и выйти."
 
-#: src/main.cc:242
+#: src/main.cc:254
 #, fuzzy
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
@@ -1272,12 +1291,12 @@ msgstr ""
 "                              Также вы можете использовать тире (\"1-5\").\n"
 "                              \",\" и \"-\" могут быть использованы вместе."
 
-#: src/main.cc:252
+#: src/main.cc:264
 #, fuzzy
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr " -T, --torrent-file=TORRENT_FILE  Путь до .torrent-файла."
 
-#: src/main.cc:253
+#: src/main.cc:265
 #, fuzzy
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
@@ -1292,7 +1311,7 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:257
+#: src/main.cc:269
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
@@ -1302,7 +1321,7 @@ msgstr ""
 "                              описанный в .torrent-файл.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:260
+#: src/main.cc:272
 #, fuzzy
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
@@ -1310,7 +1329,7 @@ msgid ""
 msgstr ""
 " --listen-port=PORT           Установить порт для прослушивания соединения."
 
-#: src/main.cc:262
+#: src/main.cc:274
 #, fuzzy
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
@@ -1323,7 +1342,7 @@ msgstr ""
 "60.\n"
 "                              По умолчанию: 5"
 
-#: src/main.cc:266
+#: src/main.cc:278
 #, fuzzy
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
@@ -1332,7 +1351,7 @@ msgstr ""
 " -m, --max-tries=N            Установить число попыток. 0 означает\n"
 "                              неограниченное число. По умолчанию: 5"
 
-#: src/main.cc:268
+#: src/main.cc:280
 #, fuzzy
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
@@ -1349,7 +1368,7 @@ msgstr ""
 "                              Следуя этому, aria2 соединяется к каждому URL\n"
 "                              используя N соединений."
 
-#: src/main.cc:273
+#: src/main.cc:285
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1362,12 +1381,12 @@ msgid ""
 "                              Default: -aria2-"
 msgstr ""
 
-#: src/main.cc:282
+#: src/main.cc:294
 #, fuzzy
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr " -M, --metalink-file=METALINK_FILE Путь к .metalink-файлу."
 
-#: src/main.cc:283
+#: src/main.cc:295
 #, fuzzy
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
@@ -1380,27 +1399,27 @@ msgstr ""
 "параметр -s.\n"
 "                              По умолчанию: 15"
 
-#: src/main.cc:286
+#: src/main.cc:298
 #, fuzzy
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   Версия файла для скачивания."
 
-#: src/main.cc:287
+#: src/main.cc:299
 #, fuzzy
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE Язык файла для скачивания."
 
-#: src/main.cc:288
+#: src/main.cc:300
 #, fuzzy
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr " --metalink-os=OS             Целевая операционная система файла."
 
-#: src/main.cc:289
+#: src/main.cc:301
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr ""
 
-#: src/main.cc:290
+#: src/main.cc:302
 #, fuzzy
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
@@ -1415,15 +1434,15 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:295
+#: src/main.cc:307
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Вывести номер версии и выйти."
 
-#: src/main.cc:296
+#: src/main.cc:308
 msgid " -h, --help                   Print this message and exit."
 msgstr " -h, --help                   Вывести это сообщение и выйти."
 
-#: src/main.cc:299
+#: src/main.cc:311
 #, fuzzy
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
@@ -1432,7 +1451,7 @@ msgstr ""
 " Вы можете указать несколько URL. Все URL должны указывать на один и тот же\n"
 " файл, иначе скачивание завершится неудачей."
 
-#: src/main.cc:304
+#: src/main.cc:316
 #, fuzzy
 msgid ""
 " Specify files in multi-file torrent to download. Use in conjunction with "
@@ -1442,78 +1461,78 @@ msgstr ""
 " Указать файлы для скачивания при многофайловом torent. Используйте вместе\n"
 " с параметром -T. Этот параметр игнорируется при указании --select-file."
 
-#: src/main.cc:308
+#: src/main.cc:320
 msgid "Examples:"
 msgstr "Примеры:"
 
-#: src/main.cc:309
+#: src/main.cc:321
 #, fuzzy
 msgid " Download a file using 1 connection:"
 msgstr " Скачать файл с помощью 1 соединения:"
 
-#: src/main.cc:311
+#: src/main.cc:323
 #, fuzzy
 msgid " Download a file using 2 connections:"
 msgstr " Скачать файл с помощью 2 соединений:"
 
-#: src/main.cc:313
+#: src/main.cc:325
 #, fuzzy
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
 msgstr " Скачать файл с помощью 2 соединений к различным серверам:"
 
-#: src/main.cc:315
+#: src/main.cc:327
 msgid " You can mix up different protocols:"
 msgstr " Вы можете смешивать различные протоколы:"
 
-#: src/main.cc:317
+#: src/main.cc:329
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:319
-msgid " Parameterized URI. -Z option must be specified:"
+#: src/main.cc:331
+msgid " Parameterized URI. -Z option is required in this case:"
 msgstr ""
 
-#: src/main.cc:323
+#: src/main.cc:335
 msgid " Download a torrent:"
 msgstr " Скачать torrent:"
 
-#: src/main.cc:325
+#: src/main.cc:337
 #, fuzzy
 msgid " Download a torrent using a local .torrent file:"
 msgstr " Скачать torrent с помощью локального .torrent-файла:"
 
-#: src/main.cc:327 src/main.cc:340
+#: src/main.cc:339 src/main.cc:352
 msgid " Download only selected files:"
 msgstr " Скачать только выбранные файлы:"
 
-#: src/main.cc:329
+#: src/main.cc:341
 msgid " Print file listing of .torrent file:"
 msgstr " Вывести список фалов из .torrent"
 
-#: src/main.cc:334
+#: src/main.cc:346
 msgid " Metalink downloading:"
 msgstr " Скачать metalink:"
 
-#: src/main.cc:336
+#: src/main.cc:348
 msgid " Download a file using local .metalink file:"
 msgstr " Скачать файл с помощью локального .metalink-файла:"
 
-#: src/main.cc:338
+#: src/main.cc:350
 msgid " Metalink downloading with preferences:"
 msgstr " Скачивание metalink с настройками:"
 
-#: src/main.cc:342
+#: src/main.cc:354
 #, fuzzy
 msgid " Download only selected files using index:"
 msgstr " Скачать только выбранные файлы:"
 
-#: src/main.cc:344
+#: src/main.cc:356
 #, fuzzy
 msgid " Print file listing of .metalink file:"
 msgstr " Вывести список фалов из .torrent"
 
-#: src/main.cc:348
+#: src/main.cc:360
 #, c-format
 msgid "Report bugs to %s"
 msgstr "Сообщения об ошибках направляйте на адрес %s"

src/OptionHandlerFactory.cc

@@ -96,6 +96,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
   handlers.push_back(new DefaultOptionHandler(PREF_PEER_ID_PREFIX));
   handlers.push_back(new BooleanOptionHandler(PREF_FORCE_SEQUENTIAL));  
   handlers.push_back(new BooleanOptionHandler(PREF_AUTO_FILE_RENAMING));  
+  handlers.push_back(new BooleanOptionHandler(PREF_PARAMETERIZED_URI));  
 
   return handlers;
 }

src/main.cc

@@ -196,15 +196,27 @@ void showUsage() {
   		"                              already exists but the corresponding .aria2 file\n"
   		"                              doesn't exist.\n"
             "                              Default: false") << endl;
-  cout << _(" -Z, --force-sequential[=true|false] Fetch URIs in the command-line sequentially and\n"
-	    "                              download each URI in a separate session, like\n"
+  cout << _(" -Z, --force-sequential[=true|false] Fetch URIs in the command-line sequentially\n"
+	    "                              and download each URI in a separate session, like\n"
 	    "                              the usual command-line download utilities.\n"
 	    "                              Default: false") << endl;
   cout << _(" --auto-file-renaming[=true|false] Rename file name if the same file already\n"
 	    "                              exists. This option works only in http(s)/ftp\n"
 	    "                              download.\n"
 	    "                              The new file name has a dot and a number(1..9999)\n"
-	    "                              appended. Default: true") << endl;
+	    "                              appended.\n"
+	    "                              Default: true") << endl;
+  cout << _(" -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
+	    "                              You can specify set of parts:\n"
+	    "                              http://{sv1,sv2,sv3}/foo.iso\n"
+	    "                              Also you can specify numeric sequences with step\n"
+	    "                              counter:\n"
+	    "                              http://host/image[000-100:2].img\n"
+	    "                              A step counter can be omitted.\n"
+	    "                              If all URIs do not point to the same file, such\n"
+	    "                              as the second example above, -Z option is\n"
+	    "                              required.\n"
+	    "                              Default: false") << endl;
 #ifdef ENABLE_MESSAGE_DIGEST
   cout << _(" --check-integrity=true|false  Check file integrity by validating piece hash.\n"
 	    "                              This option only affects in BitTorrent downloads\n"
@@ -315,9 +327,9 @@ void showUsage() {
   cout << _(" You can mix up different protocols:") << endl;
   cout << "  aria2c http://AAA.BBB.CCC/file.zip ftp://DDD.EEE.FFF/GGG/file.zip" << endl;
   cout << _(" Parameterized URI:") << endl;
-  cout << "  aria2c http://{server1,server2,server3}/file.iso" << endl;
-  cout << _(" Parameterized URI. -Z option must be specified:") << endl;
-  cout << "  aria2c -Z http://host/file[001-100].img" << endl;
+  cout << "  aria2c -P http://{server1,server2,server3}/file.iso" << endl;
+  cout << _(" Parameterized URI. -Z option is required in this case:") << endl;
+  cout << "  aria2c -P -Z http://host/file[001-100:2].img" << endl;
 #ifdef ENABLE_BITTORRENT
   cout << endl;
   cout << _(" Download a torrent:") << endl;
@@ -442,6 +454,7 @@ int main(int argc, char* argv[]) {
   op->put(PREF_DIRECT_DOWNLOAD_TIMEOUT, "15");
   op->put(PREF_FORCE_SEQUENTIAL, V_FALSE);
   op->put(PREF_AUTO_FILE_RENAMING, V_TRUE);
+  op->put(PREF_PARAMETERIZED_URI, V_FALSE);
   while(1) {
     int optIndex = 0;
     int lopt;
@@ -486,6 +499,7 @@ int main(int argc, char* argv[]) {
       { "load-cookies", required_argument, &lopt, 205 },
       { "force-sequential", optional_argument, 0, 'Z' },
       { "auto-file-renaming", optional_argument, &lopt, 206 },
+      { "parameterized-uri", optional_argument, 0, 'P' },
 #if defined ENABLE_BITTORRENT || ENABLE_METALINK
       { "show-files", no_argument, NULL, 'S' },
       { "select-file", required_argument, &lopt, 21 },
@@ -516,7 +530,7 @@ int main(int argc, char* argv[]) {
       { "help", no_argument, NULL, 'h' },
       { 0, 0, 0, 0 }
     };
-    c = getopt_long(argc, argv, "Dd:o:l:s:pt:m:vhST:M:C:a:cU:ni:j:Z", longOpts, &optIndex);
+    c = getopt_long(argc, argv, "Dd:o:l:s:pt:m:vhST:M:C:a:cU:ni:j:Z::P::", longOpts, &optIndex);
     if(c == -1) {
       break;
     }
@@ -689,6 +703,9 @@ int main(int argc, char* argv[]) {
     case 'Z':
       cmdstream << PREF_FORCE_SEQUENTIAL << "=" << toBoolArg(optarg) << "\n";
       break;
+    case 'P':
+      cmdstream << PREF_PARAMETERIZED_URI << "=" << toBoolArg(optarg) << "\n";
+      break;
     case 'v':
       showVersion();
       exit(EXIT_SUCCESS);
@@ -850,7 +867,7 @@ int main(int argc, char* argv[]) {
 	  RequestGroups groups;
 	  while(flparser->hasNext()) {
 	    Strings uris = flparser->next();
-	    if(uris.size() == 1) {
+	    if(uris.size() == 1 && op->get(PREF_PARAMETERIZED_URI) == V_TRUE) {
 	      Strings unfoldedURIs = unfoldURI(uris);
 	      for(Strings::const_iterator itr = unfoldedURIs.begin();
 		  itr != unfoldedURIs.end(); ++itr) {
@@ -860,7 +877,7 @@ int main(int argc, char* argv[]) {
 		RequestGroupHandle rg = new RequestGroup(xuris, op);
 		groups.push_back(rg);
 	      }
-	    } else if(uris.size() > 1) {
+	    } else if(uris.size() > 0) {
 	      Strings xuris;
 	      ncopy(uris.begin(), uris.end(), op->getAsInt(PREF_SPLIT),
 		    back_inserter(xuris));
@@ -872,8 +889,12 @@ int main(int argc, char* argv[]) {
 	}
 	else
 	  {
-	    
-	    Strings nargs = unfoldURI(args);
+	    Strings nargs;
+	    if(op->get(PREF_PARAMETERIZED_URI) == V_TRUE) {
+	      nargs = unfoldURI(args);
+	    } else {
+	      nargs = args;
+	    }
 	    if(op->get(PREF_FORCE_SEQUENTIAL) == V_TRUE) {
 	      RequestGroups groups;
 	      for(Strings::const_iterator itr = nargs.begin();

src/prefs.h

@@ -107,10 +107,12 @@
 #define PREF_MAX_CONCURRENT_DOWNLOADS "max-concurrent-downloads"
 // value: 1*digit
 #define PREF_DIRECT_DOWNLOAD_TIMEOUT "direct-download-timeout"
-// value:
+// value: true | false
 #define PREF_FORCE_SEQUENTIAL "force-sequential"
-// value:
+// value: true | false
 #define PREF_AUTO_FILE_RENAMING "auto-file-renaming"
+// value: true | false
+#define PREF_PARAMETERIZED_URI "parameterized-uri"
 
 /**
  * FTP related preferences