diff --git a/doc/man/ja/mkvmerge.1 b/doc/man/ja/mkvmerge.1
index 0590b6ce3..f9e1ff2eb 100644
--- a/doc/man/ja/mkvmerge.1
+++ b/doc/man/ja/mkvmerge.1
@@ -648,6 +648,19 @@ Matroska(TM)ファイルは再生時の画像スケールを決定するため
\fBmkvmerge\fR(1)に、単一のファイルを探査してその種類と、ファイルに含まれるトラック及びそのトラックIDを表示させます。このオプションを指定した場合、他に指定できるのはファイル名のみです。
.RE
.PP
+\fB\-I\fR, \fB\-\-identify\-verbose\fR \fIfile\-name\fR
+.RS 4
+
+\fBmkvmerge\fR(1)に、単一のファイルを探査してその種類と、ファイルに含まれるトラック及びそのトラックIDを表示させます。このオプションを指定した場合、他に指定できるのはファイル名のみです。
+.sp
+This option causes
+\fBmkvmerge\fR(1)
+to output additional information about the container and each track within\&. The extra information is surronded by square brackets\&. It consists of space\-saparated key/value pairs where keys and values are separated by a colon\&.
+.sp
+Each value is escaped according to the rules described in
+the section about escaping special characters in text\&.
+.RE
+.PP
\fB\-l\fR, \fB\-\-list\-types\fR
.RS 4
サポートされている入力ファイルの種類を列挙します。
diff --git a/doc/man/mkvmerge.1 b/doc/man/mkvmerge.1
index 20888c45e..9823801d6 100644
--- a/doc/man/mkvmerge.1
+++ b/doc/man/mkvmerge.1
@@ -997,6 +997,20 @@ Will let
probe the single file and report its type, the tracks contained in the file and their track IDs\&. If this option is used then the only other option allowed is the filename\&.
.RE
.PP
+\fB\-I\fR, \fB\-\-identify\-verbose\fR \fIfile\-name\fR
+.RS 4
+Will let
+\fBmkvmerge\fR(1)
+probe the single file and report its type, the tracks contained in the file and their track IDs\&. If this option is used then the only other option allowed is the filename\&.
+.sp
+This option causes
+\fBmkvmerge\fR(1)
+to output additional information about the container and each track within\&. The extra information is surronded by square brackets\&. It consists of space\-saparated key/value pairs where keys and values are separated by a colon\&.
+.sp
+Each value is escaped according to the rules described in
+the section about escaping special characters in text\&.
+.RE
+.PP
\fB\-l\fR, \fB\-\-list\-types\fR
.RS 4
Lists supported input file types\&.
diff --git a/doc/man/mkvmerge.xml b/doc/man/mkvmerge.xml
index 2632539a2..797006e58 100644
--- a/doc/man/mkvmerge.xml
+++ b/doc/man/mkvmerge.xml
@@ -1166,6 +1166,26 @@ $ mkvmerge -o full.mkv =file1.mkv
+
+ , file-name
+
+
+ Will let &mkvmerge; probe the single file and report its type, the tracks contained in the file and their track IDs. If this option is
+ used then the only other option allowed is the filename.
+
+
+
+ This option causes &mkvmerge; to output additional information about the container and each track within. The extra information is
+ surronded by square brackets. It consists of space-saparated key/value pairs where keys and values are separated by a colon.
+
+
+
+ Each value is escaped according to the rules described in the section about escaping special
+ characters in text.
+
+
+
+
,
diff --git a/doc/man/nl/mkvmerge.1 b/doc/man/nl/mkvmerge.1
index 41220795c..5b317f424 100644
--- a/doc/man/nl/mkvmerge.1
+++ b/doc/man/nl/mkvmerge.1
@@ -997,6 +997,20 @@ Zal
(met een sonde) een enkel bestand aftasten en het type rapporteren, de sporen in het bestand en hun spoor ID\*(Aqs\&. Als deze optie wordt gebruikt dan is de enige andere toegestane optie de bestandsnaam\&.
.RE
.PP
+\fB\-I\fR, \fB\-\-identify\-verbose\fR \fIfile\-name\fR
+.RS 4
+Zal
+\fBmkvmerge\fR(1)
+(met een sonde) een enkel bestand aftasten en het type rapporteren, de sporen in het bestand en hun spoor ID\*(Aqs\&. Als deze optie wordt gebruikt dan is de enige andere toegestane optie de bestandsnaam\&.
+.sp
+This option causes
+\fBmkvmerge\fR(1)
+to output additional information about the container and each track within\&. The extra information is surronded by square brackets\&. It consists of space\-saparated key/value pairs where keys and values are separated by a colon\&.
+.sp
+Each value is escaped according to the rules described in
+the section about escaping special characters in text\&.
+.RE
+.PP
\fB\-l\fR, \fB\-\-list\-types\fR
.RS 4
Somt invoer bestandstypen op\&.
diff --git a/doc/man/po4a/po/ja.po b/doc/man/po4a/po/ja.po
index 9d0674af4..ed6b31498 100644
--- a/doc/man/po4a/po/ja.po
+++ b/doc/man/po4a/po/ja.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.9.9\n"
-"POT-Creation-Date: 2010-11-18 11:24+0100\n"
+"POT-Creation-Date: 2010-12-20 19:21+0100\n"
"PO-Revision-Date: 2010-11-01 06:48+0900\n"
"Last-Translator: Hiroki Taniura \n"
"Language-Team: none\n"
@@ -266,7 +266,7 @@ msgstr ""
"ことがあります。"
#. type: Content of:
-#: doc/man/mkvextract.xml:91 doc/man/mkvinfo.xml:120 doc/man/mkvmerge.xml:1202
+#: doc/man/mkvextract.xml:91 doc/man/mkvinfo.xml:120 doc/man/mkvmerge.xml:1222
#: doc/man/mkvpropedit.xml:156
msgid ""
" character-set"
@@ -285,13 +285,13 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:101 doc/man/mkvinfo.xml:130
-#: doc/man/mkvmerge.xml:1215 doc/man/mkvpropedit.xml:166
+#: doc/man/mkvmerge.xml:1235 doc/man/mkvpropedit.xml:166
msgid " character-set"
msgstr " character-set"
#. type: Content of:
#: doc/man/mkvextract.xml:104 doc/man/mkvinfo.xml:133
-#: doc/man/mkvmerge.xml:1218 doc/man/mkvpropedit.xml:169
+#: doc/man/mkvmerge.xml:1238 doc/man/mkvpropedit.xml:169
msgid ""
"Sets the character set to which strings are converted that are to be "
"output. It defaults to the character set given by system's current locale."
@@ -301,7 +301,7 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:111 doc/man/mkvinfo.xml:140
-#: doc/man/mkvmerge.xml:1225 doc/man/mkvpropedit.xml:176
+#: doc/man/mkvmerge.xml:1245 doc/man/mkvpropedit.xml:176
msgid ""
", file-"
"name"
@@ -328,7 +328,7 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:123 doc/man/mkvinfo.xml:152
-#: doc/man/mkvmerge.xml:1236 doc/man/mkvpropedit.xml:188
+#: doc/man/mkvmerge.xml:1256 doc/man/mkvpropedit.xml:188
msgid " code"
msgstr " code"
@@ -364,37 +364,37 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:144 doc/man/mkvinfo.xml:174
-#: doc/man/mkvmerge.xml:1308 doc/man/mkvpropedit.xml:209
+#: doc/man/mkvmerge.xml:1333 doc/man/mkvpropedit.xml:209
msgid ", "
msgstr ", "
#. type: Content of:
#: doc/man/mkvextract.xml:147 doc/man/mkvinfo.xml:177
-#: doc/man/mkvmerge.xml:1311 doc/man/mkvpropedit.xml:212
+#: doc/man/mkvmerge.xml:1336 doc/man/mkvpropedit.xml:212
msgid "Show usage information and exit."
msgstr "コマンド書式情報を出力して終了します。"
#. type: Content of:
#: doc/man/mkvextract.xml:153 doc/man/mkvinfo.xml:183
-#: doc/man/mkvmerge.xml:1317 doc/man/mkvpropedit.xml:218
+#: doc/man/mkvmerge.xml:1342 doc/man/mkvpropedit.xml:218
msgid ", "
msgstr ", "
#. type: Content of:
#: doc/man/mkvextract.xml:156 doc/man/mkvinfo.xml:186
-#: doc/man/mkvmerge.xml:1320 doc/man/mkvpropedit.xml:221
+#: doc/man/mkvmerge.xml:1345 doc/man/mkvpropedit.xml:221
msgid "Show version information and exit."
msgstr "バージョン情報を出力して終了します。"
#. type: Content of:
#: doc/man/mkvextract.xml:162 doc/man/mkvinfo.xml:192
-#: doc/man/mkvmerge.xml:1248 doc/man/mkvpropedit.xml:227
+#: doc/man/mkvmerge.xml:1268 doc/man/mkvpropedit.xml:227
msgid "options-file"
msgstr "options-file"
#. type: Content of:
#: doc/man/mkvextract.xml:165 doc/man/mkvinfo.xml:195
-#: doc/man/mkvmerge.xml:1251 doc/man/mkvpropedit.xml:230
+#: doc/man/mkvpropedit.xml:230
msgid ""
"Reads additional command line arguments from the file options-"
"file. Lines whose first non-whitespace character is a hash mark "
@@ -1017,7 +1017,7 @@ msgstr ""
"テナに格納されます。"
#. type: Content of:
-#: doc/man/mkvextract.xml:525 doc/man/mkvmerge.xml:1867
+#: doc/man/mkvextract.xml:525 doc/man/mkvmerge.xml:1904
msgid "Tags"
msgstr "タグ"
@@ -1031,7 +1031,7 @@ msgstr ""
"読み込む際のフォーマットと同じです。"
#. type: Content of:
-#: doc/man/mkvextract.xml:534 doc/man/mkvmerge.xml:1735
+#: doc/man/mkvextract.xml:534 doc/man/mkvmerge.xml:1772
msgid "Attachments"
msgstr "添付ファイル"
@@ -1045,7 +1045,7 @@ msgstr ""
"く行われません。"
#. type: Content of:
-#: doc/man/mkvextract.xml:543 doc/man/mkvmerge.xml:1760
+#: doc/man/mkvextract.xml:543 doc/man/mkvmerge.xml:1797
msgid "Chapters"
msgstr "チャプタ"
@@ -1078,7 +1078,7 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:565 doc/man/mkvinfo.xml:252
-#: doc/man/mkvmerge.xml:2099 doc/man/mkvpropedit.xml:364
+#: doc/man/mkvmerge.xml:2136 doc/man/mkvpropedit.xml:364
msgid "Exit codes"
msgstr "返り値"
@@ -1122,7 +1122,7 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvextract.xml:596 doc/man/mkvinfo.xml:282
-#: doc/man/mkvmerge.xml:2130 doc/man/mkvpropedit.xml:395 doc/man/mmg.xml:90
+#: doc/man/mkvmerge.xml:2167 doc/man/mkvpropedit.xml:395 doc/man/mmg.xml:90
msgid "See also"
msgstr "関連項目"
@@ -1133,13 +1133,13 @@ msgstr "&mkvmerge;, &mkvinfo;, &mkvpropedit;, &mmg;"
#. type: Content of:
#: doc/man/mkvextract.xml:603 doc/man/mkvinfo.xml:289
-#: doc/man/mkvmerge.xml:2137 doc/man/mkvpropedit.xml:402 doc/man/mmg.xml:97
+#: doc/man/mkvmerge.xml:2174 doc/man/mkvpropedit.xml:402 doc/man/mmg.xml:97
msgid "WWW"
msgstr "ウェブ"
#. type: Content of:
#: doc/man/mkvextract.xml:605 doc/man/mkvinfo.xml:291
-#: doc/man/mkvmerge.xml:2139 doc/man/mkvpropedit.xml:404 doc/man/mmg.xml:99
+#: doc/man/mkvmerge.xml:2176 doc/man/mkvpropedit.xml:404 doc/man/mmg.xml:99
msgid ""
"The latest version can always be found at the MKVToolNix homepage."
@@ -2345,7 +2345,7 @@ msgstr ""
"mkvのようにして簡単に結合することができます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:554 doc/man/mkvmerge.xml:569
+#: doc/man/mkvmerge.xml:554
msgid ""
msgstr ""
@@ -2372,6 +2372,13 @@ msgstr ""
"$ mkvmerge -o full.mkv file1.mkv +file2.mkv\n"
" "
+#. type: Content of:
+#: doc/man/mkvmerge.xml:569
+#, fuzzy
+#| msgid ""
+msgid ""
+msgstr ""
+
#. type: Content of:
#: doc/man/mkvmerge.xml:572
msgid ""
@@ -3449,7 +3456,7 @@ msgstr ""
"parameter>"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1163
+#: doc/man/mkvmerge.xml:1163 doc/man/mkvmerge.xml:1173
msgid ""
"Will let &mkvmerge; probe the single file and report its type, the tracks "
"contained in the file and their track IDs. If this option is used then the "
@@ -3461,21 +3468,51 @@ msgstr ""
#. type: Content of:
#: doc/man/mkvmerge.xml:1170
+#, fuzzy
+#| msgid ""
+#| ", file-name"
+#| "parameter>"
+msgid ""
+", file-"
+"name"
+msgstr ""
+", file-name"
+"parameter>"
+
+#. type: Content of:
+#: doc/man/mkvmerge.xml:1178
+msgid ""
+"This option causes &mkvmerge; to output additional information about the "
+"container and each track within. The extra information is surronded by "
+"square brackets. It consists of space-saparated key/value pairs where keys "
+"and values are separated by a colon."
+msgstr ""
+
+#. type: Content of:
+#: doc/man/mkvmerge.xml:1183
+msgid ""
+"Each value is escaped according to the rules described in the section about escaping special characters in text"
+"link>."
+msgstr ""
+
+#. type: Content of:
+#: doc/man/mkvmerge.xml:1190
msgid ", "
msgstr ", "
#. type: Content of:
-#: doc/man/mkvmerge.xml:1173
+#: doc/man/mkvmerge.xml:1193
msgid "Lists supported input file types."
msgstr "サポートされている入力ファイルの種類を列挙します。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1179
+#: doc/man/mkvmerge.xml:1199
msgid ""
msgstr ""
#. type: Content of:
-#: doc/man/mkvmerge.xml:1182
+#: doc/man/mkvmerge.xml:1202
msgid ""
"Lists all languages and their ISO639-2 code which can be used with the "
@@ -3485,12 +3522,12 @@ msgstr ""
"link>オプションに指定できる、ISO639-2言語コードの一覧を出力します。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1189
+#: doc/man/mkvmerge.xml:1209
msgid " priority"
msgstr " priority"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1192
+#: doc/man/mkvmerge.xml:1212
msgid ""
"Sets the process priority that &mkvmerge; runs with. Valid values are "
"'lowest', 'lower', 'normal"
@@ -3512,7 +3549,7 @@ msgstr ""
"ザのみが使用可能です。Windowsでは全てのユーザが全優先度を使用可能です。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1205
+#: doc/man/mkvmerge.xml:1225
msgid ""
"Sets the character set to convert strings given on the command line from. It "
"defaults to the character set given by system's current locale. This "
@@ -3530,7 +3567,7 @@ msgstr ""
"attachment-descriptionの三つのオプションの引数に影響します。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1228
+#: doc/man/mkvmerge.xml:1248
msgid ""
"Writes all messages to the file file-name instead of "
"to the console. While this can be done easily with output redirection there "
@@ -3547,7 +3584,7 @@ msgstr ""
"字コードは尊重されます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1239
+#: doc/man/mkvmerge.xml:1259
msgid ""
"Forces the translations for the language code to be "
"used (e.g. 'de_DE' for the German translations). It is "
@@ -3563,7 +3600,37 @@ msgstr ""
"listと指定すると、指定できる言語コードの一覧を出力します。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1257
+#: doc/man/mkvmerge.xml:1271
+#, fuzzy
+#| msgid ""
+#| "Reads additional command line arguments from the file options-"
+#| "file. Lines whose first non-whitespace character is a hash "
+#| "mark ('#') are treated as comments and ignored. White "
+#| "spaces at the start and end of a line will be stripped. Each line must "
+#| "contain exactly one option. There is no meta character escaping."
+msgid ""
+"Reads additional command line arguments from the file options-"
+"file. Lines whose first non-whitespace character is a hash mark "
+"('#') are treated as comments and ignored. White spaces "
+"at the start and end of a line will be stripped. Each line must contain "
+"exactly one option."
+msgstr ""
+"options-fileで指定されたファイルから追加のコマンドライ"
+"ンオプションを読み込みます。行で最初の空白文字でない文字がハッシュマーク"
+"('#')である行はコメントとして扱われ、無視されます。行頭、"
+"及び行末の空白文字は取り除かれます。各行には一つずつしかオプションを指定でき"
+"ません。メタキャラクタのエスケープは必要ありません。"
+
+#. type: Content of:
+#: doc/man/mkvmerge.xml:1277
+msgid ""
+"Several chars can be escaped, e.g. if you need to start a non-comment line "
+"with '#'. The rules are described in the "
+"section about escaping text."
+msgstr ""
+
+#. type: Content of:
+#: doc/man/mkvmerge.xml:1282
msgid ""
"The command line 'mkvmerge -o \"my file.mkv\" -A \"a movie.avi\" "
"sound.ogg' could be converted into the following option file:"
@@ -3573,7 +3640,7 @@ msgstr ""
"て指定できます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1262
+#: doc/man/mkvmerge.xml:1287
#, no-wrap
msgid ""
"# Write to the file \"my file.mkv\".\n"
@@ -3595,12 +3662,12 @@ msgstr ""
" "
#. type: Content of:
-#: doc/man/mkvmerge.xml:1274
+#: doc/man/mkvmerge.xml:1299
msgid ""
msgstr ""
#. type: Content of:
-#: doc/man/mkvmerge.xml:1277
+#: doc/man/mkvmerge.xml:1302
msgid ""
"Lists information about optional features that have been compiled in and "
"exit. The first line output will be the version information. All following "
@@ -3612,7 +3679,7 @@ msgstr ""
"ことを示す一単語のみを含みます。オプション機能の一覧を下に示します。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1285
+#: doc/man/mkvmerge.xml:1310
msgid ""
"'BZ2' -- the bzlib compression "
"library. Affects the available compression methods for the オプションに指定できる圧縮メソッドに影響します。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1292
+#: doc/man/mkvmerge.xml:1317
msgid ""
"'LZO' -- the lzo compression "
"library. Affects the available compression methods for the オプションに指定できる圧縮メソッドに影響します。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1299
+#: doc/man/mkvmerge.xml:1324
msgid ""
"'FLAC' -- reading raw FLAC files and "
"handling FLAC tracks in other containers, e.g. "
@@ -3647,12 +3714,12 @@ msgstr ""
"FLACトラックの処理。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1328
+#: doc/man/mkvmerge.xml:1353
msgid "Usage"
msgstr "使用法"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1330
+#: doc/man/mkvmerge.xml:1355
msgid ""
"For each file the user can select which tracks &mkvmerge; should take. They "
"are all put into the file specified with . A list of "
@@ -3665,12 +3732,12 @@ msgstr ""
"プションで取得できます。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1336 doc/man/mkvpropedit.xml:340
+#: doc/man/mkvmerge.xml:1361 doc/man/mkvpropedit.xml:340
msgid "Examples"
msgstr "例"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1338
+#: doc/man/mkvmerge.xml:1363
msgid ""
"Let's assume you have a file called MyMovie.avi and the audio track in a "
"separate file, e.g. 'MyMovie.wav'. First you want to "
@@ -3681,24 +3748,24 @@ msgstr ""
"す。あなたは、まず音声を&oggvorbis;でエンコードしたいと思います。"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1342
+#: doc/man/mkvmerge.xml:1367
#, no-wrap
msgid "$ oggenc -q4 -oMyMovie.ogg MyMovie.wav"
msgstr "$ oggenc -q4 -oMyMovie.ogg MyMovie.wav"
#. type: Content of:
-#: doc/man/mkvmerge.xml:1345
+#: doc/man/mkvmerge.xml:1370
msgid "After a couple of minutes you can join video and audio:"
msgstr "数分後、ビデオとオーディオを結合できます。"
#. type: Content of: