diff --git a/po/aria2c.pot b/po/aria2c.pot
index 90d86543..9d2456d9 100644
--- a/po/aria2c.pot
+++ b/po/aria2c.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2007-08-28 20:46+0900\n"
+"POT-Creation-Date: 2007-08-29 00:46+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"
@@ -1008,13 +1008,25 @@ msgstr ""
 
 #: src/main.cc:199
 msgid ""
-" -Z, --force-sequential       Fetch URIs in the command-line sequentially "
-"and\n"
+" -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
+"sequentially and\n"
 "                              download each URI in a separate session, like\n"
-"                              the usual command-line download utilities."
+"                              the usual command-line download utilities.\n"
+"                              Default: false"
 msgstr ""
 
-#: src/main.cc:204
+#: src/main.cc:203
+msgid ""
+" --auto-file-renaming[=true|false] Rename file name if the same file "
+"already\n"
+"                              exists. This option works only in http(s)/ftp\n"
+"                              download.\n"
+"                              The new file name has a dot and a number"
+"(1..9999)\n"
+"                              appended. Default: true"
+msgstr ""
+
+#: src/main.cc:209
 msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
 "hash.\n"
@@ -1030,7 +1042,7 @@ msgid ""
 "                              Default: false"
 msgstr ""
 
-#: src/main.cc:212
+#: src/main.cc:217
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -1040,7 +1052,7 @@ msgid ""
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:217
+#: src/main.cc:222
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1050,15 +1062,15 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/main.cc:223
+#: src/main.cc:228
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/main.cc:224
+#: src/main.cc:229
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/main.cc:225
+#: src/main.cc:230
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1067,7 +1079,7 @@ msgid ""
 "                              Reads input from stdin when '-' is specified."
 msgstr ""
 
-#: src/main.cc:229
+#: src/main.cc:234
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
 "downloads.\n"
@@ -1075,20 +1087,20 @@ msgid ""
 "                              Default: 5"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:237
 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:235
+#: src/main.cc:240
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit."
 msgstr ""
 
-#: src/main.cc:237
+#: src/main.cc:242
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -1102,11 +1114,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/main.cc:247
+#: src/main.cc:252
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/main.cc:248
+#: src/main.cc:253
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
 "                              entering BitTorrent mode even if the filename "
@@ -1115,20 +1127,20 @@ msgid ""
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:252
+#: src/main.cc:257
 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:255
+#: src/main.cc:260
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
 "                              Default: 6881-6999"
 msgstr ""
 
-#: src/main.cc:257
+#: src/main.cc:262
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -1136,13 +1148,13 @@ msgid ""
 "                              Default: 0"
 msgstr ""
 
-#: src/main.cc:261
+#: src/main.cc:266
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/main.cc:263
+#: src/main.cc:268
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -1152,7 +1164,7 @@ msgid ""
 "                              least one of the conditions is satisfied."
 msgstr ""
 
-#: src/main.cc:268
+#: src/main.cc:273
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1165,35 +1177,35 @@ msgid ""
 "                              Default: -aria2-"
 msgstr ""
 
-#: src/main.cc:277
+#: src/main.cc:282
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/main.cc:278
+#: src/main.cc:283
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously.\n"
 "                              Default: 5"
 msgstr ""
 
-#: src/main.cc:281
+#: src/main.cc:286
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/main.cc:282
+#: src/main.cc:287
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/main.cc:283
+#: src/main.cc:288
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/main.cc:284
+#: src/main.cc:289
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr ""
 
-#: src/main.cc:285
+#: src/main.cc:290
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
 "                              entering Metalink mode even if the filename "
@@ -1202,93 +1214,93 @@ msgid ""
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:290
+#: src/main.cc:295
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/main.cc:291
+#: src/main.cc:296
 msgid " -h, --help                   Print this message and exit."
 msgstr ""
 
-#: src/main.cc:294
+#: src/main.cc:299
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
 " or downloading will fail."
 msgstr ""
 
-#: src/main.cc:299
+#: src/main.cc:304
 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:303
+#: src/main.cc:308
 msgid "Examples:"
 msgstr ""
 
-#: src/main.cc:304
+#: src/main.cc:309
 msgid " Download a file using 1 connection:"
 msgstr ""
 
-#: src/main.cc:306
+#: src/main.cc:311
 msgid " Download a file using 2 connections:"
 msgstr ""
 
-#: src/main.cc:308
+#: src/main.cc:313
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
 msgstr ""
 
-#: src/main.cc:310
+#: src/main.cc:315
 msgid " You can mix up different protocols:"
 msgstr ""
 
-#: src/main.cc:312
+#: src/main.cc:317
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:314
+#: src/main.cc:319
 msgid " Parameterized URI. -Z option must be specified:"
 msgstr ""
 
-#: src/main.cc:318
+#: src/main.cc:323
 msgid " Download a torrent:"
 msgstr ""
 
-#: src/main.cc:320
+#: src/main.cc:325
 msgid " Download a torrent using a local .torrent file:"
 msgstr ""
 
-#: src/main.cc:322 src/main.cc:335
+#: src/main.cc:327 src/main.cc:340
 msgid " Download only selected files:"
 msgstr ""
 
-#: src/main.cc:324
+#: src/main.cc:329
 msgid " Print file listing of .torrent file:"
 msgstr ""
 
-#: src/main.cc:329
+#: src/main.cc:334
 msgid " Metalink downloading:"
 msgstr ""
 
-#: src/main.cc:331
+#: src/main.cc:336
 msgid " Download a file using local .metalink file:"
 msgstr ""
 
-#: src/main.cc:333
+#: src/main.cc:338
 msgid " Metalink downloading with preferences:"
 msgstr ""
 
-#: src/main.cc:337
+#: src/main.cc:342
 msgid " Download only selected files using index:"
 msgstr ""
 
-#: src/main.cc:339
+#: src/main.cc:344
 msgid " Print file listing of .metalink file:"
 msgstr ""
 
-#: src/main.cc:343
+#: src/main.cc:348
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
diff --git a/po/de.gmo b/po/de.gmo
index 02983a29..3a830a7a 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 45dd65aa..1f1833ab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2007-08-28 20:46+0900\n"
+"POT-Creation-Date: 2007-08-29 00:46+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"
@@ -1134,14 +1134,40 @@ msgstr ""
 "                              Fehlwert: true"
 
 #: src/main.cc:199
+#, fuzzy
 msgid ""
-" -Z, --force-sequential       Fetch URIs in the command-line sequentially "
-"and\n"
+" -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
+"sequentially and\n"
 "                              download each URI in a separate session, like\n"
-"                              the usual command-line download utilities."
+"                              the usual command-line download utilities.\n"
+"                              Default: false"
 msgstr ""
+" --follow-torrent=true|false  Setzen dieser Option auf false verhindert die "
+"Nutzung\n"
+"                              des BitTorrent-Modus, selbst wenn der Abruf-"
+"Dateiname \n"
+"                              auf .torrent endet.\n"
+"                              Fehlwert: true"
 
-#: src/main.cc:204
+#: src/main.cc:203
+#, fuzzy
+msgid ""
+" --auto-file-renaming[=true|false] Rename file name if the same file "
+"already\n"
+"                              exists. This option works only in http(s)/ftp\n"
+"                              download.\n"
+"                              The new file name has a dot and a number"
+"(1..9999)\n"
+"                              appended. Default: true"
+msgstr ""
+" --follow-torrent=true|false  Setzen dieser Option auf false verhindert die "
+"Nutzung\n"
+"                              des BitTorrent-Modus, selbst wenn der Abruf-"
+"Dateiname \n"
+"                              auf .torrent endet.\n"
+"                              Fehlwert: true"
+
+#: src/main.cc:209
 #, fuzzy
 msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
@@ -1163,7 +1189,7 @@ msgstr ""
 "und 60 an.\n"
 "                              Fehlwert: 5"
 
-#: src/main.cc:212
+#: src/main.cc:217
 #, fuzzy
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
@@ -1180,7 +1206,7 @@ msgstr ""
 "                              auf .torrent endet.\n"
 "                              Fehlwert: true"
 
-#: src/main.cc:217
+#: src/main.cc:222
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1190,15 +1216,15 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/main.cc:223
+#: src/main.cc:228
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/main.cc:224
+#: src/main.cc:229
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/main.cc:225
+#: src/main.cc:230
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1207,7 +1233,7 @@ msgid ""
 "                              Reads input from stdin when '-' is specified."
 msgstr ""
 
-#: src/main.cc:229
+#: src/main.cc:234
 #, fuzzy
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
@@ -1218,13 +1244,13 @@ msgstr ""
 " -m, --max-tries=N            Anzahl Versuche. 0 bedeutet unbegrenzt.\n"
 "                              Fehlwert: 5"
 
-#: src/main.cc:232
+#: src/main.cc:237
 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:235
+#: src/main.cc:240
 #, fuzzy
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
@@ -1234,7 +1260,7 @@ msgstr ""
 " -S, --show-files             Dateiliste der .torrent-Datei ausgeben und "
 "beenden."
 
-#: src/main.cc:237
+#: src/main.cc:242
 #, fuzzy
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
@@ -1257,12 +1283,12 @@ msgstr ""
 "                              Sie k�nnen auch '-' verwenden wie in \"1-5\".\n"
 "                              ',' und '-' k�nnen zusammen benutzt werden."
 
-#: src/main.cc:247
+#: src/main.cc:252
 #, 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:248
+#: src/main.cc:253
 #, fuzzy
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
@@ -1278,7 +1304,7 @@ msgstr ""
 "                              auf .torrent endet.\n"
 "                              Fehlwert: true"
 
-#: src/main.cc:252
+#: src/main.cc:257
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
@@ -1288,7 +1314,7 @@ msgstr ""
 "                              .torrent-Datei erw�hnten Datei.\n"
 "                              Fehlwert: true"
 
-#: src/main.cc:255
+#: src/main.cc:260
 #, fuzzy
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
@@ -1297,7 +1323,7 @@ msgstr ""
 " --listen-port=PORT           Port-Nummer zum Lauschen auf Peer-Verbindungen "
 "setzen."
 
-#: src/main.cc:257
+#: src/main.cc:262
 #, fuzzy
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
@@ -1311,7 +1337,7 @@ msgstr ""
 "und 60 an.\n"
 "                              Fehlwert: 5"
 
-#: src/main.cc:261
+#: src/main.cc:266
 #, fuzzy
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
@@ -1320,7 +1346,7 @@ msgstr ""
 " -m, --max-tries=N            Anzahl Versuche. 0 bedeutet unbegrenzt.\n"
 "                              Fehlwert: 5"
 
-#: src/main.cc:263
+#: src/main.cc:268
 #, fuzzy
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
@@ -1337,7 +1363,7 @@ msgstr ""
 "                              Daher verbindet sich aria2 zu jeder URL mit\n"
 "                              N Verbindungen."
 
-#: src/main.cc:268
+#: src/main.cc:273
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1350,12 +1376,12 @@ msgid ""
 "                              Default: -aria2-"
 msgstr ""
 
-#: src/main.cc:277
+#: src/main.cc:282
 #, 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:278
+#: src/main.cc:283
 #, fuzzy
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
@@ -1369,24 +1395,24 @@ msgstr ""
 "                              auf .torrent endet.\n"
 "                              Fehlwert: true"
 
-#: src/main.cc:281
+#: src/main.cc:286
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/main.cc:282
+#: src/main.cc:287
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/main.cc:283
+#: src/main.cc:288
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/main.cc:284
+#: src/main.cc:289
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr ""
 
-#: src/main.cc:285
+#: src/main.cc:290
 #, fuzzy
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
@@ -1402,15 +1428,15 @@ msgstr ""
 "                              auf .torrent endet.\n"
 "                              Fehlwert: true"
 
-#: src/main.cc:290
+#: src/main.cc:295
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Versionsnummer ausgeben und beenden."
 
-#: src/main.cc:291
+#: src/main.cc:296
 msgid " -h, --help                   Print this message and exit."
 msgstr " -h, --help                   Diese Anzeige ausgeben und beenden."
 
-#: src/main.cc:294
+#: src/main.cc:299
 #, fuzzy
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
@@ -1420,7 +1446,7 @@ msgstr ""
 "verweisen\n"
 "oder der Abruf schl�gt fehl."
 
-#: src/main.cc:299
+#: src/main.cc:304
 #, fuzzy
 msgid ""
 " Specify files in multi-file torrent to download. Use in conjunction with "
@@ -1432,21 +1458,21 @@ msgstr ""
 " -T-Option. Diese Argumente werden ignoriert, wenn sie die Option --select-"
 "file angeben."
 
-#: src/main.cc:303
+#: src/main.cc:308
 msgid "Examples:"
 msgstr "Beispiele:"
 
-#: src/main.cc:304
+#: src/main.cc:309
 #, fuzzy
 msgid " Download a file using 1 connection:"
 msgstr " Abruf einer Datei �ber 1 Verbindung:"
 
-#: src/main.cc:306
+#: src/main.cc:311
 #, fuzzy
 msgid " Download a file using 2 connections:"
 msgstr " Abruf einer Datei mit 2 Verbindungen:"
 
-#: src/main.cc:308
+#: src/main.cc:313
 #, fuzzy
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
@@ -1454,59 +1480,59 @@ msgstr ""
 " Abruf einer Datei �ber 2 Verbindungen, jede verbindet zu einem anderen "
 "Server:"
 
-#: src/main.cc:310
+#: src/main.cc:315
 msgid " You can mix up different protocols:"
 msgstr " Sie k�nnen verschiedene Protokolle mischen:"
 
-#: src/main.cc:312
+#: src/main.cc:317
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:314
+#: src/main.cc:319
 msgid " Parameterized URI. -Z option must be specified:"
 msgstr ""
 
-#: src/main.cc:318
+#: src/main.cc:323
 msgid " Download a torrent:"
 msgstr " Einen torrent abrufen:"
 
-#: src/main.cc:320
+#: src/main.cc:325
 #, fuzzy
 msgid " Download a torrent using a local .torrent file:"
 msgstr " Einen torrent mit einer lokalen .torrent-Datei abrufen:"
 
-#: src/main.cc:322 src/main.cc:335
+#: src/main.cc:327 src/main.cc:340
 msgid " Download only selected files:"
 msgstr " Nur ausgew�hlte Dateien abrufen:"
 
-#: src/main.cc:324
+#: src/main.cc:329
 msgid " Print file listing of .torrent file:"
 msgstr " Dateiliste einer .torrent-Datei ausgeben:"
 
-#: src/main.cc:329
+#: src/main.cc:334
 msgid " Metalink downloading:"
 msgstr ""
 
-#: src/main.cc:331
+#: src/main.cc:336
 #, fuzzy
 msgid " Download a file using local .metalink file:"
 msgstr " Einen torrent mit einer lokalen .torrent-Datei abrufen:"
 
-#: src/main.cc:333
+#: src/main.cc:338
 msgid " Metalink downloading with preferences:"
 msgstr ""
 
-#: src/main.cc:337
+#: src/main.cc:342
 #, fuzzy
 msgid " Download only selected files using index:"
 msgstr " Nur ausgew�hlte Dateien abrufen:"
 
-#: src/main.cc:339
+#: src/main.cc:344
 #, fuzzy
 msgid " Print file listing of .metalink file:"
 msgstr " Dateiliste einer .torrent-Datei ausgeben:"
 
-#: src/main.cc:343
+#: src/main.cc:348
 #, c-format
 msgid "Report bugs to %s"
 msgstr "Fehler an %s melden"
diff --git a/po/fr.gmo b/po/fr.gmo
index 8ef39e5a..14dcdbd3 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 8155bdf8..1b7ea1a9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2 0.11.2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2007-08-28 20:46+0900\n"
+"POT-Creation-Date: 2007-08-29 00:46+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"
@@ -1143,14 +1143,42 @@ msgstr ""
 "                              Défaut: false"
 
 #: src/main.cc:199
+#, fuzzy
 msgid ""
-" -Z, --force-sequential       Fetch URIs in the command-line sequentially "
-"and\n"
+" -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
+"sequentially and\n"
 "                              download each URI in a separate session, like\n"
-"                              the usual command-line download utilities."
+"                              the usual command-line download utilities.\n"
+"                              Default: false"
 msgstr ""
+" --follow-metalink=true|false  Définir cette option comme false empêche à "
+"aria2\n"
+"                              d'entrer en mode Metalink même si le nom de "
+"fichier\n"
+"                              du fichier téléchargé se termine en ."
+"metalink.\n"
+"                              Défaut: true"
 
-#: src/main.cc:204
+#: src/main.cc:203
+#, fuzzy
+msgid ""
+" --auto-file-renaming[=true|false] Rename file name if the same file "
+"already\n"
+"                              exists. This option works only in http(s)/ftp\n"
+"                              download.\n"
+"                              The new file name has a dot and a number"
+"(1..9999)\n"
+"                              appended. Default: true"
+msgstr ""
+" --follow-metalink=true|false  Définir cette option comme false empêche à "
+"aria2\n"
+"                              d'entrer en mode Metalink même si le nom de "
+"fichier\n"
+"                              du fichier téléchargé se termine en ."
+"metalink.\n"
+"                              Défaut: true"
+
+#: src/main.cc:209
 msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
 "hash.\n"
@@ -1177,7 +1205,7 @@ msgstr ""
 "                              si le fichier .aria2 n'existe pas.\n"
 "                              Défaut: false"
 
-#: src/main.cc:212
+#: src/main.cc:217
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -1193,7 +1221,7 @@ msgstr ""
 "                              Metalink avec vérification d'intégrité.\n"
 "                              Défaut: true"
 
-#: src/main.cc:217
+#: src/main.cc:222
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1213,17 +1241,17 @@ msgstr ""
 "                              En ce moment cette option s'applique aux\n"
 "                              téléchargements http(s)/ftp."
 
-#: src/main.cc:223
+#: src/main.cc:228
 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:224
+#: src/main.cc:229
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr " -n, --no-netrc               Désactiver le support netrc."
 
-#: src/main.cc:225
+#: src/main.cc:230
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1238,7 +1266,7 @@ msgstr ""
 "                              URIs par des tabulations sur une seule ligne.\n"
 "                              Lit la sortie de stdin quand '-' est spécifié."
 
-#: src/main.cc:229
+#: src/main.cc:234
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
 "downloads.\n"
@@ -1250,7 +1278,7 @@ msgstr ""
 "                              Doit être utilisé avec l'option -i.\n"
 "                              Défaut: 5"
 
-#: src/main.cc:232
+#: src/main.cc:237
 msgid ""
 " --load-cookies=FILE          Load cookies from FILE. The format of FILE is\n"
 "                              the same used by Netscape and Mozilla."
@@ -1259,7 +1287,7 @@ msgstr ""
 "est\n"
 "                              celui utilisé par Netscape et Mozilla."
 
-#: src/main.cc:235
+#: src/main.cc:240
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -1269,7 +1297,7 @@ msgstr ""
 "metalink\n"
 "                              et quitte."
 
-#: src/main.cc:237
+#: src/main.cc:242
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -1296,12 +1324,12 @@ msgstr ""
 "varier selon\n"
 "                              la requête (consultez l'option --metalink-*)."
 
-#: src/main.cc:247
+#: src/main.cc:252
 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:248
+#: src/main.cc:253
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
 "                              entering BitTorrent mode even if the filename "
@@ -1316,7 +1344,7 @@ msgstr ""
 "                              téléchargé termine pas l'extension .torrent.\n"
 "                              Défaut: true"
 
-#: src/main.cc:252
+#: src/main.cc:257
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
@@ -1327,7 +1355,7 @@ msgstr ""
 "                              mentioné dans le fichier .torrent.\n"
 "                              Défaut: true"
 
-#: src/main.cc:255
+#: src/main.cc:260
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
 "                              Default: 6881-6999"
@@ -1336,7 +1364,7 @@ msgstr ""
 "cas d'une connexion P2P.\n"
 "                              Default: 6881-6999"
 
-#: src/main.cc:257
+#: src/main.cc:262
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -1350,7 +1378,7 @@ msgstr ""
 "1024K).\n"
 "                              Défaut: 0"
 
-#: src/main.cc:261
+#: src/main.cc:266
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -1359,7 +1387,7 @@ msgstr ""
 "Consultez aussi\n"
 "                              l'option --seed-ratio."
 
-#: src/main.cc:263
+#: src/main.cc:268
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -1378,7 +1406,7 @@ msgstr ""
 "conditions\n"
 "                              est satisfaite."
 
-#: src/main.cc:268
+#: src/main.cc:273
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1391,12 +1419,12 @@ msgid ""
 "                              Default: -aria2-"
 msgstr ""
 
-#: src/main.cc:277
+#: src/main.cc:282
 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:278
+#: src/main.cc:283
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously.\n"
@@ -1407,26 +1435,26 @@ msgstr ""
 "                              simultanément.\n"
 "                              Défaut: 5"
 
-#: src/main.cc:281
+#: src/main.cc:286
 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:282
+#: src/main.cc:287
 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:283
+#: src/main.cc:288
 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:284
+#: src/main.cc:289
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr " --metalink-location=LOCATION La localisation du serveur préféré."
 
-#: src/main.cc:285
+#: src/main.cc:290
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
 "                              entering Metalink mode even if the filename "
@@ -1442,15 +1470,15 @@ msgstr ""
 "metalink.\n"
 "                              Défaut: true"
 
-#: src/main.cc:290
+#: src/main.cc:295
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Imprime le numéro de version et quitte."
 
-#: src/main.cc:291
+#: src/main.cc:296
 msgid " -h, --help                   Print this message and exit."
 msgstr " -h, --help                   Imprime ce message et quitte."
 
-#: src/main.cc:294
+#: src/main.cc:299
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
 " or downloading will fail."
@@ -1459,7 +1487,7 @@ msgstr ""
 "même fichier\n"
 " sinon le téléchargement échoue."
 
-#: src/main.cc:299
+#: src/main.cc:304
 msgid ""
 " Specify files in multi-file torrent to download. Use in conjunction with "
 "the\n"
@@ -1469,74 +1497,74 @@ msgstr ""
 "avec l'option\n"
 " -T. Ces arguments sont ignorés si vous spécifiez l'option --select-file."
 
-#: src/main.cc:303
+#: src/main.cc:308
 msgid "Examples:"
 msgstr "Exemples:"
 
-#: src/main.cc:304
+#: src/main.cc:309
 msgid " Download a file using 1 connection:"
 msgstr " Téléchargez un fichier avec 1 connexion:"
 
-#: src/main.cc:306
+#: src/main.cc:311
 msgid " Download a file using 2 connections:"
 msgstr " Téléchargez un fichier avec 2 connexion:"
 
-#: src/main.cc:308
+#: src/main.cc:313
 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:310
+#: src/main.cc:315
 msgid " You can mix up different protocols:"
 msgstr " Vous pouvez mélanger différents protocoles:"
 
-#: src/main.cc:312
+#: src/main.cc:317
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:314
+#: src/main.cc:319
 msgid " Parameterized URI. -Z option must be specified:"
 msgstr ""
 
-#: src/main.cc:318
+#: src/main.cc:323
 msgid " Download a torrent:"
 msgstr "Téléchargez un torrent:"
 
-#: src/main.cc:320
+#: src/main.cc:325
 msgid " Download a torrent using a local .torrent file:"
 msgstr "Téléchargez un torrent en utilisant un fichier local .torrent:"
 
-#: src/main.cc:322 src/main.cc:335
+#: src/main.cc:327 src/main.cc:340
 msgid " Download only selected files:"
 msgstr "Télécharger seulement les fichiers séléctionnés:"
 
-#: src/main.cc:324
+#: src/main.cc:329
 msgid " Print file listing of .torrent file:"
 msgstr "Imprimer la liste des fichiers .torrent:"
 
-#: src/main.cc:329
+#: src/main.cc:334
 msgid " Metalink downloading:"
 msgstr "Téléchargement Metalink:"
 
-#: src/main.cc:331
+#: src/main.cc:336
 msgid " Download a file using local .metalink file:"
 msgstr "Télécharger un fichier en utilisant un fichier local .metalink:"
 
-#: src/main.cc:333
+#: src/main.cc:338
 msgid " Metalink downloading with preferences:"
 msgstr "Téléchargement Metalink avec comme préférences:"
 
-#: src/main.cc:337
+#: src/main.cc:342
 msgid " Download only selected files using index:"
 msgstr "Télécharger seulement les fichiers sélectionnés en utilisant l'index:"
 
-#: src/main.cc:339
+#: src/main.cc:344
 msgid " Print file listing of .metalink file:"
 msgstr "Imprimer la liste de fichiers du fichier .metalink:"
 
-#: src/main.cc:343
+#: src/main.cc:348
 #, c-format
 msgid "Report bugs to %s"
 msgstr "Faire part des bugs à %s"
diff --git a/po/ja.gmo b/po/ja.gmo
index 1dae8e76..d40a61cc 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 4a4c9c97..9689f5ca 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2c 0.2.1\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2007-08-28 20:46+0900\n"
+"POT-Creation-Date: 2007-08-29 00:46+0900\n"
 "PO-Revision-Date: 2007-08-10 00:08+0900\n"
 "Last-Translator: Tatsuhiro Tsujikawa <tujikawa@rednoah.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -1176,14 +1176,40 @@ msgstr ""
 "                              �ǥե������: false"
 
 #: src/main.cc:199
+#, fuzzy
 msgid ""
-" -Z, --force-sequential       Fetch URIs in the command-line sequentially "
-"and\n"
+" -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
+"sequentially and\n"
 "                              download each URI in a separate session, like\n"
-"                              the usual command-line download utilities."
+"                              the usual command-line download utilities.\n"
+"                              Default: false"
 msgstr ""
+" --follow-metalink=true|false  ���Υ��ץ����� false �����ꤹ���, ������"
+"������\n"
+"                              �����ե�����γ�ĥ�Ҥ� .metalink �Ǥ��äƤ�, "
+"aria2\n"
+"                              ��, Metalink �⡼�ɤ�����ޤ���.\n"
+"                              �ǥե������: true"
 
-#: src/main.cc:204
+#: src/main.cc:203
+#, fuzzy
+msgid ""
+" --auto-file-renaming[=true|false] Rename file name if the same file "
+"already\n"
+"                              exists. This option works only in http(s)/ftp\n"
+"                              download.\n"
+"                              The new file name has a dot and a number"
+"(1..9999)\n"
+"                              appended. Default: true"
+msgstr ""
+" --follow-metalink=true|false  ���Υ��ץ����� false �����ꤹ���, ������"
+"������\n"
+"                              �����ե�����γ�ĥ�Ҥ� .metalink �Ǥ��äƤ�, "
+"aria2\n"
+"                              ��, Metalink �⡼�ɤ�����ޤ���.\n"
+"                              �ǥե������: true"
+
+#: src/main.cc:209
 msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
 "hash.\n"
@@ -1210,7 +1236,7 @@ msgstr ""
 "                              ���⤷��ޤ���.\n"
 "                              �ǥե������: false"
 
-#: src/main.cc:212
+#: src/main.cc:217
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -1226,7 +1252,7 @@ msgstr ""
 "                              Metalink �ǤΤ߻��ѤǤ��ޤ�.\n"
 "                              �ǥե������: true"
 
-#: src/main.cc:217
+#: src/main.cc:222
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1245,15 +1271,15 @@ msgstr ""
 "��\n"
 "                              �Ǥ��ޤ�."
 
-#: src/main.cc:223
+#: src/main.cc:228
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr " -U, --user-agent=USER_AGENT  �桼��������������Ȥ����ꤷ�ޤ�."
 
-#: src/main.cc:224
+#: src/main.cc:229
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr " -n, --no-netrc               netrc ���ݡ��Ȥ�ߤ�ޤ�."
 
-#: src/main.cc:225
+#: src/main.cc:230
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1273,7 +1299,7 @@ msgstr ""
 "��\n"
 "                              ��."
 
-#: src/main.cc:229
+#: src/main.cc:234
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
 "downloads.\n"
@@ -1285,7 +1311,7 @@ msgstr ""
 "                              �ȶ��˻ȤäƤ�������.\n"
 "                              �ǥե������: 5"
 
-#: src/main.cc:232
+#: src/main.cc:237
 msgid ""
 " --load-cookies=FILE          Load cookies from FILE. The format of FILE is\n"
 "                              the same used by Netscape and Mozilla."
@@ -1295,7 +1321,7 @@ msgstr ""
 "                              �Ȥ�, Netscape �� Mozilla �ǻȤ��Ƥ����Τ�"
 "��."
 
-#: src/main.cc:235
+#: src/main.cc:240
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -1304,7 +1330,7 @@ msgstr ""
 " -S, --show-files             .torrent/.metalink �ե�����˴ޤޤ��ե�����\n"
 "                              �ꥹ�Ȥ���Ϥ���λ���ޤ�."
 
-#: src/main.cc:237
+#: src/main.cc:242
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -1332,11 +1358,11 @@ msgstr ""
 "���\n"
 "                              �ƥ���ǥå������Ѳ������礬����ޤ�."
 
-#: src/main.cc:247
+#: src/main.cc:252
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr " -T, --torrent-file=TORRENT_FILE  .torrent �ե�����Υѥ������."
 
-#: src/main.cc:248
+#: src/main.cc:253
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
 "                              entering BitTorrent mode even if the filename "
@@ -1351,7 +1377,7 @@ msgstr ""
 "                              ��, BitTorrent �⡼�ɤ�����ޤ���.\n"
 "                              �ǥե������: true"
 
-#: src/main.cc:252
+#: src/main.cc:257
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
@@ -1362,7 +1388,7 @@ msgstr ""
 "                              ���ޤ�.\n"
 "                              �ǥե������: true"
 
-#: src/main.cc:255
+#: src/main.cc:260
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
 "                              Default: 6881-6999"
@@ -1370,7 +1396,7 @@ msgstr ""
 " --listen-port=PORT           �ԥ��������³������դ���ݡ����ֹ�����.\n"
 "                              �ǥե������: 6881-6999"
 
-#: src/main.cc:257
+#: src/main.cc:262
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -1385,7 +1411,7 @@ msgstr ""
 "1024K).\n"
 "                              �ǥե������: 0"
 
-#: src/main.cc:261
+#: src/main.cc:266
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -1393,7 +1419,7 @@ msgstr ""
 " --seed-time=MINUTES          �����ɤ�Ԥ����֤�ʬñ�̤ǻ��ꤷ�ޤ�. \n"
 "                              --seed-ratio ���ץ����⻲�Ȥ��Ƥ�������."
 
-#: src/main.cc:263
+#: src/main.cc:268
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -1411,7 +1437,7 @@ msgstr ""
 "��\n"
 "                              �Ȥ�����ξ�郎��Ω����ȥ����ɤ�λ���ޤ�."
 
-#: src/main.cc:268
+#: src/main.cc:273
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1435,11 +1461,11 @@ msgstr ""
 "��.\n"
 "                               �ǥե������: -aria2-"
 
-#: src/main.cc:277
+#: src/main.cc:282
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr " -M, --metalink-file=METALINK_FILE .metalink �ե�����Υѥ������."
 
-#: src/main.cc:278
+#: src/main.cc:283
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously.\n"
@@ -1448,15 +1474,15 @@ msgstr ""
 " -C, --metalink-servers=NUM_SERVERS Ʊ������³���륵���Фο�����ꤷ�ޤ�.\n"
 "                              �ǥե������: 5"
 
-#: src/main.cc:281
+#: src/main.cc:286
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   ����������ɤ���ե�����ΥС������."
 
-#: src/main.cc:282
+#: src/main.cc:287
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE ����������ɤ���ե�����θ���."
 
-#: src/main.cc:283
+#: src/main.cc:288
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
@@ -1464,11 +1490,11 @@ msgstr ""
 "�졼\n"
 "                              �ƥ��󥰡������ƥ�."
 
-#: src/main.cc:284
+#: src/main.cc:289
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr " --metalink-location=LOCATION ͥ��Ū�˥���������ɤ��륵���С��ξ��."
 
-#: src/main.cc:285
+#: src/main.cc:290
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
 "                              entering Metalink mode even if the filename "
@@ -1483,16 +1509,16 @@ msgstr ""
 "                              ��, Metalink �⡼�ɤ�����ޤ���.\n"
 "                              �ǥե������: true"
 
-#: src/main.cc:290
+#: src/main.cc:295
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                �С�������ֹ��ɽ����, ��λ���ޤ�."
 
-#: src/main.cc:291
+#: src/main.cc:296
 msgid " -h, --help                   Print this message and exit."
 msgstr ""
 " -h, --help                   ���Υإ�ץ�å�������ɽ����, ��λ���ޤ�."
 
-#: src/main.cc:294
+#: src/main.cc:299
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
 " or downloading will fail."
@@ -1501,7 +1527,7 @@ msgstr ""
 "��\n"
 " �Фʤ�ޤ���. ����ʤ��Х���������ɤϼ��Ԥ��ޤ�."
 
-#: src/main.cc:299
+#: src/main.cc:304
 msgid ""
 " Specify files in multi-file torrent to download. Use in conjunction with "
 "the\n"
@@ -1511,72 +1537,72 @@ msgstr ""
 "��\n"
 " �ȶ��˻��Ѥ��ޤ�. --select-file ���ץ�����ʻ�ѤϤǤ��ޤ���."
 
-#: src/main.cc:303
+#: src/main.cc:308
 msgid "Examples:"
 msgstr "��:"
 
-#: src/main.cc:304
+#: src/main.cc:309
 msgid " Download a file using 1 connection:"
 msgstr " 1 ���ͥ������ǤΥ����������:"
 
-#: src/main.cc:306
+#: src/main.cc:311
 msgid " Download a file using 2 connections:"
 msgstr " 2 ���ͥ������ǤΥ����������:"
 
-#: src/main.cc:308
+#: src/main.cc:313
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
 msgstr " ��Ĥΰۤʤ륵���С�����³���ƥ����������:"
 
-#: src/main.cc:310
+#: src/main.cc:315
 msgid " You can mix up different protocols:"
 msgstr " �ۤʤ�ץ��ȥ���򺮹礵���ƥ����������:"
 
-#: src/main.cc:312
+#: src/main.cc:317
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:314
+#: src/main.cc:319
 msgid " Parameterized URI. -Z option must be specified:"
 msgstr ""
 
-#: src/main.cc:318
+#: src/main.cc:323
 msgid " Download a torrent:"
 msgstr " torrent ������������:"
 
-#: src/main.cc:320
+#: src/main.cc:325
 msgid " Download a torrent using a local .torrent file:"
 msgstr " �������� .torrent �ե������Ȥäƥ����������:"
 
-#: src/main.cc:322 src/main.cc:335
+#: src/main.cc:327 src/main.cc:340
 msgid " Download only selected files:"
 msgstr " �ե��������ꤷ�ƥ����������:"
 
-#: src/main.cc:324
+#: src/main.cc:329
 msgid " Print file listing of .torrent file:"
 msgstr " ���� .torrent �ե�����˴ޤޤ��ե�����ꥹ�Ȥ�ɽ��:"
 
-#: src/main.cc:329
+#: src/main.cc:334
 msgid " Metalink downloading:"
 msgstr " Metalink �ǥ����������:"
 
-#: src/main.cc:331
+#: src/main.cc:336
 msgid " Download a file using local .metalink file:"
 msgstr " �������� .metalink �ե������Ȥäƥ����������:"
 
-#: src/main.cc:333
+#: src/main.cc:338
 msgid " Metalink downloading with preferences:"
 msgstr " �桼������ˤ�� Metalink �����������:"
 
-#: src/main.cc:337
+#: src/main.cc:342
 msgid " Download only selected files using index:"
 msgstr " �ե�����Υ���ǥå�������ꤷ�ƥ����������:"
 
-#: src/main.cc:339
+#: src/main.cc:344
 msgid " Print file listing of .metalink file:"
 msgstr " ���� .metalink �ե�����˴ޤޤ��ե�����ꥹ�Ȥ�ɽ��:"
 
-#: src/main.cc:343
+#: src/main.cc:348
 #, c-format
 msgid "Report bugs to %s"
 msgstr "�Х���ݡ��ȤϤ������: %s"
diff --git a/po/ru.gmo b/po/ru.gmo
index 256d21ee..6870fa99 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 5b4956a3..72dbc143 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2007-08-28 20:46+0900\n"
+"POT-Creation-Date: 2007-08-29 00:46+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"
@@ -1129,14 +1129,38 @@ msgstr ""
 "                              По умолчанию: true"
 
 #: src/main.cc:199
+#, fuzzy
 msgid ""
-" -Z, --force-sequential       Fetch URIs in the command-line sequentially "
-"and\n"
+" -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
+"sequentially and\n"
 "                              download each URI in a separate session, like\n"
-"                              the usual command-line download utilities."
+"                              the usual command-line download utilities.\n"
+"                              Default: false"
 msgstr ""
+" --follow-metalink=true|false При установке в \"false\" aria2 не переходит "
+"в\n"
+"                              режим Metalink и может скачивать .metalink-\n"
+"                              файлы.\n"
+"                              По умолчанию: true"
 
-#: src/main.cc:204
+#: src/main.cc:203
+#, fuzzy
+msgid ""
+" --auto-file-renaming[=true|false] Rename file name if the same file "
+"already\n"
+"                              exists. This option works only in http(s)/ftp\n"
+"                              download.\n"
+"                              The new file name has a dot and a number"
+"(1..9999)\n"
+"                              appended. Default: true"
+msgstr ""
+" --follow-metalink=true|false При установке в \"false\" aria2 не переходит "
+"в\n"
+"                              режим Metalink и может скачивать .metalink-\n"
+"                              файлы.\n"
+"                              По умолчанию: true"
+
+#: src/main.cc:209
 #, fuzzy
 msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
@@ -1157,7 +1181,7 @@ msgstr ""
 "60.\n"
 "                              По умолчанию: 5"
 
-#: src/main.cc:212
+#: src/main.cc:217
 #, fuzzy
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
@@ -1173,7 +1197,7 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:217
+#: src/main.cc:222
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1183,15 +1207,15 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/main.cc:223
+#: src/main.cc:228
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/main.cc:224
+#: src/main.cc:229
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/main.cc:225
+#: src/main.cc:230
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1200,7 +1224,7 @@ msgid ""
 "                              Reads input from stdin when '-' is specified."
 msgstr ""
 
-#: src/main.cc:229
+#: src/main.cc:234
 #, fuzzy
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
@@ -1211,13 +1235,13 @@ msgstr ""
 " -m, --max-tries=N            Установить число попыток. 0 означает\n"
 "                              неограниченное число. По умолчанию: 5"
 
-#: src/main.cc:232
+#: src/main.cc:237
 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:235
+#: src/main.cc:240
 #, fuzzy
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
@@ -1226,7 +1250,7 @@ msgid ""
 msgstr ""
 " -S, --show-files             Вывести перечисленные .torrent файлы и выйти."
 
-#: src/main.cc:237
+#: src/main.cc:242
 #, fuzzy
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
@@ -1248,12 +1272,12 @@ msgstr ""
 "                              Также вы можете использовать тире (\"1-5\").\n"
 "                              \",\" и \"-\" могут быть использованы вместе."
 
-#: src/main.cc:247
+#: src/main.cc:252
 #, fuzzy
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr " -T, --torrent-file=TORRENT_FILE  Путь до .torrent-файла."
 
-#: src/main.cc:248
+#: src/main.cc:253
 #, fuzzy
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
@@ -1268,7 +1292,7 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:252
+#: src/main.cc:257
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
@@ -1278,7 +1302,7 @@ msgstr ""
 "                              описанный в .torrent-файл.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:255
+#: src/main.cc:260
 #, fuzzy
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
@@ -1286,7 +1310,7 @@ msgid ""
 msgstr ""
 " --listen-port=PORT           Установить порт для прослушивания соединения."
 
-#: src/main.cc:257
+#: src/main.cc:262
 #, fuzzy
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
@@ -1299,7 +1323,7 @@ msgstr ""
 "60.\n"
 "                              По умолчанию: 5"
 
-#: src/main.cc:261
+#: src/main.cc:266
 #, fuzzy
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
@@ -1308,7 +1332,7 @@ msgstr ""
 " -m, --max-tries=N            Установить число попыток. 0 означает\n"
 "                              неограниченное число. По умолчанию: 5"
 
-#: src/main.cc:263
+#: src/main.cc:268
 #, fuzzy
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
@@ -1325,7 +1349,7 @@ msgstr ""
 "                              Следуя этому, aria2 соединяется к каждому URL\n"
 "                              используя N соединений."
 
-#: src/main.cc:268
+#: src/main.cc:273
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1338,12 +1362,12 @@ msgid ""
 "                              Default: -aria2-"
 msgstr ""
 
-#: src/main.cc:277
+#: src/main.cc:282
 #, fuzzy
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr " -M, --metalink-file=METALINK_FILE Путь к .metalink-файлу."
 
-#: src/main.cc:278
+#: src/main.cc:283
 #, fuzzy
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
@@ -1356,27 +1380,27 @@ msgstr ""
 "параметр -s.\n"
 "                              По умолчанию: 15"
 
-#: src/main.cc:281
+#: src/main.cc:286
 #, fuzzy
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   Версия файла для скачивания."
 
-#: src/main.cc:282
+#: src/main.cc:287
 #, fuzzy
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE Язык файла для скачивания."
 
-#: src/main.cc:283
+#: src/main.cc:288
 #, fuzzy
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr " --metalink-os=OS             Целевая операционная система файла."
 
-#: src/main.cc:284
+#: src/main.cc:289
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr ""
 
-#: src/main.cc:285
+#: src/main.cc:290
 #, fuzzy
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
@@ -1391,15 +1415,15 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:290
+#: src/main.cc:295
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Вывести номер версии и выйти."
 
-#: src/main.cc:291
+#: src/main.cc:296
 msgid " -h, --help                   Print this message and exit."
 msgstr " -h, --help                   Вывести это сообщение и выйти."
 
-#: src/main.cc:294
+#: src/main.cc:299
 #, fuzzy
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
@@ -1408,7 +1432,7 @@ msgstr ""
 " Вы можете указать несколько URL. Все URL должны указывать на один и тот же\n"
 " файл, иначе скачивание завершится неудачей."
 
-#: src/main.cc:299
+#: src/main.cc:304
 #, fuzzy
 msgid ""
 " Specify files in multi-file torrent to download. Use in conjunction with "
@@ -1418,78 +1442,78 @@ msgstr ""
 " Указать файлы для скачивания при многофайловом torent. Используйте вместе\n"
 " с параметром -T. Этот параметр игнорируется при указании --select-file."
 
-#: src/main.cc:303
+#: src/main.cc:308
 msgid "Examples:"
 msgstr "Примеры:"
 
-#: src/main.cc:304
+#: src/main.cc:309
 #, fuzzy
 msgid " Download a file using 1 connection:"
 msgstr " Скачать файл с помощью 1 соединения:"
 
-#: src/main.cc:306
+#: src/main.cc:311
 #, fuzzy
 msgid " Download a file using 2 connections:"
 msgstr " Скачать файл с помощью 2 соединений:"
 
-#: src/main.cc:308
+#: src/main.cc:313
 #, fuzzy
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
 msgstr " Скачать файл с помощью 2 соединений к различным серверам:"
 
-#: src/main.cc:310
+#: src/main.cc:315
 msgid " You can mix up different protocols:"
 msgstr " Вы можете смешивать различные протоколы:"
 
-#: src/main.cc:312
+#: src/main.cc:317
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:314
+#: src/main.cc:319
 msgid " Parameterized URI. -Z option must be specified:"
 msgstr ""
 
-#: src/main.cc:318
+#: src/main.cc:323
 msgid " Download a torrent:"
 msgstr " Скачать torrent:"
 
-#: src/main.cc:320
+#: src/main.cc:325
 #, fuzzy
 msgid " Download a torrent using a local .torrent file:"
 msgstr " Скачать torrent с помощью локального .torrent-файла:"
 
-#: src/main.cc:322 src/main.cc:335
+#: src/main.cc:327 src/main.cc:340
 msgid " Download only selected files:"
 msgstr " Скачать только выбранные файлы:"
 
-#: src/main.cc:324
+#: src/main.cc:329
 msgid " Print file listing of .torrent file:"
 msgstr " Вывести список фалов из .torrent"
 
-#: src/main.cc:329
+#: src/main.cc:334
 msgid " Metalink downloading:"
 msgstr " Скачать metalink:"
 
-#: src/main.cc:331
+#: src/main.cc:336
 msgid " Download a file using local .metalink file:"
 msgstr " Скачать файл с помощью локального .metalink-файла:"
 
-#: src/main.cc:333
+#: src/main.cc:338
 msgid " Metalink downloading with preferences:"
 msgstr " Скачивание metalink с настройками:"
 
-#: src/main.cc:337
+#: src/main.cc:342
 #, fuzzy
 msgid " Download only selected files using index:"
 msgstr " Скачать только выбранные файлы:"
 
-#: src/main.cc:339
+#: src/main.cc:344
 #, fuzzy
 msgid " Print file listing of .metalink file:"
 msgstr " Вывести список фалов из .torrent"
 
-#: src/main.cc:343
+#: src/main.cc:348
 #, c-format
 msgid "Report bugs to %s"
 msgstr "Сообщения об ошибках направляйте на адрес %s"