GNU_texinfo: Update POT and ja.po files.

diff --git a/manual/GNU_texinfo/po4a/ja.po b/manual/GNU_texinfo/po4a/ja.po
index 669dedd..6a93d5a 100644 (file)
--- a/manual/GNU_texinfo/po4a/ja.po
+++ b/manual/GNU_texinfo/po4a/ja.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-06-03 03:14+0900\n"
-"PO-Revision-Date: 2012-06-03 04:06+0900\n"
+"POT-Creation-Date: 2012-06-03 05:11+0900\n"
+"PO-Revision-Date: 2012-06-03 05:15+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
-#: original/man1/info.1:2 original/man5/info.5:20
+#: original/man1/info.1:2 original/man5/info.5:30
 #, no-wrap
 msgid "INFO"
 msgstr "INFO"
@@ -24,21 +24,23 @@ msgstr "INFO"
 #. type: TH
 #: original/man1/info.1:2 original/man1/install-info.1:2
 #: original/man1/makeinfo.1:2 original/man1/texi2dvi.1:2
-#: original/man1/texindex.1:2
+#: original/man1/texindex.1:2 original/man1/infokey.1:2
+#: original/man1/pdftexi2dvi.1:2 original/man1/texi2pdf.1:2
 #, no-wrap
-msgid "February 2003"
-msgstr "February 2003"
+msgid "September 2008"
+msgstr "September 2008"
 
 #. type: TH
 #: original/man1/info.1:2
 #, no-wrap
-msgid "info 4.4"
-msgstr "info 4.4"
+msgid "info 4.13"
+msgstr "info 4.13"
 
 #. type: TH
 #: original/man1/info.1:2 original/man1/install-info.1:2
 #: original/man1/makeinfo.1:2 original/man1/texi2dvi.1:2
-#: original/man1/texindex.1:2
+#: original/man1/texindex.1:2 original/man1/infokey.1:2
+#: original/man1/pdftexi2dvi.1:2 original/man1/texi2pdf.1:2
 #, no-wrap
 msgid "User Commands"
 msgstr "User Commands"
@@ -46,8 +48,9 @@ msgstr "User Commands"
 #. type: SH
 #: original/man1/info.1:3 original/man1/install-info.1:3
 #: original/man1/makeinfo.1:3 original/man1/texi2dvi.1:3
-#: original/man1/texindex.1:3 original/man5/info.5:21
-#: original/man5/texinfo.5:21
+#: original/man1/texindex.1:3 original/man1/infokey.1:3
+#: original/man1/pdftexi2dvi.1:3 original/man1/texi2pdf.1:3
+#: original/man5/info.5:31 original/man5/texinfo.5:31
 #, no-wrap
 msgid "NAME"
 msgstr "名前"
@@ -60,7 +63,8 @@ msgstr "info - Info ドキュメントを読む"
 #. type: SH
 #: original/man1/info.1:5 original/man1/install-info.1:5
 #: original/man1/makeinfo.1:5 original/man1/texi2dvi.1:5
-#: original/man1/texindex.1:5
+#: original/man1/texindex.1:5 original/man1/infokey.1:5
+#: original/man1/pdftexi2dvi.1:5 original/man1/texi2pdf.1:5
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "書式"
@@ -73,8 +77,9 @@ msgstr "B<info> [I<OPTION>]... [I<MENU-ITEM>...]"
 #. type: SH
 #: original/man1/info.1:8 original/man1/install-info.1:8
 #: original/man1/makeinfo.1:8 original/man1/texi2dvi.1:8
-#: original/man1/texindex.1:8 original/man5/info.5:23
-#: original/man5/texinfo.5:23
+#: original/man1/texindex.1:8 original/man1/infokey.1:8
+#: original/man1/pdftexi2dvi.1:8 original/man1/texi2pdf.1:8
+#: original/man5/info.5:33 original/man5/texinfo.5:33
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "説明"
@@ -85,8 +90,8 @@ msgid "Read documentation in Info format."
 msgstr "Info フォーマットのドキュメントを読みます。"
 
 #. type: SH
-#: original/man1/info.1:10 original/man1/install-info.1:11
-#: original/man1/texindex.1:11
+#: original/man1/info.1:10 original/man1/install-info.1:10
+#: original/man1/texindex.1:11 original/man1/infokey.1:11
 #, no-wrap
 msgid "OPTIONS"
 msgstr "オプション"
@@ -94,8 +99,8 @@ msgstr "オプション"
 #. type: TP
 #: original/man1/info.1:11
 #, no-wrap
-msgid "B<--apropos>=I<STRING>"
-msgstr "B<--apropos>=I<STRING>"
+msgid "B<-k>, B<--apropos>=I<STRING>"
+msgstr "B<-k>, B<--apropos>=I<STRING>"
 
 #. type: Plain text
 #: original/man1/info.1:14
@@ -136,15 +141,16 @@ msgid "specify Info file to visit."
 msgstr "閲覧する Info ファイルを指定します。"
 
 #. type: TP
-#: original/man1/info.1:23 original/man1/texi2dvi.1:26
-#: original/man1/texindex.1:12
+#: original/man1/info.1:23 original/man1/texi2dvi.1:33
+#: original/man1/texindex.1:12 original/man1/pdftexi2dvi.1:33
+#: original/man1/texi2pdf.1:33
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
 
 #. type: Plain text
-#: original/man1/info.1:26 original/man1/install-info.1:31
-#: original/man1/makeinfo.1:21
+#: original/man1/info.1:26 original/man1/install-info.1:47
+#: original/man1/makeinfo.1:24 original/man1/infokey.1:18
 msgid "display this help and exit."
 msgstr "このヘルプメッセージを表示して終了します。"
 
@@ -189,68 +195,91 @@ msgstr "B<-R>, B<--raw-escapes>"
 
 #. type: Plain text
 #: original/man1/info.1:38
-msgid "don't remove ANSI escapes from man pages."
-msgstr "man ページから ANSI エスケープ文字を削除しません。"
+msgid "output \"raw\" ANSI escapes (default)."
+msgstr ""
 
 #. type: TP
 #: original/man1/info.1:38
 #, no-wrap
+msgid "B<--no-raw-escapes>"
+msgstr "B<--no-raw-escapes>"
+
+#. type: Plain text
+#: original/man1/info.1:41
+msgid "output escapes as literal text."
+msgstr ""
+
+#. type: TP
+#: original/man1/info.1:41
+#, no-wrap
 msgid "B<--restore>=I<FILENAME>"
 msgstr "B<--restore>=I<FILENAME>"
 
 #. type: Plain text
-#: original/man1/info.1:41
+#: original/man1/info.1:44
 msgid "read initial keystrokes from FILENAME."
 msgstr "最初のキー操作を FILENAME で指定したファイルから読み込みます。"
 
 #. type: TP
-#: original/man1/info.1:41
+#: original/man1/info.1:44
 #, no-wrap
 msgid "B<-O>, B<--show-options>, B<--usage>"
 msgstr "B<-O>, B<--show-options>, B<--usage>"
 
 #. type: Plain text
-#: original/man1/info.1:44
+#: original/man1/info.1:47
 msgid "go to command-line options node."
 msgstr "コマンドラインオプションの項目に移動します。"
 
 #. type: TP
-#: original/man1/info.1:44
+#: original/man1/info.1:47
 #, no-wrap
 msgid "B<--subnodes>"
 msgstr "B<--subnodes>"
 
 #. type: Plain text
-#: original/man1/info.1:47
+#: original/man1/info.1:50
 msgid "recursively output menu items."
 msgstr "すべての下の階層のメニューの項目を出力します。"
 
 #. type: TP
-#: original/man1/info.1:47
+#: original/man1/info.1:50
 #, no-wrap
 msgid "B<--vi-keys>"
 msgstr "B<--vi-keys>"
 
 #. type: Plain text
-#: original/man1/info.1:50
+#: original/man1/info.1:53
 msgid "use vi-like and less-like key bindings."
 msgstr "vi と less に似たキー割り当てを使用します。"
 
 #. type: TP
-#: original/man1/info.1:50 original/man1/install-info.1:55
-#: original/man1/makeinfo.1:33 original/man1/texindex.1:24
+#: original/man1/info.1:53 original/man1/install-info.1:101
+#: original/man1/makeinfo.1:33 original/man1/texindex.1:18
+#: original/man1/infokey.1:18
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: original/man1/info.1:53 original/man1/install-info.1:58
-#: original/man1/makeinfo.1:36
+#: original/man1/info.1:56 original/man1/install-info.1:104
+#: original/man1/makeinfo.1:36 original/man1/infokey.1:21
 msgid "display version information and exit."
 msgstr "バージョン情報を表示して終了します。"
 
+#. type: TP
+#: original/man1/info.1:56
+#, no-wrap
+msgid "B<-w>, B<--where>, B<--location>"
+msgstr "B<-w>, B<--where>, B<--location>"
+
 #. type: Plain text
 #: original/man1/info.1:59
+msgid "print physical location of Info file."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/info.1:65
 msgid ""
 "The first non-option argument, if present, is the menu entry to start from; "
 "it is searched for in all `dir' files along INFOPATH.  If it is not present, "
@@ -263,79 +292,119 @@ msgstr ""
 "した結果を表示します。 残りのすべての引数は、 最初に表示する項目を決めるメ"
 "ニュー項目に関連するものとして取り扱われます。"
 
+#. type: Plain text
+#: original/man1/info.1:67
+msgid "For a summary of key bindings, type h within Info."
+msgstr ""
+
 #. type: SH
-#: original/man1/info.1:59 original/man1/makeinfo.1:142
+#: original/man1/info.1:67 original/man1/makeinfo.1:176
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "使用例"
 
 #. type: TP
-#: original/man1/info.1:60
+#: original/man1/info.1:68
 #, no-wrap
 msgid "info"
 msgstr "info"
 
 #. type: Plain text
-#: original/man1/info.1:63
+#: original/man1/info.1:71
 msgid "show top-level dir menu"
 msgstr "トップレベルのディレクトリメニューを表示します"
 
 #. type: TP
-#: original/man1/info.1:63
+#: original/man1/info.1:71
+#, no-wrap
+msgid "info info"
+msgstr "info info"
+
+#. type: Plain text
+#: original/man1/info.1:74
+msgid "show the general manual for Info readers"
+msgstr ""
+
+#. type: TP
+#: original/man1/info.1:74
+#, no-wrap
+msgid "info info-stnd"
+msgstr "info info-stnd"
+
+#. type: Plain text
+#: original/man1/info.1:77
+msgid "show the manual specific to this Info program"
+msgstr ""
+
+#. type: TP
+#: original/man1/info.1:77
 #, no-wrap
 msgid "info emacs"
 msgstr "info emacs"
 
 #. type: Plain text
-#: original/man1/info.1:66
+#: original/man1/info.1:80
 msgid "start at emacs node from top-level dir"
 msgstr "最初にトップレベルのディレクトリの、emacs の項目を表示します"
 
 #. type: TP
-#: original/man1/info.1:66
+#: original/man1/info.1:80
 #, no-wrap
 msgid "info emacs buffers"
 msgstr "info emacs buffers"
 
 #. type: Plain text
-#: original/man1/info.1:69
+#: original/man1/info.1:83
 msgid "start at buffers node within emacs manual"
 msgstr "最初に emacs のマニュアルの、buffers の項目を表示します"
 
 #. type: TP
-#: original/man1/info.1:69
+#: original/man1/info.1:83
 #, no-wrap
 msgid "info B<--show-options> emacs"
 msgstr "info B<--show-options> emacs"
 
 #. type: Plain text
-#: original/man1/info.1:72
+#: original/man1/info.1:86
 msgid "start at node with emacs' command line options"
 msgstr "最初に emacs のコマンドラインオプションの項目を表示します"
 
 #. type: TP
-#: original/man1/info.1:72
+#: original/man1/info.1:86
+#, no-wrap
+msgid "info B<--subnodes> B<-o> out.txt emacs"
+msgstr "info B<--subnodes> B<-o> out.txt emacs"
+
+#. type: Plain text
+#: original/man1/info.1:89
+msgid "dump entire manual to out.txt"
+msgstr ""
+
+#. type: TP
+#: original/man1/info.1:89
 #, no-wrap
 msgid "info B<-f> ./foo.info"
 msgstr "info B<-f> ./foo.info"
 
 #. type: Plain text
-#: original/man1/info.1:75
+#: original/man1/info.1:92
 msgid "show file ./foo.info, not searching dir"
 msgstr "検索ディレクトリからではなく、ファイル ./foo.info を表示します"
 
 #. type: SH
-#: original/man1/info.1:75 original/man1/install-info.1:58
-#: original/man1/makeinfo.1:162 original/man1/texi2dvi.1:69
-#: original/man1/texindex.1:27 original/man5/info.5:52
-#: original/man5/texinfo.5:43
+#: original/man1/info.1:92 original/man1/install-info.1:104
+#: original/man1/makeinfo.1:201 original/man1/texi2dvi.1:166
+#: original/man1/texindex.1:21 original/man1/infokey.1:21
+#: original/man1/pdftexi2dvi.1:166 original/man1/texi2pdf.1:166
+#: original/man5/info.5:62 original/man5/texinfo.5:53
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr "バグ報告"
 
 #. type: Plain text
-#: original/man1/info.1:79 original/man1/install-info.1:62
-#: original/man1/makeinfo.1:166 original/man1/texindex.1:31
+#: original/man1/info.1:96 original/man1/install-info.1:108
+#: original/man1/makeinfo.1:205 original/man1/texindex.1:25
+#: original/man1/infokey.1:25
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org, general questions and discussion "
 "to help-texinfo@gnu.org.  Texinfo home page: http://www.gnu.org/software/"
@@ -346,27 +415,33 @@ msgstr ""
 "Texinfo のホームページは http://www.gnu.org/software/texinfo/ です。"
 
 #. type: SH
-#: original/man1/info.1:79 original/man1/install-info.1:62
-#: original/man1/makeinfo.1:166 original/man1/texi2dvi.1:73
-#: original/man1/texindex.1:31
+#: original/man1/info.1:96 original/man1/install-info.1:108
+#: original/man1/makeinfo.1:205 original/man1/texi2dvi.1:170
+#: original/man1/texindex.1:25 original/man1/infokey.1:25
+#: original/man1/pdftexi2dvi.1:170 original/man1/texi2pdf.1:170
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "著作権"
 
 #. type: Plain text
-#: original/man1/info.1:83 original/man1/install-info.1:67
-#: original/man1/makeinfo.1:171 original/man1/texi2dvi.1:78
-#: original/man1/texindex.1:36
+#: original/man1/info.1:99 original/man1/install-info.1:111
+#: original/man1/makeinfo.1:208 original/man1/texi2dvi.1:173
+#: original/man1/texindex.1:28 original/man1/infokey.1:28
+#: original/man1/pdftexi2dvi.1:173 original/man1/texi2pdf.1:173
+msgid ""
+"Copyright \\(co 2008 Free Software Foundation, Inc.  License GPLv3+: GNU GPL "
+"version 3 or later E<lt>http://gnu.org/licenses/gpl.htmlE<gt>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/info.1:101 original/man1/install-info.1:114
+#: original/man1/makeinfo.1:211 original/man1/texi2dvi.1:176
+#: original/man1/texindex.1:31 original/man1/infokey.1:31
+#: original/man1/pdftexi2dvi.1:176 original/man1/texi2pdf.1:176
 msgid ""
-"Copyright \\(co 2003 Free Software Foundation, Inc.  There is NO warranty.  "
-"You may redistribute this software under the terms of the GNU General Public "
-"License.  For more information about these matters, see the files named "
-"COPYING."
+"This is free software: you are free to change and redistribute it.  There is "
+"NO WARRANTY, to the extent permitted by law."
 msgstr ""
-"Copyright \\(co 2003 Free Software Foundation, Inc.  There is NO warranty.  "
-"You may redistribute this software under the terms of the GNU General Public "
-"License.  For more information about these matters, see the files named "
-"COPYING."
 
 #. type: TH
 #: original/man1/install-info.1:2
@@ -377,8 +452,8 @@ msgstr "INSTALL-INFO"
 #. type: TH
 #: original/man1/install-info.1:2
 #, no-wrap
-msgid "install-info 4.4"
-msgstr "install-info 4.4"
+msgid "install-info 4.13"
+msgstr "install-info 4.13"
 
 #. type: Plain text
 #: original/man1/install-info.1:5
@@ -391,22 +466,31 @@ msgid "B<install-info> [I<OPTION>]... [I<INFO-FILE >[I<DIR-FILE>]]"
 msgstr "B<install-info> [I<OPTION>]... [I<INFO-FILE >[I<DIR-FILE>]]"
 
 #. type: Plain text
-#: original/man1/install-info.1:11
-msgid ""
-"Install or delete dir entries from INFO-FILE in the Info directory file DIR-"
-"FILE."
+#: original/man1/install-info.1:10
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
 msgstr ""
-"Info ディレクトリファイル DIR-FILE に対し、 INFO-FILE 用のディレクトリエント"
-"リのインストールまたは削除を行います。"
+"Info ディレクトリ DIR-FILE に対し、 INFO-FILE のエントリの追加または削除を行"
+"います。"
+
+#. type: TP
+#: original/man1/install-info.1:11
+#, no-wrap
+msgid "B<--debug>"
+msgstr "B<--debug>"
+
+#. type: Plain text
+#: original/man1/install-info.1:14
+msgid "report what is being done."
+msgstr "現在何が行われているかを表示します。"
 
 #. type: TP
-#: original/man1/install-info.1:12
+#: original/man1/install-info.1:14
 #, no-wrap
 msgid "B<--delete>"
 msgstr "B<--delete>"
 
 #. type: Plain text
-#: original/man1/install-info.1:16
+#: original/man1/install-info.1:18
 msgid ""
 "delete existing entries for INFO-FILE from DIR-FILE; don't insert any new "
 "entries."
@@ -415,137 +499,274 @@ msgstr ""
 "なにも挿入しません。"
 
 #. type: TP
-#: original/man1/install-info.1:16
+#: original/man1/install-info.1:18
+#, no-wrap
+msgid "B<--description>=I<TEXT>"
+msgstr "B<--description>=I<TEXT>"
+
+#. type: Plain text
+#: original/man1/install-info.1:23
+msgid ""
+"the description of the entry is TEXT; used with the B<--name> option to "
+"become synonymous with the B<--entry> option."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:23
 #, no-wrap
 msgid "B<--dir-file>=I<NAME>"
 msgstr "B<--dir-file>=I<NAME>"
 
 #. type: Plain text
-#: original/man1/install-info.1:20
+#: original/man1/install-info.1:27
 msgid ""
-"specify file name of Info directory file.  This is equivalent to using the "
-"DIR-FILE argument."
+"specify file name of Info directory file; equivalent to using the DIR-FILE "
+"argument."
 msgstr ""
 "Info ディレクトリファイルのファイル名を指定します。 これは、DIR-FILE 引数を使"
 "用するのと等価です。"
 
 #. type: TP
-#: original/man1/install-info.1:20
+#: original/man1/install-info.1:27
+#, no-wrap
+msgid "B<--dry-run>"
+msgstr "B<--dry-run>"
+
+#. type: Plain text
+#: original/man1/install-info.1:30
+msgid "same as B<--test>."
+msgstr "B<--test> と同じです。"
+
+#. type: TP
+#: original/man1/install-info.1:30
 #, no-wrap
 msgid "B<--entry>=I<TEXT>"
 msgstr "B<--entry>=I<TEXT>"
 
 #. type: Plain text
-#: original/man1/install-info.1:28
+#: original/man1/install-info.1:35
+msgid ""
+"insert TEXT as an Info directory entry.  TEXT is written as an Info menu "
+"item line followed by zero or more extra lines starting with whitespace."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:39
+msgid ""
+"If you specify more than one entry, all are added.  If you don't specify any "
+"entries, they are determined from information in the Info file itself."
+msgstr ""
+"複数のエントリを指定した場合、全エントリが追加されます。エントリを指定しない"
+"場合、Info ファイル自身の中の情報から、エントリが決定されます。"
+
+#. type: Plain text
+#: original/man1/install-info.1:44
 msgid ""
-"insert TEXT as an Info directory entry.  TEXT should have the form of an "
-"Info menu item line plus zero or more extra lines starting with whitespace.  "
-"If you specify more than one entry, they are all added.  If you don't "
-"specify any entries, they are determined from information in the Info file "
-"itself."
+"When removing, TEXT specifies the entry to remove.  TEXT is only removed as "
+"a last resort, if the entry as determined from the Info file is not present, "
+"and the basename of the Info file isn't found either."
 msgstr ""
-"Info ディレクトリエントリとして、TEXT を挿入します。 TEXT の形式は、 Info メ"
-"ニュー項目行 1 行に加え、 空白から開始する追加行を 0 行以上です。 複数エント"
-"リを指定した場合、すべてが追加されます。 エントリをなにも指定しない場合、"
-"Info ファイル自身の中の情報から、 エントリが決定されます。"
 
 #. type: TP
-#: original/man1/install-info.1:28 original/man1/makeinfo.1:18
+#: original/man1/install-info.1:44 original/man1/makeinfo.1:21
+#: original/man1/infokey.1:15
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #. type: TP
-#: original/man1/install-info.1:31
+#: original/man1/install-info.1:47
+#, no-wrap
+msgid "B<--info-dir>=I<DIR>"
+msgstr "B<--info-dir>=I<DIR>"
+
+#. type: Plain text
+#: original/man1/install-info.1:50
+msgid "same as B<--dir-file>=I<DIR>/dir."
+msgstr "B<--dir-file>=I<DIR>/dir と同じです。"
+
+#. type: TP
+#: original/man1/install-info.1:50
 #, no-wrap
 msgid "B<--info-file>=I<FILE>"
 msgstr "B<--info-file>=I<FILE>"
 
 #. type: Plain text
-#: original/man1/install-info.1:35
+#: original/man1/install-info.1:54
 msgid ""
-"specify Info file to install in the directory.  This is equivalent to using "
-"the INFO-FILE argument."
+"specify Info file to install in the directory; equivalent to using the INFO-"
+"FILE argument."
 msgstr ""
 "ディレクトリにインストールする Info ファイルを指定します。 これは、INFO-FILE "
 "引数を指定するのと等価です。"
 
 #. type: TP
-#: original/man1/install-info.1:35
+#: original/man1/install-info.1:54
 #, no-wrap
-msgid "B<--info-dir>=I<DIR>"
-msgstr "B<--info-dir>=I<DIR>"
+msgid "B<--item>=I<TEXT>"
+msgstr "B<--item>=I<TEXT>"
 
 #. type: Plain text
-#: original/man1/install-info.1:38
-msgid "same as B<--dir-file>=I<DIR>/dir."
-msgstr "B<--dir-file>=I<DIR>/dir と同じです。"
+#: original/man1/install-info.1:57
+msgid "same as B<--entry>=I<TEXT>."
+msgstr "B<--entry>=I<TEXT> を同じです。"
 
 #. type: TP
-#: original/man1/install-info.1:38
+#: original/man1/install-info.1:57
 #, no-wrap
-msgid "B<--item>=I<TEXT>"
-msgstr "B<--item>=I<TEXT>"
+msgid "B<--keep-old>"
+msgstr "B<--keep-old>"
+
+#. type: Plain text
+#: original/man1/install-info.1:60
+msgid "do not replace entries, or remove empty sections."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:60
+#, no-wrap
+msgid "B<--menuentry>=I<TEXT>"
+msgstr "B<--menuentry>=I<TEXT>"
+
+#. type: Plain text
+#: original/man1/install-info.1:63
+msgid "same as B<--name>=I<TEXT>."
+msgstr "B<--name>=I<TEXT> と同じです。"
+
+#. type: TP
+#: original/man1/install-info.1:63
+#, no-wrap
+msgid "B<--name>=I<TEXT>"
+msgstr "B<--name>=I<TEXT>"
 
 #. type: Plain text
-#: original/man1/install-info.1:42
+#: original/man1/install-info.1:67
 msgid ""
-"same as B<--entry> TEXT.  An Info directory entry is actually a menu item."
+"the name of the entry is TEXT; used with B<--description> to become "
+"synonymous with the B<--entry> option."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:67
+#, no-wrap
+msgid "B<--no-indent>"
+msgstr "B<--no-indent>"
+
+#. type: Plain text
+#: original/man1/install-info.1:70
+msgid "do not format new entries in the DIR file."
 msgstr ""
-"B<--entry> TEXT と同じです。 Info ディレクトリエントリは、実際にメニュー項目"
-"です。"
 
 #. type: TP
-#: original/man1/install-info.1:42
+#: original/man1/install-info.1:70
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: original/man1/install-info.1:45
+#: original/man1/install-info.1:73 original/man1/install-info.1:98
 msgid "suppress warnings."
 msgstr "警告を抑制します。"
 
 #. type: TP
-#: original/man1/install-info.1:45
+#: original/man1/install-info.1:73
+#, no-wrap
+msgid "B<--regex>=I<R>"
+msgstr "B<--regex>=I<R>"
+
+#. type: Plain text
+#: original/man1/install-info.1:77
+msgid ""
+"put this file's entries in all sections that match the regular expression R "
+"(ignoring case)."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:77
 #, no-wrap
 msgid "B<--remove>"
 msgstr "B<--remove>"
 
 #. type: Plain text
-#: original/man1/install-info.1:48
+#: original/man1/install-info.1:80
 msgid "same as B<--delete>."
 msgstr "B<--delete> と同じです。"
 
 #. type: TP
-#: original/man1/install-info.1:48
+#: original/man1/install-info.1:80
+#, no-wrap
+msgid "B<--remove-exactly>"
+msgstr "B<--remove-exactly>"
+
+#. type: Plain text
+#: original/man1/install-info.1:84
+msgid ""
+"only remove if the info file name matches exactly; suffixes such as .info "
+"and .gz are not ignored."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:84
 #, no-wrap
 msgid "B<--section>=I<SEC>"
 msgstr "B<--section>=I<SEC>"
 
 #. type: Plain text
-#: original/man1/install-info.1:55
+#: original/man1/install-info.1:89
+msgid ""
+"put entries in section SEC of the directory.  If you specify more than one "
+"section, all the entries are added in each of the sections."
+msgstr ""
+"このファイルのエントリを、ディレクトリのセクション SEC に置きます。複数のセク"
+"ションを指定した場合、全エントリが各セクションに追加されます。"
+
+#. type: Plain text
+#: original/man1/install-info.1:92
 msgid ""
-"put this file's entries in section SEC of the directory.  If you specify "
-"more than one section, all the entries are added in each of the sections.  "
 "If you don't specify any sections, they are determined from information in "
 "the Info file itself."
 msgstr ""
-"このファイルのエントリを、ディレクトリのセクション SEC に置きます。 複数のセ"
-"クションを指定した場合、全セクションが各セクションに追加されます。 セクション"
-"を指定しない場合、Info ファイル自身の中の情報から、 セクションが決定されま"
-"す。"
+
+#. type: TP
+#: original/man1/install-info.1:92
+#, no-wrap
+msgid "B<--section> R SEC"
+msgstr "B<--section> R SEC"
+
+#. type: Plain text
+#: original/man1/install-info.1:95
+msgid "equivalent to B<--regex>=I<R> B<--section>=I<SEC> B<--add-once>."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:95
+#, no-wrap
+msgid "B<--silent>"
+msgstr "B<--silent>"
+
+#. type: TP
+#: original/man1/install-info.1:98
+#, no-wrap
+msgid "B<--test>"
+msgstr "B<--test>"
+
+#. type: Plain text
+#: original/man1/install-info.1:101
+msgid "suppress updating of DIR-FILE."
+msgstr ""
 
 #. type: SH
-#: original/man1/install-info.1:67 original/man1/makeinfo.1:171
-#: original/man1/texi2dvi.1:78 original/man1/texindex.1:36
-#: original/man5/info.5:55 original/man5/texinfo.5:46
+#: original/man1/install-info.1:114 original/man1/makeinfo.1:211
+#: original/man1/texi2dvi.1:176 original/man1/texindex.1:31
+#: original/man1/infokey.1:31 original/man1/pdftexi2dvi.1:176
+#: original/man1/texi2pdf.1:176 original/man5/info.5:65
+#: original/man5/texinfo.5:56
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
-#: original/man1/install-info.1:75
+#: original/man1/install-info.1:122
 msgid ""
 "The full documentation for B<install-info> is maintained as a Texinfo "
 "manual.  If the B<info> and B<install-info> programs are properly installed "
@@ -556,13 +777,15 @@ msgstr ""
 "ば、"
 
 #. type: Plain text
-#: original/man1/install-info.1:77
+#: original/man1/install-info.1:124
 msgid "B<info install-info>"
 msgstr "B<info install-info>"
 
 #. type: Plain text
-#: original/man1/install-info.1:78 original/man1/makeinfo.1:182
-#: original/man1/texi2dvi.1:89 original/man1/texindex.1:47
+#: original/man1/install-info.1:125 original/man1/makeinfo.1:222
+#: original/man1/texi2dvi.1:187 original/man1/texindex.1:42
+#: original/man1/infokey.1:42 original/man1/pdftexi2dvi.1:187
+#: original/man1/texi2pdf.1:187
 msgid "should give you access to the complete manual."
 msgstr "で、完全なマニュアルを読めるでしょう。"
 
@@ -575,8 +798,8 @@ msgstr "MAKEINFO"
 #. type: TH
 #: original/man1/makeinfo.1:2
 #, no-wrap
-msgid "makeinfo 4.4"
-msgstr "makeinfo 4.4"
+msgid "makeinfo 4.13"
+msgstr "makeinfo 4.13"
 
 #. type: Plain text
 #: original/man1/makeinfo.1:5
@@ -590,18 +813,17 @@ msgstr "B<makeinfo> [I<OPTION>]...I< TEXINFO-FILE>..."
 
 #. type: Plain text
 #: original/man1/makeinfo.1:11
-#, fuzzy
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default "
 "Info files suitable for reading online with Emacs or standalone GNU Info."
 msgstr ""
-"Texinfo で書かれたドキュメントを他のさまざまなフォーマットに変換します : "
-"Emacs またはスタンドアロンの GNU Info でオンラインに読むのに 適している Info "
-"ファイル (デフォルトではこれになります)、プレーンテキスト (B<--no-headers> を"
-"使用したとき)、あるいは HTML (B<--html> を使用したとき) です。"
+"Texinfo で書かれたドキュメントを他のさまざまなフォーマットに変換します。\n"
+"デフォルトでは、 Emacs や GNU Info コマンドでオンラインに読むのに適している "
+"Info ファイルに変換されます。"
 
 #. type: SS
-#: original/man1/makeinfo.1:11
+#: original/man1/makeinfo.1:11 original/man1/texi2dvi.1:26
+#: original/man1/pdftexi2dvi.1:26 original/man1/texi2pdf.1:26
 #, no-wrap
 msgid "General options:"
 msgstr "汎用オプション:"
@@ -620,48 +842,48 @@ msgstr "NUM 個のエラーが出ると終了します (デフォルトでは NU
 #. type: TP
 #: original/man1/makeinfo.1:15
 #, no-wrap
+msgid "B<--document-language>=I<STR> locale to use in translating Texinfo keywords"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:18
+msgid "for the output document (default C)."
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:18
+#, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:18
+#: original/man1/makeinfo.1:21
 msgid "preserve output even if errors."
 msgstr "エラーが起こっても出力を保持します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:21
+#: original/man1/makeinfo.1:24
 #, no-wrap
 msgid "B<--no-validate>"
 msgstr "B<--no-validate>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:24
+#: original/man1/makeinfo.1:27
 msgid "suppress node cross-reference validation."
 msgstr "ノードの相互参照の検証処理を省きます。"
 
 #. type: TP
-#: original/man1/makeinfo.1:24
+#: original/man1/makeinfo.1:27
 #, no-wrap
 msgid "B<--no-warn>"
 msgstr "B<--no-warn>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:27
+#: original/man1/makeinfo.1:30
 msgid "suppress warnings (but not errors)."
 msgstr "警告を出力しません (ただし、エラーは出力します)。"
 
 #. type: TP
-#: original/man1/makeinfo.1:27
-#, no-wrap
-msgid "B<--reference-limit>=I<NUM>"
-msgstr "B<--reference-limit>=I<NUM>"
-
-#. type: Plain text
-#: original/man1/makeinfo.1:30
-msgid "warn about at most NUM references (default 1000)."
-msgstr "NUM 個まで参照に関する警告を出します (デフォルトは 1000 です)。"
-
-#. type: TP
 #: original/man1/makeinfo.1:30
 #, no-wrap
 msgid "B<-v>, B<--verbose>"
@@ -686,8 +908,8 @@ msgstr "B<--docbook>"
 
 #. type: Plain text
 #: original/man1/makeinfo.1:40
-msgid "output DocBook XML rather than Info."
-msgstr "Info ã\83\95ã\82©ã\83¼ã\83\9eã\83\83ã\83\88ã\81§ã\81¯ã\81ªã\81\8fã\80\81 DocBook XML を出力します。"
+msgid "output Docbook XML rather than Info."
+msgstr "Info ã\81§ã\81¯ã\81ªã\81\8fã\80\81 Docbook XML を出力します。"
 
 #. type: TP
 #: original/man1/makeinfo.1:40
@@ -698,7 +920,7 @@ msgstr "B<--html>"
 #. type: Plain text
 #: original/man1/makeinfo.1:43
 msgid "output HTML rather than Info."
-msgstr "Info ã\83\95ã\82©ã\83¼ã\83\9eã\83\83ã\83\88ã\81§ã\81¯ã\81ªã\81\8fã\80\81HTML ã\82\92å\87ºå\8a\9bã\81\97ã\81¾ã\81\99ã\80\82"
+msgstr "Info ではなく、HTML を出力します。"
 
 #. type: TP
 #: original/man1/makeinfo.1:43
@@ -709,142 +931,155 @@ msgstr "B<--xml>"
 #. type: Plain text
 #: original/man1/makeinfo.1:46
 msgid "output Texinfo XML rather than Info."
-msgstr "Info ã\83\95ã\82©ã\83¼ã\83\9eã\83\83ã\83\88ã\81§ã\81¯ã\81ªã\81\8fã\80\81 Texinfo XML ã\82\92å\87ºå\8a\9bã\81\97ã\81¾ã\81\99ã\80\82"
+msgstr "Info ではなく、 Texinfo XML を出力します。"
 
-#. type: SS
+#. type: TP
 #: original/man1/makeinfo.1:46
 #, no-wrap
+msgid "B<--plaintext>"
+msgstr "B<--plaintext>"
+
+#. type: Plain text
+#: original/man1/makeinfo.1:49
+msgid "output plain text rather than Info."
+msgstr "Info ではなく、 プレーンテキストを出力します。"
+
+#. type: SS
+#: original/man1/makeinfo.1:49
+#, no-wrap
 msgid "General output options:"
 msgstr "汎用的な出力オプション:"
 
 #. type: TP
-#: original/man1/makeinfo.1:47
+#: original/man1/makeinfo.1:50
 #, no-wrap
-msgid "B<-E>, B<--macro-expand> FILE"
-msgstr "B<-E>, B<--macro-expand> FILE"
+msgid "B<-E>, B<--macro-expand>=I<FILE>"
+msgstr "B<-E>, B<--macro-expand>=I<FILE>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:51
-#, fuzzy
-msgid "output macro-expanded source to FILE.  ignoring any @setfilename."
-msgstr "マクロを展開したソースを FILE に出力します。"
+#: original/man1/makeinfo.1:54
+msgid "output macro-expanded source to FILE, ignoring any @setfilename."
+msgstr ""
+"マクロを展開したソースを FILE に出力します。\n"
+"@setfilename は無視されます。"
 
 #. type: TP
-#: original/man1/makeinfo.1:51
+#: original/man1/makeinfo.1:54
 #, no-wrap
 msgid "B<--no-headers>"
 msgstr "B<--no-headers>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:57
-#, fuzzy
+#: original/man1/makeinfo.1:60
 msgid ""
 "suppress node separators, Node: lines, and menus from Info output (thus "
 "producing plain text)  or from HTML (thus producing shorter output); also, "
 "write to standard output by default."
 msgstr ""
-"Info のノードセパレータおよび Node: 行を省き、標準出力に B<--output> オプショ"
-"ンを付けないものを出力します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:57
+#: original/man1/makeinfo.1:60
 #, no-wrap
 msgid "B<--no-split>"
 msgstr "B<--no-split>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:61
-#, fuzzy
+#: original/man1/makeinfo.1:64
 msgid ""
-"suppress splitting of Info or HTML output, generate only one output file."
-msgstr ""
-"Info フォーマットの出力が大きいときに分割したり、ノード毎に HTML ファイルを作"
-"成したりするのをやめます。"
+"suppress the splitting of Info or HTML output, generate only one output file."
+msgstr "Info や HTML を出力する際に分割を行わず、一つのファイルに出力します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:61
+#: original/man1/makeinfo.1:64
 #, no-wrap
 msgid "B<--number-sections>"
 msgstr "B<--number-sections>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:64
+#: original/man1/makeinfo.1:67
 msgid "output chapter and sectioning numbers."
 msgstr "出力に章、セクションなどの番号を含むようにします。"
 
 #. type: TP
-#: original/man1/makeinfo.1:64
+#: original/man1/makeinfo.1:67
 #, no-wrap
 msgid "B<-o>, B<--output>=I<FILE>"
 msgstr "B<-o>, B<--output>=I<FILE>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:67
-#, fuzzy
-msgid "output to FILE (directory if split HTML),"
-msgstr "FILE に出力します。@setfilename は無視します。"
+#: original/man1/makeinfo.1:70
+msgid "output to FILE (or directory if split HTML)."
+msgstr ""
+"FILE に出力します (HTML 出力で分割が行われる場合はディレクトリの指定になりま"
+"す)。"
 
 #. type: SS
-#: original/man1/makeinfo.1:67
+#: original/man1/makeinfo.1:70
 #, no-wrap
 msgid "Options for Info and plain text:"
 msgstr "Info とプレーンテキストに関するオプション:"
 
 #. type: TP
-#: original/man1/makeinfo.1:68
+#: original/man1/makeinfo.1:71
 #, no-wrap
-msgid "B<--enable-encoding>"
-msgstr "B<--enable-encoding>"
+msgid "B<--disable-encoding>"
+msgstr "B<--disable-encoding>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:72
+#: original/man1/makeinfo.1:75
 msgid ""
-"output accented and special characters in Info output based on "
+"do not output accented and special characters in Info output based on "
 "@documentencoding."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:72
+#: original/man1/makeinfo.1:75
+#, no-wrap
+msgid "B<--enable-encoding>"
+msgstr "B<--enable-encoding>"
+
+#. type: Plain text
+#: original/man1/makeinfo.1:78
+msgid "override B<--disable-encoding> (default)."
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:78
 #, no-wrap
 msgid "B<--fill-column>=I<NUM>"
 msgstr "B<--fill-column>=I<NUM>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:75
+#: original/man1/makeinfo.1:81
 msgid "break Info lines at NUM characters (default 72)."
 msgstr ""
 "Info ファイルの行を NUM 文字目で折り返します (デフォルトでは 72 です)。"
 
 #. type: TP
-#: original/man1/makeinfo.1:75
+#: original/man1/makeinfo.1:81
 #, no-wrap
 msgid "B<--footnote-style>=I<STYLE>"
 msgstr "B<--footnote-style>=I<STYLE>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:80
-#, fuzzy
+#: original/man1/makeinfo.1:87
 msgid ""
 "output footnotes in Info according to STYLE: `separate' to put them in their "
-"own node; `end' to put them at the end of the node"
-msgstr "STYLE に従った脚注を出力します :"
-
-#. type: Plain text
-#: original/man1/makeinfo.1:82
-#, fuzzy
-msgid "in which they are defined (default)."
+"own node; `end' to put them at the end of the node, in which they are "
+"defined (this is the default)."
 msgstr ""
-"`separate' は、そのノード自身の中に脚注を置きます。 `end' は、脚注が定義され"
-"ているノードの末尾に脚注を置きます (これがデフォルトです)。"
+"Info の脚注を STYLE に従って出力します。 `separate' は脚注用のノードに脚注を"
+"置きます。 `end' は脚注が定義されたノードの末尾に脚注を置きます (デフォルト"
+"は `end' です)。"
 
 #. type: TP
-#: original/man1/makeinfo.1:82
+#: original/man1/makeinfo.1:87
 #, no-wrap
 msgid "B<--paragraph-indent>=I<VAL>"
 msgstr "B<--paragraph-indent>=I<VAL>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:87
+#: original/man1/makeinfo.1:92
 msgid ""
 "indent Info paragraphs by VAL spaces (default 3).  If VAL is `none', do not "
 "indent; if VAL is `asis', preserve existing indentation."
@@ -854,282 +1089,400 @@ msgstr ""
 "する字下げ処理を保持します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:87
+#: original/man1/makeinfo.1:92
 #, no-wrap
 msgid "B<--split-size>=I<NUM>"
 msgstr "B<--split-size>=I<NUM>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:90
-msgid "split Info files at size NUM (default 50000)."
+#: original/man1/makeinfo.1:95
+msgid "split Info files at size NUM (default 300000)."
 msgstr ""
 
 #. type: SS
-#: original/man1/makeinfo.1:90
+#: original/man1/makeinfo.1:95
 #, no-wrap
-msgid "Input file options:"
-msgstr "入力ファイルオプション:"
+msgid "Options for HTML:"
+msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:91
+#: original/man1/makeinfo.1:96
 #, no-wrap
-msgid "B<--commands-in-node-names>"
-msgstr "B<--commands-in-node-names>"
+msgid "B<--css-include>=I<FILE>"
+msgstr "B<--css-include>=I<FILE>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:94
-msgid "allow @ commands in node names."
-msgstr "ノード名に @ コマンドを許可します。"
+#: original/man1/makeinfo.1:100
+msgid "include FILE in HTML E<lt>styleE<gt> output; read stdin if FILE is -."
+msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:94
+#: original/man1/makeinfo.1:100
 #, no-wrap
-msgid "B<-D> VAR"
-msgstr "B<-D> VAR"
+msgid "B<--css-ref>=I<URL>"
+msgstr "B<--css-ref>=I<URL>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:97
-msgid "define the variable VAR, as with @set."
-msgstr "変数 VAR を定義します。@set を使用した場合と同様です。"
+#: original/man1/makeinfo.1:103
+msgid "generate reference to a CSS file."
+msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:97 original/man1/texi2dvi.1:52
+#: original/man1/makeinfo.1:103
 #, no-wrap
-msgid "B<-I> DIR"
-msgstr "B<-I> DIR"
+msgid "B<--internal-links>=I<FILE>"
+msgstr "B<--internal-links>=I<FILE>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:100
-msgid "append DIR to the @include search path."
-msgstr "DIR を @include のサーチパスに加えます。"
+#: original/man1/makeinfo.1:106
+msgid "produce list of internal links in FILE."
+msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:100
+#: original/man1/makeinfo.1:106
 #, no-wrap
-msgid "B<-P> DIR"
-msgstr "B<-P> DIR"
+msgid "B<--transliterate-file-names>"
+msgstr "B<--transliterate-file-names>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:103
-msgid "prepend DIR to the @include search path."
+#: original/man1/makeinfo.1:109
+msgid "produce file names in ASCII transliteration."
+msgstr ""
+
+#. type: SS
+#: original/man1/makeinfo.1:109
+#, no-wrap
+msgid "Options for XML and Docbook:"
+msgstr "XML と Docbook に関するオプション:"
+
+#. type: TP
+#: original/man1/makeinfo.1:110
+#, no-wrap
+msgid "B<--output-indent>=I<VAL>"
+msgstr "B<--output-indent>=I<VAL>"
+
+#. type: Plain text
+#: original/man1/makeinfo.1:114
+msgid ""
+"indent XML elements by VAL spaces (default 2).  If VAL is 0, ignorable "
+"whitespace is dropped."
+msgstr ""
+
+#. type: SS
+#: original/man1/makeinfo.1:114
+#, no-wrap
+msgid "Input file options:"
+msgstr "入力ファイルオプション:"
+
+#. type: TP
+#: original/man1/makeinfo.1:115
+#, no-wrap
+msgid "B<--commands-in-node-names>"
+msgstr "B<--commands-in-node-names>"
+
+#. type: Plain text
+#: original/man1/makeinfo.1:118
+msgid "allow @ commands in node names."
+msgstr "ノード名に @ コマンドを許可します。"
+
+#. type: TP
+#: original/man1/makeinfo.1:118
+#, no-wrap
+msgid "B<-D> VAR"
+msgstr "B<-D> VAR"
+
+#. type: Plain text
+#: original/man1/makeinfo.1:121
+msgid "define the variable VAR, as with @set."
+msgstr "変数 VAR を定義します。@set を使用した場合と同様です。"
+
+#. type: TP
+#: original/man1/makeinfo.1:121 original/man1/texi2dvi.1:65
+#: original/man1/pdftexi2dvi.1:65 original/man1/texi2pdf.1:65
+#, no-wrap
+msgid "B<-I> DIR"
+msgstr "B<-I> DIR"
+
+#. type: Plain text
+#: original/man1/makeinfo.1:124
+msgid "append DIR to the @include search path."
+msgstr "DIR を @include のサーチパスに加えます。"
+
+#. type: TP
+#: original/man1/makeinfo.1:124
+#, no-wrap
+msgid "B<-P> DIR"
+msgstr "B<-P> DIR"
+
+#. type: Plain text
+#: original/man1/makeinfo.1:127
+msgid "prepend DIR to the @include search path."
 msgstr "DIR を @include のサーチパスの先頭に置きます。"
 
 #. type: TP
-#: original/man1/makeinfo.1:103
+#: original/man1/makeinfo.1:127
 #, no-wrap
 msgid "B<-U> VAR"
 msgstr "B<-U> VAR"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:106
+#: original/man1/makeinfo.1:130
 msgid "undefine the variable VAR, as with @clear."
 msgstr "変数 VAR の定義を無効にします。@clear を使用した場合と同じです。"
 
 #. type: SS
-#: original/man1/makeinfo.1:106
+#: original/man1/makeinfo.1:130
 #, no-wrap
 msgid "Conditional processing in input:"
 msgstr "入力の条件付き処理:"
 
 #. type: TP
-#: original/man1/makeinfo.1:107
+#: original/man1/makeinfo.1:131
+#, no-wrap
+msgid "B<--ifdocbook>"
+msgstr "B<--ifdocbook>"
+
+#. type: Plain text
+#: original/man1/makeinfo.1:135
+msgid "process @ifdocbook and @docbook even if not generating Docbook."
+msgstr "Docbook を生成しないときでも、@ifdocbook と @docbook を処理します。"
+
+#. type: TP
+#: original/man1/makeinfo.1:135
 #, no-wrap
 msgid "B<--ifhtml>"
 msgstr "B<--ifhtml>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:110
+#: original/man1/makeinfo.1:138
 msgid "process @ifhtml and @html even if not generating HTML."
-msgstr ""
-"HTML を生成しないときでも、@ifhtml および @html テキストを 処理します。"
+msgstr "HTML を生成しないときでも、@ifhtml および @html を処理します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:110
+#: original/man1/makeinfo.1:138
 #, no-wrap
 msgid "B<--ifinfo>"
 msgstr "B<--ifinfo>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:113
+#: original/man1/makeinfo.1:141
 msgid "process @ifinfo even if not generating Info."
 msgstr "HTML を生成しないときでも、@ifinfo テキストを処理します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:113
+#: original/man1/makeinfo.1:141
 #, no-wrap
 msgid "B<--ifplaintext>"
 msgstr "B<--ifplaintext>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:116
+#: original/man1/makeinfo.1:144
 msgid "process @ifplaintext even if not generating plain text."
 msgstr "プレーンテキストを生成しないときでも、@ifplaintext を処理します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:116
+#: original/man1/makeinfo.1:144
 #, no-wrap
 msgid "B<--iftex>"
 msgstr "B<--iftex>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:119
+#: original/man1/makeinfo.1:147
 msgid "process @iftex and @tex; implies B<--no-split>."
 msgstr ""
 "@iftex および @tex を処理します。 B<--no-split> オプションを暗に含んでいま"
 "す。"
 
 #. type: TP
-#: original/man1/makeinfo.1:119
+#: original/man1/makeinfo.1:147
 #, no-wrap
 msgid "B<--ifxml>"
 msgstr "B<--ifxml>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:122
+#: original/man1/makeinfo.1:150
 msgid "process @ifxml and @xml."
 msgstr "@ifxml と @xml を処理します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:122
+#: original/man1/makeinfo.1:150
+#, no-wrap
+msgid "B<--no-ifdocbook>"
+msgstr "B<--no-ifdocbook>"
+
+#. type: Plain text
+#: original/man1/makeinfo.1:153
+msgid "do not process @ifdocbook and @docbook text."
+msgstr "@ifdocbook および @docbook テキストを処理しません。"
+
+#. type: TP
+#: original/man1/makeinfo.1:153
 #, no-wrap
 msgid "B<--no-ifhtml>"
 msgstr "B<--no-ifhtml>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:125
+#: original/man1/makeinfo.1:156
 msgid "do not process @ifhtml and @html text."
 msgstr "@ifhtml および @html テキストを処理しません。"
 
 #. type: TP
-#: original/man1/makeinfo.1:125
+#: original/man1/makeinfo.1:156
 #, no-wrap
 msgid "B<--no-ifinfo>"
 msgstr "B<--no-ifinfo>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:128
+#: original/man1/makeinfo.1:159
 msgid "do not process @ifinfo text."
 msgstr "@ifinfo テキストを処理しません。"
 
 #. type: TP
-#: original/man1/makeinfo.1:128
+#: original/man1/makeinfo.1:159
 #, no-wrap
 msgid "B<--no-ifplaintext>"
 msgstr "B<--no-ifplaintext>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:131
+#: original/man1/makeinfo.1:162
 msgid "do not process @ifplaintext text."
 msgstr "@ifplaintext テキストを処理しません。"
 
 #. type: TP
-#: original/man1/makeinfo.1:131
+#: original/man1/makeinfo.1:162
 #, no-wrap
 msgid "B<--no-iftex>"
 msgstr "B<--no-iftex>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:134
+#: original/man1/makeinfo.1:165
 msgid "do not process @iftex and @tex text."
 msgstr "@iftex および @tex テキストを処理しません。"
 
 #. type: TP
-#: original/man1/makeinfo.1:134
+#: original/man1/makeinfo.1:165
 #, no-wrap
 msgid "B<--no-ifxml>"
 msgstr "B<--no-ifxml>"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:137
+#: original/man1/makeinfo.1:168
 msgid "do not process @ifxml and @xml text."
 msgstr "@ifxml および @xml テキストを処理しません。"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:142
+#: original/man1/makeinfo.1:170
+msgid "Also, for the B<--no-ifFORMAT> options, do process @ifnotFORMAT text."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:176
 msgid ""
 "The defaults for the @if... conditionals depend on the output format: if "
 "generating HTML, B<--ifhtml> is on and the others are off; if generating "
 "Info, B<--ifinfo> is on and the others are off; if generating plain text, "
-"B<--ifplaintext> is on and the others are off;"
+"B<--ifplaintext> is on and the others are off; if generating XML, B<--ifxml> "
+"is on and the others are off."
 msgstr ""
 "@if... 条件文に対するデフォルトの動作は、出力フォーマットに依存します : HTML "
 "を生成する場合、B<--ifhtml> がオンになり、他はオフになります。 Info ファイル"
 "やプレーンテキストのファイルを生成する場合、B<--ifinfo> が オンになり、他はオ"
-"フになります。"
+"フになります。XML を生成する場合、 B<--ifxml> がオンになり、他はオフになりま"
+"す。"
 
 #. type: TP
-#: original/man1/makeinfo.1:143
+#: original/man1/makeinfo.1:177
 #, no-wrap
 msgid "makeinfo foo.texi"
 msgstr "makeinfo foo.texi"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:146
+#: original/man1/makeinfo.1:180
 msgid "write Info to foo's @setfilename"
 msgstr ""
 "Info ファイルを foo の @setfilename で定義されているファイルへ書き出します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:146
+#: original/man1/makeinfo.1:180
 #, no-wrap
 msgid "makeinfo B<--html> foo.texi"
 msgstr "makeinfo B<--html> foo.texi"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:149
+#: original/man1/makeinfo.1:183
 msgid "write HTML to @setfilename"
 msgstr "HTML ファイルを @setfilename で定義されているファイルへ書き出します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:149
+#: original/man1/makeinfo.1:183
 #, no-wrap
 msgid "makeinfo B<--xml> foo.texi"
 msgstr "makeinfo B<--xml> foo.texi"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:152
+#: original/man1/makeinfo.1:186
 msgid "write Texinfo XML to @setfilename"
 msgstr ""
 "Texinfo XML ファイルを @setfilename で定義されているファイルへ書き出します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:152
+#: original/man1/makeinfo.1:186
 #, no-wrap
 msgid "makeinfo B<--docbook> foo.texi"
 msgstr "makeinfo B<--docbook> foo.texi"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:155
+#: original/man1/makeinfo.1:189
 msgid "write DocBook XML to @setfilename"
 msgstr ""
 "DocBook XML ファイルを @setfilename で定義されているファイルへ書き出します。"
 
 #. type: TP
-#: original/man1/makeinfo.1:155
+#: original/man1/makeinfo.1:189
 #, no-wrap
 msgid "makeinfo B<--no-headers> foo.texi"
 msgstr "makeinfo B<--no-headers> foo.texi"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:158
+#: original/man1/makeinfo.1:192
 msgid "write plain text to standard output"
 msgstr "プレーンテキストを標準出力に書き出します。"
 
+#. type: TP
+#: original/man1/makeinfo.1:192
+#, no-wrap
+msgid "makeinfo B<--html> B<--no-headers> foo.texi"
+msgstr "makeinfo B<--html> B<--no-headers> foo.texi"
+
 #. type: Plain text
-#: original/man1/makeinfo.1:162
-#, fuzzy
-msgid ""
-"makeinfo B<--html> B<--no-headers> foo.texi write html without node lines, "
-"menus makeinfo B<--number-sections> foo.texi write Info with numbered "
-"sections makeinfo B<--no-split> foo.texi write one Info file however big"
+#: original/man1/makeinfo.1:195
+msgid "write html without node lines, menus"
 msgstr ""
-"makeinfo B<--html> B<--no-headers> foo.texi write html without node lines, "
-"menus makeinfo B<--number-sections> foo.texi 番号づけした章を付けた Info ファ"
-"イルを書き出します。 makeinfo B<--no-split> foo.texi Info ファイルを 1 つだけ"
-"書き出します。大きいかもしれませんが。"
+
+#. type: TP
+#: original/man1/makeinfo.1:195
+#, no-wrap
+msgid "makeinfo B<--number-sections> foo.texi"
+msgstr "makeinfo B<--number-sections> foo.texi"
+
+#. type: Plain text
+#: original/man1/makeinfo.1:198
+msgid "write Info with numbered sections"
+msgstr "番号付けした章を付けた Info ファイルを書き出します。"
+
+#. type: TP
+#: original/man1/makeinfo.1:198
+#, no-wrap
+msgid "makeinfo B<--no-split> foo.texi"
+msgstr "makeinfo B<--no-split> foo.texi"
+
+#. type: Plain text
+#: original/man1/makeinfo.1:201
+msgid "write one Info file however big"
+msgstr "Info ファイルを 1 つだけ書き出します。大きいかもしれませんが。"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:179
+#: original/man1/makeinfo.1:219
 msgid ""
 "The full documentation for B<makeinfo> is maintained as a Texinfo manual.  "
 "If the B<info> and B<makeinfo> programs are properly installed at your site, "
@@ -1140,48 +1493,89 @@ msgstr ""
 "ていれば、"
 
 #. type: Plain text
-#: original/man1/makeinfo.1:181
+#: original/man1/makeinfo.1:221
 msgid "B<info makeinfo>"
 msgstr "B<info makeinfo>"
 
 #. type: TH
-#: original/man1/texi2dvi.1:2
+#: original/man1/texi2dvi.1:2 original/man1/pdftexi2dvi.1:2
+#: original/man1/texi2pdf.1:2
 #, no-wrap
 msgid "TEXI2DVI"
 msgstr "TEXI2DVI"
 
 #. type: TH
-#: original/man1/texi2dvi.1:2
+#: original/man1/texi2dvi.1:2 original/man1/pdftexi2dvi.1:2
+#: original/man1/texi2pdf.1:2
 #, no-wrap
-msgid "texi2dvi 1.14"
-msgstr "texi2dvi 1.14"
+msgid "texi2dvi 1.135"
+msgstr "texi2dvi 1.135"
 
 #. type: Plain text
 #: original/man1/texi2dvi.1:5
-msgid "texi2dvi - print Texinfo documents"
-msgstr "texi2dvi - Texinfo ドキュメントを印刷する"
+msgid "texi2dvi - convert Texinfo documents to DVI"
+msgstr "texi2dvi - Texinfo ドキュメントを DVI に変換する"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:8
+#: original/man1/texi2dvi.1:8 original/man1/pdftexi2dvi.1:8
+#: original/man1/texi2pdf.1:8
 msgid "B<texi2dvi> [I<OPTION>]... I<FILE>..."
 msgstr "B<texi2dvi> [I<option>]...I< FILE>..."
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:13
+#: original/man1/texi2dvi.1:14 original/man1/pdftexi2dvi.1:14
+#: original/man1/texi2pdf.1:14
 msgid ""
-"Run each Texinfo or LaTeX FILE through TeX in turn until all cross-"
+"Run each Texinfo or (La)TeX FILE through TeX in turn until all cross-"
 "references are resolved, building all indices.  The directory containing "
 "each FILE is searched for included files.  The suffix of FILE is used to "
-"determine its language (LaTeX or Texinfo)."
+"determine its language ((La)TeX or Texinfo).  To process (e)plain TeX files, "
+"set the environment variable LATEX=tex."
+msgstr ""
+"全ての相互参照が解決され、全ての索引を作られるまで、各 Texinfo または (La)"
+"TeX FILE を TeX に順番に通す。各ファイルを含んでいるディレクトリは、インク"
+"ルードされるファイルは、各々のファイルが置かれているディレクトリーで検索され"
+"る。ファイルの拡張子は、その言語 ((La)TeX または Texinfo) を決定するために使"
+"われる。素の TeX ファイルを処理する場合には環境変数を LATEX=tex に設定して下"
+"さい。"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:17 original/man1/pdftexi2dvi.1:17
+#: original/man1/texi2pdf.1:17
+msgid ""
+"In order to make texi2dvi a drop-in replacement of TeX/LaTeX in AUC-TeX, the "
+"FILE may also be composed of the following simple TeX commands."
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:17 original/man1/pdftexi2dvi.1:17
+#: original/man1/texi2pdf.1:17
+#, no-wrap
+msgid "`\\einput{FILE}'"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:20 original/man1/pdftexi2dvi.1:20
+#: original/man1/texi2pdf.1:20
+msgid "the actual file to compile"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:20 original/man1/pdftexi2dvi.1:20
+#: original/man1/texi2pdf.1:20
+#, no-wrap
+msgid "`\\enonstopmode'"
 msgstr ""
-"全ての相互参照が解決され、全ての索引を作られるまで、各 Texinfo または LaTeX "
-"FILE を TeX に順番に通す。 各ファイルを含んでいるディレクトリは、 インクルー"
-"ドされるファイルは、各々のファイルが置かれている ディレクトリーで検索され"
-"る。 ファイルの拡張子は、その言語 (LaTeX または Texinfo) を決定するために使 "
-"われる。"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:16
+#: original/man1/texi2dvi.1:23 original/man1/pdftexi2dvi.1:23
+#: original/man1/texi2pdf.1:23
+msgid "same as B<--batch>"
+msgstr "B<--batch> と同じ。"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:26 original/man1/pdftexi2dvi.1:26
+#: original/man1/texi2pdf.1:26
 msgid ""
 "Makeinfo is used to perform Texinfo macro expansion before running TeX when "
 "needed."
@@ -1189,192 +1583,519 @@ msgstr ""
 "必要ならば、TeX を実行する前に Texinfo マクロの展開を実行するために makeinfo "
 "が使われる。"
 
-#. type: SS
-#: original/man1/texi2dvi.1:16
-#, no-wrap
-msgid "Operation modes:"
-msgstr "動作モード:"
-
 #. type: TP
-#: original/man1/texi2dvi.1:17
+#: original/man1/texi2dvi.1:27 original/man1/pdftexi2dvi.1:27
+#: original/man1/texi2pdf.1:27
 #, no-wrap
 msgid "B<-b>, B<--batch>"
 msgstr "B<-b>, B<--batch>"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:20
+#: original/man1/texi2dvi.1:30 original/man1/pdftexi2dvi.1:30
+#: original/man1/texi2pdf.1:30
 msgid "no interaction"
 msgstr "(ユーザーとの) インタラクションをしない。"
 
 #. type: TP
-#: original/man1/texi2dvi.1:20
-#, no-wrap
-msgid "B<-c>, B<--clean>"
-msgstr "B<-c>, B<--clean>"
-
-#. type: Plain text
-#: original/man1/texi2dvi.1:23
-msgid "remove all auxiliary files"
-msgstr "全ての補助ファイルを削除する。"
-
-#. type: TP
-#: original/man1/texi2dvi.1:23
+#: original/man1/texi2dvi.1:30 original/man1/pdftexi2dvi.1:30
+#: original/man1/texi2pdf.1:30
 #, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr "B<-D>, B<--debug>"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:26
+#: original/man1/texi2dvi.1:33 original/man1/pdftexi2dvi.1:33
+#: original/man1/texi2pdf.1:33
 msgid "turn on shell debugging (set B<-x>)"
 msgstr "シェルのデバックを有効にする (B<-x> を設定する)。"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:29
+#: original/man1/texi2dvi.1:36 original/man1/pdftexi2dvi.1:36
+#: original/man1/texi2pdf.1:36
 msgid "display this help and exit successfully"
 msgstr "このヘルプを表示し、正常終了する。"
 
 #. type: TP
-#: original/man1/texi2dvi.1:29
+#: original/man1/texi2dvi.1:36 original/man1/pdftexi2dvi.1:36
+#: original/man1/texi2pdf.1:36
 #, no-wrap
 msgid "B<-o>, B<--output>=I<OFILE>"
 msgstr "B<-o>, B<--output>=I<OFILE>"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:33
+#: original/man1/texi2dvi.1:40 original/man1/pdftexi2dvi.1:40
+#: original/man1/texi2pdf.1:40
 msgid ""
-"leave output in OFILE (implies B<--clean>); Only one input FILE may be "
+"leave output in OFILE (implies B<--clean>); only one input FILE may be "
 "specified in this case"
 msgstr ""
 "出力を OFILE に書き出します (B<--clean> が暗黙で指定されます)。このオプション"
 "を指定した場合は、入力ファイル FILE は一つしか指定できません。"
 
 #. type: TP
-#: original/man1/texi2dvi.1:33
+#: original/man1/texi2dvi.1:40 original/man1/pdftexi2dvi.1:40
+#: original/man1/texi2pdf.1:40
 #, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>, B<--quiet>"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:36
+#: original/man1/texi2dvi.1:43 original/man1/pdftexi2dvi.1:43
+#: original/man1/texi2pdf.1:43
 msgid "no output unless errors (implies B<--batch>)"
 msgstr "エラーが出るまで出力しない (暗黙のうちに B<--batch> が設定される )。"
 
 #. type: TP
-#: original/man1/texi2dvi.1:36
+#: original/man1/texi2dvi.1:43 original/man1/pdftexi2dvi.1:43
+#: original/man1/texi2pdf.1:43
 #, no-wrap
 msgid "B<-s>, B<--silent>"
 msgstr "B<-s>, B<--silent>"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:39
+#: original/man1/texi2dvi.1:46 original/man1/pdftexi2dvi.1:46
+#: original/man1/texi2pdf.1:46
 msgid "same as B<--quiet>"
 msgstr "B<--quiet> と同じ。"
 
 #. type: TP
-#: original/man1/texi2dvi.1:39
+#: original/man1/texi2dvi.1:46 original/man1/pdftexi2dvi.1:46
+#: original/man1/texi2pdf.1:46
 #, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr "B<-v>, B<--version>"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:42
+#: original/man1/texi2dvi.1:49 original/man1/pdftexi2dvi.1:49
+#: original/man1/texi2pdf.1:49
 msgid "display version information and exit successfully"
 msgstr "バージョン情報を出力し、正常終了する。"
 
 #. type: TP
-#: original/man1/texi2dvi.1:42
+#: original/man1/texi2dvi.1:49 original/man1/pdftexi2dvi.1:49
+#: original/man1/texi2pdf.1:49
 #, no-wrap
 msgid "B<-V>, B<--verbose>"
 msgstr "B<-V>, B<--verbose>"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:45
+#: original/man1/texi2dvi.1:52 original/man1/pdftexi2dvi.1:52
+#: original/man1/texi2pdf.1:52
 msgid "report on what is done"
 msgstr "実行したことを表示する。"
 
 #. type: SS
-#: original/man1/texi2dvi.1:45
+#: original/man1/texi2dvi.1:52 original/man1/pdftexi2dvi.1:52
+#: original/man1/texi2pdf.1:52
 #, no-wrap
 msgid "TeX tuning:"
 msgstr "TeX の調整:"
 
 #. type: TP
-#: original/man1/texi2dvi.1:46
+#: original/man1/texi2dvi.1:53 original/man1/pdftexi2dvi.1:53
+#: original/man1/texi2pdf.1:53
 #, no-wrap
 msgid "-@"
 msgstr "-@"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:49
-msgid "use @input instead of \\einput; for preloaded Texinfo"
+#: original/man1/texi2dvi.1:56 original/man1/pdftexi2dvi.1:56
+#: original/man1/texi2pdf.1:56
+msgid "use @input instead of \\einput for preloaded Texinfo"
 msgstr "プレロードされる Texinfo に対して、 \\einput ではなく @input を使う。"
 
 #. type: TP
-#: original/man1/texi2dvi.1:49
+#: original/man1/texi2dvi.1:56 original/man1/pdftexi2dvi.1:56
+#: original/man1/texi2pdf.1:56
+#, no-wrap
+msgid "B<--dvi>"
+msgstr "B<--dvi>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:59 original/man1/pdftexi2dvi.1:59
+#: original/man1/texi2pdf.1:59
+msgid "output a DVI file [default]"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:59 original/man1/pdftexi2dvi.1:59
+#: original/man1/texi2pdf.1:59
+#, no-wrap
+msgid "B<--dvipdf>"
+msgstr "B<--dvipdf>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:62 original/man1/pdftexi2dvi.1:62
+#: original/man1/texi2pdf.1:62
+msgid "output a PDF file via DVI (using dvipdf)"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:62 original/man1/pdftexi2dvi.1:62
+#: original/man1/texi2pdf.1:62
 #, no-wrap
 msgid "B<-e>, B<-E>, B<--expand>"
 msgstr "B<-e>, B<-E>, B<--expand>"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:52
+#: original/man1/texi2dvi.1:65 original/man1/pdftexi2dvi.1:65
+#: original/man1/texi2pdf.1:65
 msgid "force macro expansion using makeinfo"
 msgstr "makeinfo を使って、マクロ展開を強制的に行う。"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:55
+#: original/man1/texi2dvi.1:68 original/man1/pdftexi2dvi.1:68
+#: original/man1/texi2pdf.1:68
 msgid "search DIR for Texinfo files"
 msgstr "ディレクトリ DIR で Texinfo ファイルを探す。"
 
 #. type: TP
-#: original/man1/texi2dvi.1:55
+#: original/man1/texi2dvi.1:68 original/man1/pdftexi2dvi.1:68
+#: original/man1/texi2pdf.1:68
 #, no-wrap
 msgid "B<-l>, B<--language>=I<LANG>"
 msgstr "B<-l>, B<--language>=I<LANG>"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:58
-msgid "specify the LANG of FILE (LaTeX or Texinfo)"
-msgstr "LaTeX ファイルまたは Texinfo ファイルの LANG を指定する。"
+#: original/man1/texi2dvi.1:71 original/man1/pdftexi2dvi.1:71
+#: original/man1/texi2pdf.1:71
+msgid "specify LANG for FILE, either latex or texinfo"
+msgstr "FILE の LANG を指定する。 LaTeX ファイルか Texinfo ファイルの場合。"
 
 #. type: TP
-#: original/man1/texi2dvi.1:58
+#: original/man1/texi2dvi.1:71 original/man1/pdftexi2dvi.1:71
+#: original/man1/texi2pdf.1:71
+#, no-wrap
+msgid "B<--no-line-error>"
+msgstr "B<--no-line-error>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:74 original/man1/pdftexi2dvi.1:74
+#: original/man1/texi2pdf.1:74
+msgid "do not pass B<--file-line-error> to TeX"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:74 original/man1/pdftexi2dvi.1:74
+#: original/man1/texi2pdf.1:74
 #, no-wrap
 msgid "B<-p>, B<--pdf>"
 msgstr "B<-p>, B<--pdf>"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:61
+#: original/man1/texi2dvi.1:77 original/man1/pdftexi2dvi.1:77
+#: original/man1/texi2pdf.1:77
 msgid "use pdftex or pdflatex for processing"
 msgstr "処理の際に pdftex または pdflatex を使う。"
 
 #. type: TP
-#: original/man1/texi2dvi.1:61
+#: original/man1/texi2dvi.1:77 original/man1/pdftexi2dvi.1:77
+#: original/man1/texi2pdf.1:77
+#, no-wrap
+msgid "B<-r>, B<--recode>"
+msgstr "B<-r>, B<--recode>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:80 original/man1/pdftexi2dvi.1:80
+#: original/man1/texi2pdf.1:80
+msgid "call recode before TeX to translate input"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:80 original/man1/pdftexi2dvi.1:80
+#: original/man1/texi2pdf.1:80
+#, no-wrap
+msgid "B<--recode-from>=I<ENC>"
+msgstr "B<--recode-from>=I<ENC>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:83 original/man1/pdftexi2dvi.1:83
+#: original/man1/texi2pdf.1:83
+msgid "recode from ENC to the @documentencoding"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:83 original/man1/pdftexi2dvi.1:83
+#: original/man1/texi2pdf.1:83
+#, no-wrap
+msgid "B<--src-specials>"
+msgstr "B<--src-specials>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:86 original/man1/pdftexi2dvi.1:86
+#: original/man1/texi2pdf.1:86
+msgid "pass B<--src-specials> to TeX"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:86 original/man1/pdftexi2dvi.1:86
+#: original/man1/texi2pdf.1:86
+#, no-wrap
+msgid "B<-t>, B<--command>=I<CMD>"
+msgstr "B<-t>, B<--command>=I<CMD>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:89 original/man1/pdftexi2dvi.1:89
+#: original/man1/texi2pdf.1:89
+msgid "insert CMD in copy of input file"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:89 original/man1/pdftexi2dvi.1:89
+#: original/man1/texi2pdf.1:89
 #, no-wrap
-msgid "B<-t>, B<--texinfo>=I<CMD>"
-msgstr "B<-t>, B<--texinfo>=I<CMD>"
+msgid "or B<--texinfo>=I<CMD>"
+msgstr "or B<--texinfo>=I<CMD>"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:65
+#: original/man1/texi2dvi.1:92 original/man1/pdftexi2dvi.1:92
+#: original/man1/texi2pdf.1:92
+msgid "multiple values accumulate"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:92 original/man1/pdftexi2dvi.1:92
+#: original/man1/texi2pdf.1:92
+#, no-wrap
+msgid "B<--translate-file>=I<FILE>"
+msgstr "B<--translate-file>=I<FILE>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:95 original/man1/pdftexi2dvi.1:95
+#: original/man1/texi2pdf.1:95
+msgid "use given charset translation file for TeX"
+msgstr ""
+
+#. type: SS
+#: original/man1/texi2dvi.1:95 original/man1/pdftexi2dvi.1:95
+#: original/man1/texi2pdf.1:95
+#, no-wrap
+msgid "Build modes:"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:96 original/man1/pdftexi2dvi.1:96
+#: original/man1/texi2pdf.1:96
+#, no-wrap
+msgid "B<--build>=I<MODE>"
+msgstr "B<--build>=I<MODE>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:99 original/man1/pdftexi2dvi.1:99
+#: original/man1/texi2pdf.1:99
+msgid "specify the treatment of auxiliary files [local]"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:99 original/man1/pdftexi2dvi.1:99
+#: original/man1/texi2pdf.1:99
+#, no-wrap
+msgid "B<--tidy>"
+msgstr "B<--tidy>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:102 original/man1/pdftexi2dvi.1:102
+#: original/man1/texi2pdf.1:102
+msgid "same as B<--build>=I<tidy>"
+msgstr "B<--build>=I<tidy> と同じ。"
+
+#. type: TP
+#: original/man1/texi2dvi.1:102 original/man1/pdftexi2dvi.1:102
+#: original/man1/texi2pdf.1:102
+#, no-wrap
+msgid "B<-c>, B<--clean>"
+msgstr "B<-c>, B<--clean>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:105 original/man1/pdftexi2dvi.1:105
+#: original/man1/texi2pdf.1:105
+msgid "same as B<--build>=I<clean>"
+msgstr "B<--build>=I<clean> と同じ。"
+
+#. type: TP
+#: original/man1/texi2dvi.1:105 original/man1/pdftexi2dvi.1:105
+#: original/man1/texi2pdf.1:105
+#, no-wrap
+msgid "B<--build-dir>=I<DIR>"
+msgstr "B<--build-dir>=I<DIR>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:110 original/man1/pdftexi2dvi.1:110
+#: original/man1/texi2pdf.1:110
 msgid ""
-"insert CMD after @setfilename in copy of input file multiple values "
-"accumulate"
+"specify where the tidy compilation is performed; implies B<--tidy>; defaults "
+"to TEXI2DVI_BUILD_DIRECTORY [.]"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:110 original/man1/pdftexi2dvi.1:110
+#: original/man1/texi2pdf.1:110
+#, no-wrap
+msgid "B<--mostly-clean>"
+msgstr "B<--mostly-clean>"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:114 original/man1/pdftexi2dvi.1:114
+#: original/man1/texi2pdf.1:114
+msgid "remove the auxiliary files and directories but not the output"
 msgstr ""
-"入力ファイルのコピーに関して、@setfilename の後に CMD を挿入する。 複数の値を"
-"指定できる。"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:69
+#: original/man1/texi2dvi.1:118 original/man1/pdftexi2dvi.1:118
+#: original/man1/texi2pdf.1:118
+msgid ""
+"The MODE specifies where the TeX compilation takes place, and, as a "
+"consequence, how auxiliary files are treated.  The build mode can also be "
+"set using the environment variable TEXI2DVI_BUILD_MODE."
+msgstr ""
+
+#. type: SS
+#: original/man1/texi2dvi.1:118 original/man1/pdftexi2dvi.1:118
+#: original/man1/texi2pdf.1:118
+#, no-wrap
+msgid "Valid MODEs are:"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:119 original/man1/pdftexi2dvi.1:119
+#: original/man1/texi2pdf.1:119
+#, no-wrap
+msgid "`local'"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:123 original/man1/pdftexi2dvi.1:123
+#: original/man1/texi2pdf.1:123
+msgid ""
+"compile in the current directory, leaving all the auxiliary files around.  "
+"This is the traditional TeX use."
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:123 original/man1/pdftexi2dvi.1:123
+#: original/man1/texi2pdf.1:123
+#, no-wrap
+msgid "`tidy'"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:127 original/man1/pdftexi2dvi.1:127
+#: original/man1/texi2pdf.1:127
+msgid ""
+"compile in a local *.t2d directory, where the auxiliary files are left.  "
+"Output files are copied back to the original file."
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:127 original/man1/pdftexi2dvi.1:127
+#: original/man1/texi2pdf.1:127
+#, no-wrap
+msgid "`clean'"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:131 original/man1/pdftexi2dvi.1:131
+#: original/man1/texi2pdf.1:131
+msgid ""
+"same as `tidy', but remove the auxiliary directory afterwards.  Every "
+"compilation therefore requires the full cycle."
+msgstr ""
+
+#. type: SS
+#: original/man1/texi2dvi.1:131 original/man1/pdftexi2dvi.1:131
+#: original/man1/texi2pdf.1:131
+#, no-wrap
+msgid "Using the `tidy' mode brings several advantages:"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:132 original/man1/texi2dvi.1:135
+#: original/man1/texi2dvi.1:139 original/man1/texi2dvi.1:143
+#: original/man1/texi2dvi.1:148 original/man1/texi2dvi.1:152
+#: original/man1/pdftexi2dvi.1:132 original/man1/pdftexi2dvi.1:135
+#: original/man1/pdftexi2dvi.1:139 original/man1/pdftexi2dvi.1:143
+#: original/man1/pdftexi2dvi.1:148 original/man1/pdftexi2dvi.1:152
+#: original/man1/texi2pdf.1:132 original/man1/texi2pdf.1:135
+#: original/man1/texi2pdf.1:139 original/man1/texi2pdf.1:143
+#: original/man1/texi2pdf.1:148 original/man1/texi2pdf.1:152
+#, no-wrap
+msgid "-"
+msgstr "-"
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:135 original/man1/pdftexi2dvi.1:135
+#: original/man1/texi2pdf.1:135
+msgid ""
+"the current directory is not cluttered with plethora of temporary files."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:139 original/man1/pdftexi2dvi.1:139
+#: original/man1/texi2pdf.1:139
+msgid ""
+"clutter can be even reduced using B<--build-dir>=I<dir>: all the *.t2d "
+"directories are stored there."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:143 original/man1/pdftexi2dvi.1:143
+#: original/man1/texi2pdf.1:143
+msgid ""
+"clutter can be reduced to zero using, e.g., B<--build-dir=>/tmp/$USER.t2d or "
+"B<--build-dir=>$HOME/.t2d."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:148 original/man1/pdftexi2dvi.1:148
+#: original/man1/texi2pdf.1:148
+msgid ""
+"the output file is updated after every succesful TeX run, for sake of "
+"concurrent visualization of the output.  In a `local' build the viewer stops "
+"during the whole TeX run."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:152 original/man1/pdftexi2dvi.1:152
+#: original/man1/texi2pdf.1:152
+msgid ""
+"if the compilation fails, the previous state of the output file is preserved."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:156 original/man1/pdftexi2dvi.1:156
+#: original/man1/texi2pdf.1:156
+msgid ""
+"PDF and DVI compilation are kept in separate subdirectories preventing any "
+"possibility of auxiliary file incompatibility."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:161 original/man1/pdftexi2dvi.1:161
+#: original/man1/texi2pdf.1:161
+msgid ""
+"On the other hand, because `tidy' compilation takes place in another "
+"directory, occasionally TeX won't be able to find some files (e.g., when "
+"using \\egraphicspath): in that case use B<-I> to specify the additional "
+"directories to consider."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:166 original/man1/pdftexi2dvi.1:166
+#: original/man1/texi2pdf.1:166
 msgid ""
 "The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO, TEX (or "
-"PDFTEX), and TEXINDEX environment variables are used to run those commands, "
-"if they are set."
+"PDFTEX), TEXINDEX, and THUMBPDF environment variables are used to run those "
+"commands, if they are set.  Any CMD strings are added after @setfilename for "
+"Texinfo input, in the first line for LaTeX input."
 msgstr ""
 "もし設定されているのならば、環境変数 BIBTEX, LATEX (または PDFLATEX), "
-"MAKEINDEX, MAKEINFO, TEX (または PDFTEX), TEXINDEX の値がコマンドを 実行する"
-"ために使われる。"
+"MAKEINDEX, MAKEINFO, TEX (または PDFTEX), TEXINDEX, THUMBPDF の値がコマンド"
+"を 実行するために使われる。任意の CMD 文字列を、Texinfo 入力の @setfilename "
+"の後、および LaTeX 入力の最初の行に追加されます。"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:73
+#: original/man1/texi2dvi.1:170 original/man1/pdftexi2dvi.1:170
+#: original/man1/texi2pdf.1:170
 msgid ""
 "Email bug reports to E<lt>bug-texinfo@gnu.orgE<gt>, general questions and "
 "discussion to E<lt>help-texinfo@gnu.orgE<gt>.  Texinfo home page: http://www."
@@ -1385,7 +2106,8 @@ msgstr ""
 "Texinfo のホームページは http://www.gnu.org/software/texinfo/ です。"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:86
+#: original/man1/texi2dvi.1:184 original/man1/pdftexi2dvi.1:184
+#: original/man1/texi2pdf.1:184
 msgid ""
 "The full documentation for B<texi2dvi> is maintained as a Texinfo manual.  "
 "If the B<info> and B<texi2dvi> programs are properly installed at your site, "
@@ -1396,7 +2118,8 @@ msgstr ""
 "ルされていたら、 コマンド"
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:88
+#: original/man1/texi2dvi.1:186 original/man1/pdftexi2dvi.1:186
+#: original/man1/texi2pdf.1:186
 msgid "B<info texi2dvi>"
 msgstr "B<info texi2dvi>"
 
@@ -1409,8 +2132,8 @@ msgstr "TEXINDEX"
 #. type: TH
 #: original/man1/texindex.1:2
 #, no-wrap
-msgid "texindex 4.4"
-msgstr "texindex 4.4"
+msgid "texindex 4.13"
+msgstr "texindex 4.13"
 
 #. type: Plain text
 #: original/man1/texindex.1:5
@@ -1439,43 +2162,21 @@ msgstr "このヘルプメッセージを表示して終了します"
 #. type: TP
 #: original/man1/texindex.1:15
 #, no-wrap
-msgid "B<-k>, B<--keep>"
-msgstr "B<-k>, B<--keep>"
-
-#. type: Plain text
-#: original/man1/texindex.1:18
-msgid "keep temporary files around after processing"
-msgstr "処理終了後も一時ファイルを削除しません"
-
-#. type: TP
-#: original/man1/texindex.1:18
-#, no-wrap
-msgid "B<--no-keep>"
-msgstr "B<--no-keep>"
-
-#. type: Plain text
-#: original/man1/texindex.1:21
-msgid "do not keep temporary files around after processing (default)"
-msgstr "処理終了後に一時ファイルを削除します (デフォルト)"
-
-#. type: TP
-#: original/man1/texindex.1:21
-#, no-wrap
 msgid "B<-o>, B<--output> FILE"
 msgstr "B<-o>, B<--output> FILE"
 
 #. type: Plain text
-#: original/man1/texindex.1:24
+#: original/man1/texindex.1:18
 msgid "send output to FILE"
 msgstr "FILE で指定したファイルに出力します"
 
 #. type: Plain text
-#: original/man1/texindex.1:27
+#: original/man1/texindex.1:21
 msgid "display version information and exit"
 msgstr "バージョン情報を表示して終了します"
 
 #. type: Plain text
-#: original/man1/texindex.1:44
+#: original/man1/texindex.1:39
 msgid ""
 "The full documentation for B<texindex> is maintained as a Texinfo manual.  "
 "If the B<info> and B<texindex> programs are properly installed at your site, "
@@ -1486,29 +2187,90 @@ msgstr ""
 "ば、"
 
 #. type: Plain text
-#: original/man1/texindex.1:46
+#: original/man1/texindex.1:41
 msgid "B<info texindex>"
 msgstr "B<info texindex>"
 
 #. type: TH
-#: original/man5/info.5:20
+#: original/man1/infokey.1:2
+#, no-wrap
+msgid "INFOKEY"
+msgstr "INFOKEY"
+
+#. type: TH
+#: original/man1/infokey.1:2
+#, no-wrap
+msgid "infokey 4.13"
+msgstr "infokey 4.13"
+
+#. type: Plain text
+#: original/man1/infokey.1:5
+msgid "infokey - compile customizations for Info"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/infokey.1:8
+msgid "B<infokey> [I<OPTION>]... [I<INPUT-FILE>]"
+msgstr "B<infokey> [I<OPTION>]... [I<INPUT-FILE>]"
+
+#. type: Plain text
+#: original/man1/infokey.1:11
+msgid ""
+"Compile infokey source file to infokey file.  Reads INPUT-FILE (default "
+"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info."
+msgstr ""
+
+#. type: TP
+#: original/man1/infokey.1:12
+#, no-wrap
+msgid "B<--output> FILE"
+msgstr "B<--output> FILE"
+
+#. type: Plain text
+#: original/man1/infokey.1:15
+msgid "output to FILE instead of $HOME/.info"
+msgstr "$HOME/.info ではなく FILE に出力します。"
+
+#. type: Plain text
+#: original/man1/infokey.1:39
+msgid ""
+"The full documentation for B<infokey> is maintained as a Texinfo manual.  If "
+"the B<info> and B<infokey> programs are properly installed at your site, the "
+"command"
+msgstr ""
+"B<infokey> のドキュメント全体は、Texinfo マニュアルとして管理されています。 "
+"B<info> および B<infokey> プログラムがあなたのサイトで正しくインストールされ"
+"ていれば、"
+
+#. type: Plain text
+#: original/man1/infokey.1:41
+msgid "B<info infokey>"
+msgstr "B<info infokey>"
+
+#. type: Plain text
+#: original/man1/pdftexi2dvi.1:5 original/man1/texi2pdf.1:5
+msgid "texi2dvi - convert Texinfo documents to PDF"
+msgstr "texi2dvi - Texinfo ドキュメントを PDF に変換する"
+
+#. type: TH
+#: original/man5/info.5:30
 #, no-wrap
 msgid "GNU Info"
 msgstr "GNU Info"
 
 #. type: TH
-#: original/man5/info.5:20 original/man5/texinfo.5:20
+#: original/man5/info.5:30 original/man5/texinfo.5:30
 #, no-wrap
 msgid "FSF"
 msgstr "FSF"
 
 #. type: Plain text
-#: original/man5/info.5:23
+#: original/man5/info.5:33
 msgid "info - readable online documentation"
 msgstr "info - 可読なオンライン文書"
 
 #. type: Plain text
-#: original/man5/info.5:30
+#: original/man5/info.5:40
 msgid ""
 "The Info file format is an easily-parsable representation for online "
 "documents.  It can be read by I<emacs(1)> and I<info(1)> among other "
@@ -1518,7 +2280,7 @@ msgstr ""
 "I<emacs(1)> と I<info(1)> や、他のプログラムで読むことができます。"
 
 #. type: Plain text
-#: original/man5/info.5:36
+#: original/man5/info.5:46
 msgid ""
 "Info files are usually created from I<texinfo(5)> sources by I<makeinfo(1)>, "
 "but can be created from scratch if so desired."
@@ -1527,7 +2289,7 @@ msgstr ""
 "されますが、どうしても必要であれば直接作成することもできます。"
 
 #. type: Plain text
-#: original/man5/info.5:40 original/man5/texinfo.5:31
+#: original/man5/info.5:50 original/man5/texinfo.5:41
 msgid ""
 "For a full description of the Texinfo language and associated tools, please "
 "see the Texinfo manual (written in Texinfo itself).  Most likely, running "
@@ -1535,46 +2297,48 @@ msgid ""
 msgstr ""
 "Texinfo の文法や関連するツールに関する完全な解説は、\n"
 "(Texinfo 自身で書かれた) Texinfo マニュアルを参照してください。\n"
-"普通は、次のコマンドをシェルから実行するか、"
+"普通は、シェルからコマンド"
 
 #. type: Plain text
-#: original/man5/info.5:42 original/man5/texinfo.5:33
-msgid "I<info texinfo>"
-msgstr "I<info texinfo>"
+#: original/man5/info.5:52 original/man5/texinfo.5:43
+#, no-wrap
+msgid "info texinfo\n"
+msgstr "info texinfo\n"
 
 #. type: Plain text
-#: original/man5/info.5:44 original/man5/texinfo.5:35
+#: original/man5/info.5:54 original/man5/texinfo.5:45
 msgid "or this key sequence from inside Emacs:"
-msgstr "Emacs 内部から次のキーシーケンスを実行すると、"
+msgstr "を実行するか、Emacs 内部からキーシーケンス"
 
 #. type: Plain text
-#: original/man5/info.5:46 original/man5/texinfo.5:37
-msgid "I<M-x info RET m texinfo RET>"
-msgstr "I<M-x info RET m texinfo RET>"
+#: original/man5/info.5:56 original/man5/texinfo.5:47
+#, no-wrap
+msgid "M-x info RET m texinfo RET\n"
+msgstr "M-x info RET m texinfo RET\n"
 
 #. type: Plain text
-#: original/man5/info.5:48 original/man5/texinfo.5:39
+#: original/man5/info.5:58 original/man5/texinfo.5:49
 msgid "will get you there."
-msgstr "マニュアルを表示できます。"
+msgstr "ã\82\92å\85¥å\8a\9bã\81\99ã\82\8bã\81¨ã\80\81ã\83\9eã\83\8bã\83¥ã\82¢ã\83«ã\82\92表示ã\81§ã\81\8dã\81¾ã\81\99ã\80\82"
 
 #. type: SH
-#: original/man5/info.5:48 original/man5/texinfo.5:39
+#: original/man5/info.5:58 original/man5/texinfo.5:49
 #, no-wrap
 msgid "AVAILABILITY"
 msgstr "入手"
 
 #. type: Plain text
-#: original/man5/info.5:50
+#: original/man5/info.5:60
 msgid "ftp://ftp.gnu.org/pub/gnu/texinfo-E<lt>versionE<gt>.tar.gz"
 msgstr "ftp://ftp.gnu.org/pub/gnu/texinfo-E<lt>versionE<gt>.tar.gz"
 
 #. type: Plain text
-#: original/man5/info.5:52 original/man5/texinfo.5:43
+#: original/man5/info.5:62 original/man5/texinfo.5:53
 msgid "or any GNU mirror site."
 msgstr "もしくは GNU のミラーサイトから入手できます。"
 
 #. type: Plain text
-#: original/man5/info.5:55 original/man5/texinfo.5:46
+#: original/man5/info.5:65 original/man5/texinfo.5:56
 msgid ""
 "Please send bug reports to bug-texinfo@gnu.org, general questions and "
 "discussion to help-texinfo@gnu.org."
@@ -1583,44 +2347,44 @@ msgstr ""
 "一般的な質問や議論は help-texinfo@gnu.org へお願いします。"
 
 #. type: Plain text
-#: original/man5/info.5:57
+#: original/man5/info.5:67
 msgid "info(1), install-info(1), makeinfo(1), texi2dvi(1),"
 msgstr "info(1), install-info(1), makeinfo(1), texi2dvi(1),"
 
 #. type: Plain text
-#: original/man5/info.5:59
+#: original/man5/info.5:69
 msgid "texindex(1)."
 msgstr "texindex(1)."
 
 #. type: Plain text
-#: original/man5/info.5:61 original/man5/texinfo.5:50
+#: original/man5/info.5:71 original/man5/texinfo.5:60
 msgid "emacs(1), tex(1)."
 msgstr "emacs(1), tex(1)."
 
 #. type: Plain text
-#: original/man5/info.5:62
+#: original/man5/info.5:72
 msgid "texinfo(5)."
 msgstr "texinfo(5)."
 
 #. type: TH
-#: original/man5/texinfo.5:20
+#: original/man5/texinfo.5:30
 #, no-wrap
 msgid "TEXINFO"
 msgstr "TEXINFO"
 
 #. type: TH
-#: original/man5/texinfo.5:20
+#: original/man5/texinfo.5:30
 #, no-wrap
 msgid "GNU Texinfo"
 msgstr "GNU Texinfo"
 
 #. type: Plain text
-#: original/man5/texinfo.5:23
+#: original/man5/texinfo.5:33
 msgid "texinfo - software documentation system"
 msgstr "Texinfo - ソフトウェアのドキュメンテーションシステム"
 
 #. type: Plain text
-#: original/man5/texinfo.5:27
+#: original/man5/texinfo.5:37
 msgid ""
 "Texinfo is a documentation system that uses a single source file to produce "
 "both online information and printed output.  It is primarily designed for "
@@ -1631,16 +2395,67 @@ msgstr ""
 "マニュアルを書くために設計されたものです。"
 
 #. type: Plain text
-#: original/man5/texinfo.5:41
+#: original/man5/texinfo.5:51
 msgid "ftp://ftp.gnu.org/gnu/texinfo/"
 msgstr "ftp://ftp.gnu.org/gnu/texinfo/"
 
 #. type: Plain text
-#: original/man5/texinfo.5:48
+#: original/man5/texinfo.5:58
 msgid "info(1), install-info(1), makeinfo(1), texi2dvi(1), texindex(1)."
 msgstr "info(1), install-info(1), makeinfo(1), texi2dvi(1), texindex(1)."
 
 #. type: Plain text
-#: original/man5/texinfo.5:51
+#: original/man5/texinfo.5:61
 msgid "info(5)."
 msgstr "info(5)"
+
+#~ msgid "don't remove ANSI escapes from man pages."
+#~ msgstr "man ページから ANSI エスケープ文字を削除しません。"
+
+#~ msgid ""
+#~ "Copyright \\(co 2003 Free Software Foundation, Inc.  There is NO "
+#~ "warranty.  You may redistribute this software under the terms of the GNU "
+#~ "General Public License.  For more information about these matters, see "
+#~ "the files named COPYING."
+#~ msgstr ""
+#~ "Copyright \\(co 2003 Free Software Foundation, Inc.  There is NO "
+#~ "warranty.  You may redistribute this software under the terms of the GNU "
+#~ "General Public License.  For more information about these matters, see "
+#~ "the files named COPYING."
+
+#~ msgid ""
+#~ "insert TEXT as an Info directory entry.  TEXT should have the form of an "
+#~ "Info menu item line plus zero or more extra lines starting with "
+#~ "whitespace.  If you specify more than one entry, they are all added.  If "
+#~ "you don't specify any entries, they are determined from information in "
+#~ "the Info file itself."
+#~ msgstr ""
+#~ "Info ディレクトリエントリとして、TEXT を挿入します。 TEXT の形式は、 Info "
+#~ "メニュー項目行 1 行に加え、 空白から開始する追加行を 0 行以上です。 複数エ"
+#~ "ントリを指定した場合、すべてが追加されます。 エントリをなにも指定しない場"
+#~ "合、Info ファイル自身の中の情報から、 エントリが決定されます。"
+
+#~ msgid "B<--reference-limit>=I<NUM>"
+#~ msgstr "B<--reference-limit>=I<NUM>"
+
+#~ msgid "warn about at most NUM references (default 1000)."
+#~ msgstr "NUM 個まで参照に関する警告を出します (デフォルトは 1000 です)。"
+
+#~ msgid "Operation modes:"
+#~ msgstr "動作モード:"
+
+#~ msgid "remove all auxiliary files"
+#~ msgstr "全ての補助ファイルを削除する。"
+
+#~ msgid ""
+#~ "insert CMD after @setfilename in copy of input file multiple values "
+#~ "accumulate"
+#~ msgstr ""
+#~ "入力ファイルのコピーに関して、@setfilename の後に CMD を挿入する。 複数の"
+#~ "値を指定できる。"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "処理終了後も一時ファイルを削除しません"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "処理終了後に一時ファイルを削除します (デフォルト)"

diff --git a/manual/GNU_texinfo/po4a/texinfo.cfg b/manual/GNU_texinfo/po4a/texinfo.cfg
index bc73b6f..d383597 100644 (file)
--- a/manual/GNU_texinfo/po4a/texinfo.cfg
+++ b/manual/GNU_texinfo/po4a/texinfo.cfg
@@ -20,8 +20,22 @@
        opt:"-o generated" \
        add_$lang:?po4a/add_$lang/copyright/texindex.1.txt
 
+[type: man] original/man1/infokey.1 $lang:draft/man1/infokey.1 \
+       opt:"-o generated" \
+       add_$lang:?po4a/add_$lang/copyright/infokey.1.txt
+
+[type: man] original/man1/pdftexi2dvi.1 $lang:draft/man1/pdftexi2dvi.1 \
+       opt:"-o generated" \
+       add_$lang:?po4a/add_$lang/copyright/pdftexi2dvi.1.txt
+
+[type: man] original/man1/texi2pdf.1 $lang:draft/man1/texi2pdf.1 \
+       opt:"-o generated" \
+       add_$lang:?po4a/add_$lang/copyright/texi2pdf.1.txt
+
 [type: man] original/man5/info.5 $lang:draft/man5/info.5 \
+       opt:"-o groff_code=verbatim" \
        add_$lang:?po4a/add_$lang/copyright/info.5.txt
 
 [type: man] original/man5/texinfo.5 $lang:draft/man5/texinfo.5 \
+       opt:"-o groff_code=verbatim" \
        add_$lang:?po4a/add_$lang/copyright/texinfo.5.txt

diff --git a/manual/GNU_texinfo/po4a/texinfo.pot b/manual/GNU_texinfo/po4a/texinfo.pot
index 9eed9eb..b53f778 100644 (file)
--- a/manual/GNU_texinfo/po4a/texinfo.pot
+++ b/manual/GNU_texinfo/po4a/texinfo.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-06-03 03:14+0900\n"
+"POT-Creation-Date: 2012-06-03 05:11+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,31 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
-#: original/man1/info.1:2 original/man5/info.5:20
+#: original/man1/info.1:2 original/man5/info.5:30
 #, no-wrap
 msgid "INFO"
 msgstr ""
 
 #. type: TH
-#: original/man1/info.1:2 original/man1/install-info.1:2 original/man1/makeinfo.1:2 original/man1/texi2dvi.1:2 original/man1/texindex.1:2
+#: original/man1/info.1:2 original/man1/install-info.1:2 original/man1/makeinfo.1:2 original/man1/texi2dvi.1:2 original/man1/texindex.1:2 original/man1/infokey.1:2 original/man1/pdftexi2dvi.1:2 original/man1/texi2pdf.1:2
 #, no-wrap
-msgid "February 2003"
+msgid "September 2008"
 msgstr ""
 
 #. type: TH
 #: original/man1/info.1:2
 #, no-wrap
-msgid "info 4.4"
+msgid "info 4.13"
 msgstr ""
 
 #. type: TH
-#: original/man1/info.1:2 original/man1/install-info.1:2 original/man1/makeinfo.1:2 original/man1/texi2dvi.1:2 original/man1/texindex.1:2
+#: original/man1/info.1:2 original/man1/install-info.1:2 original/man1/makeinfo.1:2 original/man1/texi2dvi.1:2 original/man1/texindex.1:2 original/man1/infokey.1:2 original/man1/pdftexi2dvi.1:2 original/man1/texi2pdf.1:2
 #, no-wrap
 msgid "User Commands"
 msgstr ""
 
 #. type: SH
-#: original/man1/info.1:3 original/man1/install-info.1:3 original/man1/makeinfo.1:3 original/man1/texi2dvi.1:3 original/man1/texindex.1:3 original/man5/info.5:21 original/man5/texinfo.5:21
+#: original/man1/info.1:3 original/man1/install-info.1:3 original/man1/makeinfo.1:3 original/man1/texi2dvi.1:3 original/man1/texindex.1:3 original/man1/infokey.1:3 original/man1/pdftexi2dvi.1:3 original/man1/texi2pdf.1:3 original/man5/info.5:31 original/man5/texinfo.5:31
 #, no-wrap
 msgid "NAME"
 msgstr ""
@@ -52,7 +52,7 @@ msgid "info - read Info documents"
 msgstr ""
 
 #. type: SH
-#: original/man1/info.1:5 original/man1/install-info.1:5 original/man1/makeinfo.1:5 original/man1/texi2dvi.1:5 original/man1/texindex.1:5
+#: original/man1/info.1:5 original/man1/install-info.1:5 original/man1/makeinfo.1:5 original/man1/texi2dvi.1:5 original/man1/texindex.1:5 original/man1/infokey.1:5 original/man1/pdftexi2dvi.1:5 original/man1/texi2pdf.1:5
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr ""
@@ -63,7 +63,7 @@ msgid "B<info> [I<OPTION>]... [I<MENU-ITEM>...]"
 msgstr ""
 
 #. type: SH
-#: original/man1/info.1:8 original/man1/install-info.1:8 original/man1/makeinfo.1:8 original/man1/texi2dvi.1:8 original/man1/texindex.1:8 original/man5/info.5:23 original/man5/texinfo.5:23
+#: original/man1/info.1:8 original/man1/install-info.1:8 original/man1/makeinfo.1:8 original/man1/texi2dvi.1:8 original/man1/texindex.1:8 original/man1/infokey.1:8 original/man1/pdftexi2dvi.1:8 original/man1/texi2pdf.1:8 original/man5/info.5:33 original/man5/texinfo.5:33
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
@@ -74,7 +74,7 @@ msgid "Read documentation in Info format."
 msgstr ""
 
 #. type: SH
-#: original/man1/info.1:10 original/man1/install-info.1:11 original/man1/texindex.1:11
+#: original/man1/info.1:10 original/man1/install-info.1:10 original/man1/texindex.1:11 original/man1/infokey.1:11
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
@@ -82,7 +82,7 @@ msgstr ""
 #. type: TP
 #: original/man1/info.1:11
 #, no-wrap
-msgid "B<--apropos>=I<STRING>"
+msgid "B<-k>, B<--apropos>=I<STRING>"
 msgstr ""
 
 #. type: Plain text
@@ -124,13 +124,13 @@ msgid "specify Info file to visit."
 msgstr ""
 
 #. type: TP
-#: original/man1/info.1:23 original/man1/texi2dvi.1:26 original/man1/texindex.1:12
+#: original/man1/info.1:23 original/man1/texi2dvi.1:33 original/man1/texindex.1:12 original/man1/pdftexi2dvi.1:33 original/man1/texi2pdf.1:33
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/info.1:26 original/man1/install-info.1:31 original/man1/makeinfo.1:21
+#: original/man1/info.1:26 original/man1/install-info.1:47 original/man1/makeinfo.1:24 original/man1/infokey.1:18
 msgid "display this help and exit."
 msgstr ""
 
@@ -175,66 +175,88 @@ msgstr ""
 
 #. type: Plain text
 #: original/man1/info.1:38
-msgid "don't remove ANSI escapes from man pages."
+msgid "output \"raw\" ANSI escapes (default)."
 msgstr ""
 
 #. type: TP
 #: original/man1/info.1:38
 #, no-wrap
-msgid "B<--restore>=I<FILENAME>"
+msgid "B<--no-raw-escapes>"
 msgstr ""
 
 #. type: Plain text
 #: original/man1/info.1:41
-msgid "read initial keystrokes from FILENAME."
+msgid "output escapes as literal text."
 msgstr ""
 
 #. type: TP
 #: original/man1/info.1:41
 #, no-wrap
-msgid "B<-O>, B<--show-options>, B<--usage>"
+msgid "B<--restore>=I<FILENAME>"
 msgstr ""
 
 #. type: Plain text
 #: original/man1/info.1:44
-msgid "go to command-line options node."
+msgid "read initial keystrokes from FILENAME."
 msgstr ""
 
 #. type: TP
 #: original/man1/info.1:44
 #, no-wrap
-msgid "B<--subnodes>"
+msgid "B<-O>, B<--show-options>, B<--usage>"
 msgstr ""
 
 #. type: Plain text
 #: original/man1/info.1:47
-msgid "recursively output menu items."
+msgid "go to command-line options node."
 msgstr ""
 
 #. type: TP
 #: original/man1/info.1:47
 #, no-wrap
-msgid "B<--vi-keys>"
+msgid "B<--subnodes>"
 msgstr ""
 
 #. type: Plain text
 #: original/man1/info.1:50
+msgid "recursively output menu items."
+msgstr ""
+
+#. type: TP
+#: original/man1/info.1:50
+#, no-wrap
+msgid "B<--vi-keys>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/info.1:53
 msgid "use vi-like and less-like key bindings."
 msgstr ""
 
 #. type: TP
-#: original/man1/info.1:50 original/man1/install-info.1:55 original/man1/makeinfo.1:33 original/man1/texindex.1:24
+#: original/man1/info.1:53 original/man1/install-info.1:101 original/man1/makeinfo.1:33 original/man1/texindex.1:18 original/man1/infokey.1:18
 #, no-wrap
 msgid "B<--version>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/info.1:53 original/man1/install-info.1:58 original/man1/makeinfo.1:36
+#: original/man1/info.1:56 original/man1/install-info.1:104 original/man1/makeinfo.1:36 original/man1/infokey.1:21
 msgid "display version information and exit."
 msgstr ""
 
+#. type: TP
+#: original/man1/info.1:56
+#, no-wrap
+msgid "B<-w>, B<--where>, B<--location>"
+msgstr ""
+
 #. type: Plain text
 #: original/man1/info.1:59
+msgid "print physical location of Info file."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/info.1:65
 msgid ""
 "The first non-option argument, if present, is the menu entry to start from; "
 "it is searched for in all `dir' files along INFOPATH.  If it is not present, "
@@ -242,75 +264,113 @@ msgid ""
 "are treated as the names of menu items relative to the initial node visited."
 msgstr ""
 
+#. type: Plain text
+#: original/man1/info.1:67
+msgid "For a summary of key bindings, type h within Info."
+msgstr ""
+
 #. type: SH
-#: original/man1/info.1:59 original/man1/makeinfo.1:142
+#: original/man1/info.1:67 original/man1/makeinfo.1:176
 #, no-wrap
 msgid "EXAMPLES"
 msgstr ""
 
 #. type: TP
-#: original/man1/info.1:60
+#: original/man1/info.1:68
 #, no-wrap
 msgid "info"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/info.1:63
+#: original/man1/info.1:71
 msgid "show top-level dir menu"
 msgstr ""
 
 #. type: TP
-#: original/man1/info.1:63
+#: original/man1/info.1:71
+#, no-wrap
+msgid "info info"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/info.1:74
+msgid "show the general manual for Info readers"
+msgstr ""
+
+#. type: TP
+#: original/man1/info.1:74
+#, no-wrap
+msgid "info info-stnd"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/info.1:77
+msgid "show the manual specific to this Info program"
+msgstr ""
+
+#. type: TP
+#: original/man1/info.1:77
 #, no-wrap
 msgid "info emacs"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/info.1:66
+#: original/man1/info.1:80
 msgid "start at emacs node from top-level dir"
 msgstr ""
 
 #. type: TP
-#: original/man1/info.1:66
+#: original/man1/info.1:80
 #, no-wrap
 msgid "info emacs buffers"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/info.1:69
+#: original/man1/info.1:83
 msgid "start at buffers node within emacs manual"
 msgstr ""
 
 #. type: TP
-#: original/man1/info.1:69
+#: original/man1/info.1:83
 #, no-wrap
 msgid "info B<--show-options> emacs"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/info.1:72
+#: original/man1/info.1:86
 msgid "start at node with emacs' command line options"
 msgstr ""
 
 #. type: TP
-#: original/man1/info.1:72
+#: original/man1/info.1:86
+#, no-wrap
+msgid "info B<--subnodes> B<-o> out.txt emacs"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/info.1:89
+msgid "dump entire manual to out.txt"
+msgstr ""
+
+#. type: TP
+#: original/man1/info.1:89
 #, no-wrap
 msgid "info B<-f> ./foo.info"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/info.1:75
+#: original/man1/info.1:92
 msgid "show file ./foo.info, not searching dir"
 msgstr ""
 
 #. type: SH
-#: original/man1/info.1:75 original/man1/install-info.1:58 original/man1/makeinfo.1:162 original/man1/texi2dvi.1:69 original/man1/texindex.1:27 original/man5/info.5:52 original/man5/texinfo.5:43
+#: original/man1/info.1:92 original/man1/install-info.1:104 original/man1/makeinfo.1:201 original/man1/texi2dvi.1:166 original/man1/texindex.1:21 original/man1/infokey.1:21 original/man1/pdftexi2dvi.1:166 original/man1/texi2pdf.1:166 original/man5/info.5:62 original/man5/texinfo.5:53
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/info.1:79 original/man1/install-info.1:62 original/man1/makeinfo.1:166 original/man1/texindex.1:31
+#: original/man1/info.1:96 original/man1/install-info.1:108 original/man1/makeinfo.1:205 original/man1/texindex.1:25 original/man1/infokey.1:25
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org, general questions and discussion "
 "to help-texinfo@gnu.org.  Texinfo home page: "
@@ -318,18 +378,23 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: original/man1/info.1:79 original/man1/install-info.1:62 original/man1/makeinfo.1:166 original/man1/texi2dvi.1:73 original/man1/texindex.1:31
+#: original/man1/info.1:96 original/man1/install-info.1:108 original/man1/makeinfo.1:205 original/man1/texi2dvi.1:170 original/man1/texindex.1:25 original/man1/infokey.1:25 original/man1/pdftexi2dvi.1:170 original/man1/texi2pdf.1:170
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/info.1:83 original/man1/install-info.1:67 original/man1/makeinfo.1:171 original/man1/texi2dvi.1:78 original/man1/texindex.1:36
+#: original/man1/info.1:99 original/man1/install-info.1:111 original/man1/makeinfo.1:208 original/man1/texi2dvi.1:173 original/man1/texindex.1:28 original/man1/infokey.1:28 original/man1/pdftexi2dvi.1:173 original/man1/texi2pdf.1:173
+msgid ""
+"Copyright \\(co 2008 Free Software Foundation, Inc.  License GPLv3+: GNU GPL "
+"version 3 or later E<lt>http://gnu.org/licenses/gpl.htmlE<gt>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/info.1:101 original/man1/install-info.1:114 original/man1/makeinfo.1:211 original/man1/texi2dvi.1:176 original/man1/texindex.1:31 original/man1/infokey.1:31 original/man1/pdftexi2dvi.1:176 original/man1/texi2pdf.1:176
 msgid ""
-"Copyright \\(co 2003 Free Software Foundation, Inc.  There is NO warranty.  "
-"You may redistribute this software under the terms of the GNU General Public "
-"License.  For more information about these matters, see the files named "
-"COPYING."
+"This is free software: you are free to change and redistribute it.  There is "
+"NO WARRANTY, to the extent permitted by law."
 msgstr ""
 
 #. type: TH
@@ -341,7 +406,7 @@ msgstr ""
 #. type: TH
 #: original/man1/install-info.1:2
 #, no-wrap
-msgid "install-info 4.4"
+msgid "install-info 4.13"
 msgstr ""
 
 #. type: Plain text
@@ -355,140 +420,290 @@ msgid "B<install-info> [I<OPTION>]... [I<INFO-FILE >[I<DIR-FILE>]]"
 msgstr ""
 
 #. type: Plain text
+#: original/man1/install-info.1:10
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#. type: TP
 #: original/man1/install-info.1:11
-msgid ""
-"Install or delete dir entries from INFO-FILE in the Info directory file "
-"DIR-FILE."
+#, no-wrap
+msgid "B<--debug>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:14
+msgid "report what is being done."
 msgstr ""
 
 #. type: TP
-#: original/man1/install-info.1:12
+#: original/man1/install-info.1:14
 #, no-wrap
 msgid "B<--delete>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/install-info.1:16
+#: original/man1/install-info.1:18
 msgid ""
 "delete existing entries for INFO-FILE from DIR-FILE; don't insert any new "
 "entries."
 msgstr ""
 
 #. type: TP
-#: original/man1/install-info.1:16
+#: original/man1/install-info.1:18
 #, no-wrap
-msgid "B<--dir-file>=I<NAME>"
+msgid "B<--description>=I<TEXT>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/install-info.1:20
+#: original/man1/install-info.1:23
 msgid ""
-"specify file name of Info directory file.  This is equivalent to using the "
-"DIR-FILE argument."
+"the description of the entry is TEXT; used with the B<--name> option to "
+"become synonymous with the B<--entry> option."
 msgstr ""
 
 #. type: TP
-#: original/man1/install-info.1:20
+#: original/man1/install-info.1:23
 #, no-wrap
-msgid "B<--entry>=I<TEXT>"
+msgid "B<--dir-file>=I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/install-info.1:28
+#: original/man1/install-info.1:27
 msgid ""
-"insert TEXT as an Info directory entry.  TEXT should have the form of an "
-"Info menu item line plus zero or more extra lines starting with whitespace.  "
-"If you specify more than one entry, they are all added.  If you don't "
-"specify any entries, they are determined from information in the Info file "
-"itself."
+"specify file name of Info directory file; equivalent to using the DIR-FILE "
+"argument."
 msgstr ""
 
 #. type: TP
-#: original/man1/install-info.1:28 original/man1/makeinfo.1:18
+#: original/man1/install-info.1:27
 #, no-wrap
-msgid "B<--help>"
+msgid "B<--dry-run>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:30
+msgid "same as B<--test>."
 msgstr ""
 
 #. type: TP
-#: original/man1/install-info.1:31
+#: original/man1/install-info.1:30
 #, no-wrap
-msgid "B<--info-file>=I<FILE>"
+msgid "B<--entry>=I<TEXT>"
 msgstr ""
 
 #. type: Plain text
 #: original/man1/install-info.1:35
 msgid ""
-"specify Info file to install in the directory.  This is equivalent to using "
-"the INFO-FILE argument."
+"insert TEXT as an Info directory entry.  TEXT is written as an Info menu "
+"item line followed by zero or more extra lines starting with whitespace."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:39
+msgid ""
+"If you specify more than one entry, all are added.  If you don't specify any "
+"entries, they are determined from information in the Info file itself."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:44
+msgid ""
+"When removing, TEXT specifies the entry to remove.  TEXT is only removed as "
+"a last resort, if the entry as determined from the Info file is not present, "
+"and the basename of the Info file isn't found either."
 msgstr ""
 
 #. type: TP
-#: original/man1/install-info.1:35
+#: original/man1/install-info.1:44 original/man1/makeinfo.1:21 original/man1/infokey.1:15
+#, no-wrap
+msgid "B<--help>"
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:47
 #, no-wrap
 msgid "B<--info-dir>=I<DIR>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/install-info.1:38
+#: original/man1/install-info.1:50
 msgid "same as B<--dir-file>=I<DIR>/dir."
 msgstr ""
 
 #. type: TP
-#: original/man1/install-info.1:38
+#: original/man1/install-info.1:50
+#, no-wrap
+msgid "B<--info-file>=I<FILE>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:54
+msgid ""
+"specify Info file to install in the directory; equivalent to using the "
+"INFO-FILE argument."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:54
 #, no-wrap
 msgid "B<--item>=I<TEXT>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/install-info.1:42
-msgid "same as B<--entry> TEXT.  An Info directory entry is actually a menu item."
+#: original/man1/install-info.1:57
+msgid "same as B<--entry>=I<TEXT>."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:57
+#, no-wrap
+msgid "B<--keep-old>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:60
+msgid "do not replace entries, or remove empty sections."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:60
+#, no-wrap
+msgid "B<--menuentry>=I<TEXT>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:63
+msgid "same as B<--name>=I<TEXT>."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:63
+#, no-wrap
+msgid "B<--name>=I<TEXT>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:67
+msgid ""
+"the name of the entry is TEXT; used with B<--description> to become "
+"synonymous with the B<--entry> option."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:67
+#, no-wrap
+msgid "B<--no-indent>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:70
+msgid "do not format new entries in the DIR file."
 msgstr ""
 
 #. type: TP
-#: original/man1/install-info.1:42
+#: original/man1/install-info.1:70
 #, no-wrap
 msgid "B<--quiet>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/install-info.1:45
+#: original/man1/install-info.1:73 original/man1/install-info.1:98
 msgid "suppress warnings."
 msgstr ""
 
 #. type: TP
-#: original/man1/install-info.1:45
+#: original/man1/install-info.1:73
+#, no-wrap
+msgid "B<--regex>=I<R>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:77
+msgid ""
+"put this file's entries in all sections that match the regular expression R "
+"(ignoring case)."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:77
 #, no-wrap
 msgid "B<--remove>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/install-info.1:48
+#: original/man1/install-info.1:80
 msgid "same as B<--delete>."
 msgstr ""
 
 #. type: TP
-#: original/man1/install-info.1:48
+#: original/man1/install-info.1:80
+#, no-wrap
+msgid "B<--remove-exactly>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:84
+msgid ""
+"only remove if the info file name matches exactly; suffixes such as .info "
+"and .gz are not ignored."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:84
 #, no-wrap
 msgid "B<--section>=I<SEC>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/install-info.1:55
+#: original/man1/install-info.1:89
+msgid ""
+"put entries in section SEC of the directory.  If you specify more than one "
+"section, all the entries are added in each of the sections."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:92
 msgid ""
-"put this file's entries in section SEC of the directory.  If you specify "
-"more than one section, all the entries are added in each of the sections.  "
 "If you don't specify any sections, they are determined from information in "
 "the Info file itself."
 msgstr ""
 
+#. type: TP
+#: original/man1/install-info.1:92
+#, no-wrap
+msgid "B<--section> R SEC"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:95
+msgid "equivalent to B<--regex>=I<R> B<--section>=I<SEC> B<--add-once>."
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:95
+#, no-wrap
+msgid "B<--silent>"
+msgstr ""
+
+#. type: TP
+#: original/man1/install-info.1:98
+#, no-wrap
+msgid "B<--test>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/install-info.1:101
+msgid "suppress updating of DIR-FILE."
+msgstr ""
+
 #. type: SH
-#: original/man1/install-info.1:67 original/man1/makeinfo.1:171 original/man1/texi2dvi.1:78 original/man1/texindex.1:36 original/man5/info.5:55 original/man5/texinfo.5:46
+#: original/man1/install-info.1:114 original/man1/makeinfo.1:211 original/man1/texi2dvi.1:176 original/man1/texindex.1:31 original/man1/infokey.1:31 original/man1/pdftexi2dvi.1:176 original/man1/texi2pdf.1:176 original/man5/info.5:65 original/man5/texinfo.5:56
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/install-info.1:75
+#: original/man1/install-info.1:122
 msgid ""
 "The full documentation for B<install-info> is maintained as a Texinfo "
 "manual.  If the B<info> and B<install-info> programs are properly installed "
@@ -496,12 +711,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: original/man1/install-info.1:77
+#: original/man1/install-info.1:124
 msgid "B<info install-info>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/install-info.1:78 original/man1/makeinfo.1:182 original/man1/texi2dvi.1:89 original/man1/texindex.1:47
+#: original/man1/install-info.1:125 original/man1/makeinfo.1:222 original/man1/texi2dvi.1:187 original/man1/texindex.1:42 original/man1/infokey.1:42 original/man1/pdftexi2dvi.1:187 original/man1/texi2pdf.1:187
 msgid "should give you access to the complete manual."
 msgstr ""
 
@@ -514,7 +729,7 @@ msgstr ""
 #. type: TH
 #: original/man1/makeinfo.1:2
 #, no-wrap
-msgid "makeinfo 4.4"
+msgid "makeinfo 4.13"
 msgstr ""
 
 #. type: Plain text
@@ -535,7 +750,7 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: original/man1/makeinfo.1:11
+#: original/man1/makeinfo.1:11 original/man1/texi2dvi.1:26 original/man1/pdftexi2dvi.1:26 original/man1/texi2pdf.1:26
 #, no-wrap
 msgid "General options:"
 msgstr ""
@@ -554,45 +769,45 @@ msgstr ""
 #. type: TP
 #: original/man1/makeinfo.1:15
 #, no-wrap
-msgid "B<--force>"
+msgid "B<--document-language>=I<STR> locale to use in translating Texinfo keywords"
 msgstr ""
 
 #. type: Plain text
 #: original/man1/makeinfo.1:18
-msgid "preserve output even if errors."
+msgid "for the output document (default C)."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:21
+#: original/man1/makeinfo.1:18
 #, no-wrap
-msgid "B<--no-validate>"
+msgid "B<--force>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:24
-msgid "suppress node cross-reference validation."
+#: original/man1/makeinfo.1:21
+msgid "preserve output even if errors."
 msgstr ""
 
 #. type: TP
 #: original/man1/makeinfo.1:24
 #, no-wrap
-msgid "B<--no-warn>"
+msgid "B<--no-validate>"
 msgstr ""
 
 #. type: Plain text
 #: original/man1/makeinfo.1:27
-msgid "suppress warnings (but not errors)."
+msgid "suppress node cross-reference validation."
 msgstr ""
 
 #. type: TP
 #: original/man1/makeinfo.1:27
 #, no-wrap
-msgid "B<--reference-limit>=I<NUM>"
+msgid "B<--no-warn>"
 msgstr ""
 
 #. type: Plain text
 #: original/man1/makeinfo.1:30
-msgid "warn about at most NUM references (default 1000)."
+msgid "suppress warnings (but not errors)."
 msgstr ""
 
 #. type: TP
@@ -620,7 +835,7 @@ msgstr ""
 
 #. type: Plain text
 #: original/man1/makeinfo.1:40
-msgid "output DocBook XML rather than Info."
+msgid "output Docbook XML rather than Info."
 msgstr ""
 
 #. type: TP
@@ -645,31 +860,42 @@ msgstr ""
 msgid "output Texinfo XML rather than Info."
 msgstr ""
 
-#. type: SS
+#. type: TP
 #: original/man1/makeinfo.1:46
 #, no-wrap
+msgid "B<--plaintext>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:49
+msgid "output plain text rather than Info."
+msgstr ""
+
+#. type: SS
+#: original/man1/makeinfo.1:49
+#, no-wrap
 msgid "General output options:"
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:47
+#: original/man1/makeinfo.1:50
 #, no-wrap
-msgid "B<-E>, B<--macro-expand> FILE"
+msgid "B<-E>, B<--macro-expand>=I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:51
-msgid "output macro-expanded source to FILE.  ignoring any @setfilename."
+#: original/man1/makeinfo.1:54
+msgid "output macro-expanded source to FILE, ignoring any @setfilename."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:51
+#: original/man1/makeinfo.1:54
 #, no-wrap
 msgid "B<--no-headers>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:57
+#: original/man1/makeinfo.1:60
 msgid ""
 "suppress node separators, Node: lines, and menus from Info output (thus "
 "producing plain text)  or from HTML (thus producing shorter output); also, "
@@ -677,361 +903,492 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:57
+#: original/man1/makeinfo.1:60
 #, no-wrap
 msgid "B<--no-split>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:61
-msgid "suppress splitting of Info or HTML output, generate only one output file."
+#: original/man1/makeinfo.1:64
+msgid ""
+"suppress the splitting of Info or HTML output, generate only one output "
+"file."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:61
+#: original/man1/makeinfo.1:64
 #, no-wrap
 msgid "B<--number-sections>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:64
+#: original/man1/makeinfo.1:67
 msgid "output chapter and sectioning numbers."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:64
+#: original/man1/makeinfo.1:67
 #, no-wrap
 msgid "B<-o>, B<--output>=I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:67
-msgid "output to FILE (directory if split HTML),"
+#: original/man1/makeinfo.1:70
+msgid "output to FILE (or directory if split HTML)."
 msgstr ""
 
 #. type: SS
-#: original/man1/makeinfo.1:67
+#: original/man1/makeinfo.1:70
 #, no-wrap
 msgid "Options for Info and plain text:"
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:68
+#: original/man1/makeinfo.1:71
 #, no-wrap
-msgid "B<--enable-encoding>"
+msgid "B<--disable-encoding>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:72
+#: original/man1/makeinfo.1:75
 msgid ""
-"output accented and special characters in Info output based on "
+"do not output accented and special characters in Info output based on "
 "@documentencoding."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:72
+#: original/man1/makeinfo.1:75
+#, no-wrap
+msgid "B<--enable-encoding>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:78
+msgid "override B<--disable-encoding> (default)."
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:78
 #, no-wrap
 msgid "B<--fill-column>=I<NUM>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:75
+#: original/man1/makeinfo.1:81
 msgid "break Info lines at NUM characters (default 72)."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:75
+#: original/man1/makeinfo.1:81
 #, no-wrap
 msgid "B<--footnote-style>=I<STYLE>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:80
+#: original/man1/makeinfo.1:87
 msgid ""
 "output footnotes in Info according to STYLE: `separate' to put them in their "
-"own node; `end' to put them at the end of the node"
-msgstr ""
-
-#. type: Plain text
-#: original/man1/makeinfo.1:82
-msgid "in which they are defined (default)."
+"own node; `end' to put them at the end of the node, in which they are "
+"defined (this is the default)."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:82
+#: original/man1/makeinfo.1:87
 #, no-wrap
 msgid "B<--paragraph-indent>=I<VAL>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:87
+#: original/man1/makeinfo.1:92
 msgid ""
 "indent Info paragraphs by VAL spaces (default 3).  If VAL is `none', do not "
 "indent; if VAL is `asis', preserve existing indentation."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:87
+#: original/man1/makeinfo.1:92
 #, no-wrap
 msgid "B<--split-size>=I<NUM>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:90
-msgid "split Info files at size NUM (default 50000)."
+#: original/man1/makeinfo.1:95
+msgid "split Info files at size NUM (default 300000)."
 msgstr ""
 
 #. type: SS
-#: original/man1/makeinfo.1:90
+#: original/man1/makeinfo.1:95
 #, no-wrap
-msgid "Input file options:"
+msgid "Options for HTML:"
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:91
+#: original/man1/makeinfo.1:96
 #, no-wrap
-msgid "B<--commands-in-node-names>"
+msgid "B<--css-include>=I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:94
-msgid "allow @ commands in node names."
+#: original/man1/makeinfo.1:100
+msgid "include FILE in HTML E<lt>styleE<gt> output; read stdin if FILE is -."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:94
+#: original/man1/makeinfo.1:100
 #, no-wrap
-msgid "B<-D> VAR"
+msgid "B<--css-ref>=I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:97
-msgid "define the variable VAR, as with @set."
+#: original/man1/makeinfo.1:103
+msgid "generate reference to a CSS file."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:97 original/man1/texi2dvi.1:52
+#: original/man1/makeinfo.1:103
 #, no-wrap
-msgid "B<-I> DIR"
+msgid "B<--internal-links>=I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:100
-msgid "append DIR to the @include search path."
+#: original/man1/makeinfo.1:106
+msgid "produce list of internal links in FILE."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:100
+#: original/man1/makeinfo.1:106
 #, no-wrap
-msgid "B<-P> DIR"
+msgid "B<--transliterate-file-names>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:103
-msgid "prepend DIR to the @include search path."
+#: original/man1/makeinfo.1:109
+msgid "produce file names in ASCII transliteration."
+msgstr ""
+
+#. type: SS
+#: original/man1/makeinfo.1:109
+#, no-wrap
+msgid "Options for XML and Docbook:"
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:103
+#: original/man1/makeinfo.1:110
 #, no-wrap
-msgid "B<-U> VAR"
+msgid "B<--output-indent>=I<VAL>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:106
-msgid "undefine the variable VAR, as with @clear."
+#: original/man1/makeinfo.1:114
+msgid ""
+"indent XML elements by VAL spaces (default 2).  If VAL is 0, ignorable "
+"whitespace is dropped."
 msgstr ""
 
 #. type: SS
-#: original/man1/makeinfo.1:106
+#: original/man1/makeinfo.1:114
 #, no-wrap
-msgid "Conditional processing in input:"
+msgid "Input file options:"
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:107
+#: original/man1/makeinfo.1:115
 #, no-wrap
-msgid "B<--ifhtml>"
+msgid "B<--commands-in-node-names>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:110
+#: original/man1/makeinfo.1:118
+msgid "allow @ commands in node names."
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:118
+#, no-wrap
+msgid "B<-D> VAR"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:121
+msgid "define the variable VAR, as with @set."
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:121 original/man1/texi2dvi.1:65 original/man1/pdftexi2dvi.1:65 original/man1/texi2pdf.1:65
+#, no-wrap
+msgid "B<-I> DIR"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:124
+msgid "append DIR to the @include search path."
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:124
+#, no-wrap
+msgid "B<-P> DIR"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:127
+msgid "prepend DIR to the @include search path."
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:127
+#, no-wrap
+msgid "B<-U> VAR"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:130
+msgid "undefine the variable VAR, as with @clear."
+msgstr ""
+
+#. type: SS
+#: original/man1/makeinfo.1:130
+#, no-wrap
+msgid "Conditional processing in input:"
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:131
+#, no-wrap
+msgid "B<--ifdocbook>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:135
+msgid "process @ifdocbook and @docbook even if not generating Docbook."
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:135
+#, no-wrap
+msgid "B<--ifhtml>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:138
 msgid "process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:110
+#: original/man1/makeinfo.1:138
 #, no-wrap
 msgid "B<--ifinfo>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:113
+#: original/man1/makeinfo.1:141
 msgid "process @ifinfo even if not generating Info."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:113
+#: original/man1/makeinfo.1:141
 #, no-wrap
 msgid "B<--ifplaintext>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:116
+#: original/man1/makeinfo.1:144
 msgid "process @ifplaintext even if not generating plain text."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:116
+#: original/man1/makeinfo.1:144
 #, no-wrap
 msgid "B<--iftex>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:119
+#: original/man1/makeinfo.1:147
 msgid "process @iftex and @tex; implies B<--no-split>."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:119
+#: original/man1/makeinfo.1:147
 #, no-wrap
 msgid "B<--ifxml>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:122
+#: original/man1/makeinfo.1:150
 msgid "process @ifxml and @xml."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:122
+#: original/man1/makeinfo.1:150
+#, no-wrap
+msgid "B<--no-ifdocbook>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:153
+msgid "do not process @ifdocbook and @docbook text."
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:153
 #, no-wrap
 msgid "B<--no-ifhtml>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:125
+#: original/man1/makeinfo.1:156
 msgid "do not process @ifhtml and @html text."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:125
+#: original/man1/makeinfo.1:156
 #, no-wrap
 msgid "B<--no-ifinfo>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:128
+#: original/man1/makeinfo.1:159
 msgid "do not process @ifinfo text."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:128
+#: original/man1/makeinfo.1:159
 #, no-wrap
 msgid "B<--no-ifplaintext>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:131
+#: original/man1/makeinfo.1:162
 msgid "do not process @ifplaintext text."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:131
+#: original/man1/makeinfo.1:162
 #, no-wrap
 msgid "B<--no-iftex>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:134
+#: original/man1/makeinfo.1:165
 msgid "do not process @iftex and @tex text."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:134
+#: original/man1/makeinfo.1:165
 #, no-wrap
 msgid "B<--no-ifxml>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:137
+#: original/man1/makeinfo.1:168
 msgid "do not process @ifxml and @xml text."
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:142
+#: original/man1/makeinfo.1:170
+msgid "Also, for the B<--no-ifFORMAT> options, do process @ifnotFORMAT text."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:176
 msgid ""
 "The defaults for the @if... conditionals depend on the output format: if "
 "generating HTML, B<--ifhtml> is on and the others are off; if generating "
 "Info, B<--ifinfo> is on and the others are off; if generating plain text, "
-"B<--ifplaintext> is on and the others are off;"
+"B<--ifplaintext> is on and the others are off; if generating XML, B<--ifxml> "
+"is on and the others are off."
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:143
+#: original/man1/makeinfo.1:177
 #, no-wrap
 msgid "makeinfo foo.texi"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:146
+#: original/man1/makeinfo.1:180
 msgid "write Info to foo's @setfilename"
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:146
+#: original/man1/makeinfo.1:180
 #, no-wrap
 msgid "makeinfo B<--html> foo.texi"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:149
+#: original/man1/makeinfo.1:183
 msgid "write HTML to @setfilename"
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:149
+#: original/man1/makeinfo.1:183
 #, no-wrap
 msgid "makeinfo B<--xml> foo.texi"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:152
+#: original/man1/makeinfo.1:186
 msgid "write Texinfo XML to @setfilename"
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:152
+#: original/man1/makeinfo.1:186
 #, no-wrap
 msgid "makeinfo B<--docbook> foo.texi"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:155
+#: original/man1/makeinfo.1:189
 msgid "write DocBook XML to @setfilename"
 msgstr ""
 
 #. type: TP
-#: original/man1/makeinfo.1:155
+#: original/man1/makeinfo.1:189
 #, no-wrap
 msgid "makeinfo B<--no-headers> foo.texi"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:158
+#: original/man1/makeinfo.1:192
 msgid "write plain text to standard output"
 msgstr ""
 
+#. type: TP
+#: original/man1/makeinfo.1:192
+#, no-wrap
+msgid "makeinfo B<--html> B<--no-headers> foo.texi"
+msgstr ""
+
 #. type: Plain text
-#: original/man1/makeinfo.1:162
-msgid ""
-"makeinfo B<--html> B<--no-headers> foo.texi write html without node lines, "
-"menus makeinfo B<--number-sections> foo.texi write Info with numbered "
-"sections makeinfo B<--no-split> foo.texi write one Info file however big"
+#: original/man1/makeinfo.1:195
+msgid "write html without node lines, menus"
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:195
+#, no-wrap
+msgid "makeinfo B<--number-sections> foo.texi"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:198
+msgid "write Info with numbered sections"
+msgstr ""
+
+#. type: TP
+#: original/man1/makeinfo.1:198
+#, no-wrap
+msgid "makeinfo B<--no-split> foo.texi"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/makeinfo.1:201
+msgid "write one Info file however big"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:179
+#: original/man1/makeinfo.1:219
 msgid ""
 "The full documentation for B<makeinfo> is maintained as a Texinfo manual.  "
 "If the B<info> and B<makeinfo> programs are properly installed at your site, "
@@ -1039,227 +1396,505 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: original/man1/makeinfo.1:181
+#: original/man1/makeinfo.1:221
 msgid "B<info makeinfo>"
 msgstr ""
 
 #. type: TH
-#: original/man1/texi2dvi.1:2
+#: original/man1/texi2dvi.1:2 original/man1/pdftexi2dvi.1:2 original/man1/texi2pdf.1:2
 #, no-wrap
 msgid "TEXI2DVI"
 msgstr ""
 
 #. type: TH
-#: original/man1/texi2dvi.1:2
+#: original/man1/texi2dvi.1:2 original/man1/pdftexi2dvi.1:2 original/man1/texi2pdf.1:2
 #, no-wrap
-msgid "texi2dvi 1.14"
+msgid "texi2dvi 1.135"
 msgstr ""
 
 #. type: Plain text
 #: original/man1/texi2dvi.1:5
-msgid "texi2dvi - print Texinfo documents"
+msgid "texi2dvi - convert Texinfo documents to DVI"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:8
+#: original/man1/texi2dvi.1:8 original/man1/pdftexi2dvi.1:8 original/man1/texi2pdf.1:8
 msgid "B<texi2dvi> [I<OPTION>]... I<FILE>..."
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:13
+#: original/man1/texi2dvi.1:14 original/man1/pdftexi2dvi.1:14 original/man1/texi2pdf.1:14
 msgid ""
-"Run each Texinfo or LaTeX FILE through TeX in turn until all "
+"Run each Texinfo or (La)TeX FILE through TeX in turn until all "
 "cross-references are resolved, building all indices.  The directory "
 "containing each FILE is searched for included files.  The suffix of FILE is "
-"used to determine its language (LaTeX or Texinfo)."
+"used to determine its language ((La)TeX or Texinfo).  To process (e)plain "
+"TeX files, set the environment variable LATEX=tex."
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:16
+#: original/man1/texi2dvi.1:17 original/man1/pdftexi2dvi.1:17 original/man1/texi2pdf.1:17
 msgid ""
-"Makeinfo is used to perform Texinfo macro expansion before running TeX when "
-"needed."
+"In order to make texi2dvi a drop-in replacement of TeX/LaTeX in AUC-TeX, the "
+"FILE may also be composed of the following simple TeX commands."
 msgstr ""
 
-#. type: SS
-#: original/man1/texi2dvi.1:16
+#. type: TP
+#: original/man1/texi2dvi.1:17 original/man1/pdftexi2dvi.1:17 original/man1/texi2pdf.1:17
 #, no-wrap
-msgid "Operation modes:"
+msgid "`\\einput{FILE}'"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:20 original/man1/pdftexi2dvi.1:20 original/man1/texi2pdf.1:20
+msgid "the actual file to compile"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:17
+#: original/man1/texi2dvi.1:20 original/man1/pdftexi2dvi.1:20 original/man1/texi2pdf.1:20
 #, no-wrap
-msgid "B<-b>, B<--batch>"
+msgid "`\\enonstopmode'"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:20
-msgid "no interaction"
+#: original/man1/texi2dvi.1:23 original/man1/pdftexi2dvi.1:23 original/man1/texi2pdf.1:23
+msgid "same as B<--batch>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:26 original/man1/pdftexi2dvi.1:26 original/man1/texi2pdf.1:26
+msgid ""
+"Makeinfo is used to perform Texinfo macro expansion before running TeX when "
+"needed."
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:20
+#: original/man1/texi2dvi.1:27 original/man1/pdftexi2dvi.1:27 original/man1/texi2pdf.1:27
 #, no-wrap
-msgid "B<-c>, B<--clean>"
+msgid "B<-b>, B<--batch>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:23
-msgid "remove all auxiliary files"
+#: original/man1/texi2dvi.1:30 original/man1/pdftexi2dvi.1:30 original/man1/texi2pdf.1:30
+msgid "no interaction"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:23
+#: original/man1/texi2dvi.1:30 original/man1/pdftexi2dvi.1:30 original/man1/texi2pdf.1:30
 #, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:26
+#: original/man1/texi2dvi.1:33 original/man1/pdftexi2dvi.1:33 original/man1/texi2pdf.1:33
 msgid "turn on shell debugging (set B<-x>)"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:29
+#: original/man1/texi2dvi.1:36 original/man1/pdftexi2dvi.1:36 original/man1/texi2pdf.1:36
 msgid "display this help and exit successfully"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:29
+#: original/man1/texi2dvi.1:36 original/man1/pdftexi2dvi.1:36 original/man1/texi2pdf.1:36
 #, no-wrap
 msgid "B<-o>, B<--output>=I<OFILE>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:33
+#: original/man1/texi2dvi.1:40 original/man1/pdftexi2dvi.1:40 original/man1/texi2pdf.1:40
 msgid ""
-"leave output in OFILE (implies B<--clean>); Only one input FILE may be "
+"leave output in OFILE (implies B<--clean>); only one input FILE may be "
 "specified in this case"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:33
+#: original/man1/texi2dvi.1:40 original/man1/pdftexi2dvi.1:40 original/man1/texi2pdf.1:40
 #, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:36
+#: original/man1/texi2dvi.1:43 original/man1/pdftexi2dvi.1:43 original/man1/texi2pdf.1:43
 msgid "no output unless errors (implies B<--batch>)"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:36
+#: original/man1/texi2dvi.1:43 original/man1/pdftexi2dvi.1:43 original/man1/texi2pdf.1:43
 #, no-wrap
 msgid "B<-s>, B<--silent>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:39
+#: original/man1/texi2dvi.1:46 original/man1/pdftexi2dvi.1:46 original/man1/texi2pdf.1:46
 msgid "same as B<--quiet>"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:39
+#: original/man1/texi2dvi.1:46 original/man1/pdftexi2dvi.1:46 original/man1/texi2pdf.1:46
 #, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:42
+#: original/man1/texi2dvi.1:49 original/man1/pdftexi2dvi.1:49 original/man1/texi2pdf.1:49
 msgid "display version information and exit successfully"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:42
+#: original/man1/texi2dvi.1:49 original/man1/pdftexi2dvi.1:49 original/man1/texi2pdf.1:49
 #, no-wrap
 msgid "B<-V>, B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:45
+#: original/man1/texi2dvi.1:52 original/man1/pdftexi2dvi.1:52 original/man1/texi2pdf.1:52
 msgid "report on what is done"
 msgstr ""
 
 #. type: SS
-#: original/man1/texi2dvi.1:45
+#: original/man1/texi2dvi.1:52 original/man1/pdftexi2dvi.1:52 original/man1/texi2pdf.1:52
 #, no-wrap
 msgid "TeX tuning:"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:46
+#: original/man1/texi2dvi.1:53 original/man1/pdftexi2dvi.1:53 original/man1/texi2pdf.1:53
 #, no-wrap
 msgid "-@"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:49
-msgid "use @input instead of \\einput; for preloaded Texinfo"
+#: original/man1/texi2dvi.1:56 original/man1/pdftexi2dvi.1:56 original/man1/texi2pdf.1:56
+msgid "use @input instead of \\einput for preloaded Texinfo"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:56 original/man1/pdftexi2dvi.1:56 original/man1/texi2pdf.1:56
+#, no-wrap
+msgid "B<--dvi>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:59 original/man1/pdftexi2dvi.1:59 original/man1/texi2pdf.1:59
+msgid "output a DVI file [default]"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:49
+#: original/man1/texi2dvi.1:59 original/man1/pdftexi2dvi.1:59 original/man1/texi2pdf.1:59
+#, no-wrap
+msgid "B<--dvipdf>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:62 original/man1/pdftexi2dvi.1:62 original/man1/texi2pdf.1:62
+msgid "output a PDF file via DVI (using dvipdf)"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:62 original/man1/pdftexi2dvi.1:62 original/man1/texi2pdf.1:62
 #, no-wrap
 msgid "B<-e>, B<-E>, B<--expand>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:52
+#: original/man1/texi2dvi.1:65 original/man1/pdftexi2dvi.1:65 original/man1/texi2pdf.1:65
 msgid "force macro expansion using makeinfo"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:55
+#: original/man1/texi2dvi.1:68 original/man1/pdftexi2dvi.1:68 original/man1/texi2pdf.1:68
 msgid "search DIR for Texinfo files"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:55
+#: original/man1/texi2dvi.1:68 original/man1/pdftexi2dvi.1:68 original/man1/texi2pdf.1:68
 #, no-wrap
 msgid "B<-l>, B<--language>=I<LANG>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:58
-msgid "specify the LANG of FILE (LaTeX or Texinfo)"
+#: original/man1/texi2dvi.1:71 original/man1/pdftexi2dvi.1:71 original/man1/texi2pdf.1:71
+msgid "specify LANG for FILE, either latex or texinfo"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:71 original/man1/pdftexi2dvi.1:71 original/man1/texi2pdf.1:71
+#, no-wrap
+msgid "B<--no-line-error>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:74 original/man1/pdftexi2dvi.1:74 original/man1/texi2pdf.1:74
+msgid "do not pass B<--file-line-error> to TeX"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:58
+#: original/man1/texi2dvi.1:74 original/man1/pdftexi2dvi.1:74 original/man1/texi2pdf.1:74
 #, no-wrap
 msgid "B<-p>, B<--pdf>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:61
+#: original/man1/texi2dvi.1:77 original/man1/pdftexi2dvi.1:77 original/man1/texi2pdf.1:77
 msgid "use pdftex or pdflatex for processing"
 msgstr ""
 
 #. type: TP
-#: original/man1/texi2dvi.1:61
+#: original/man1/texi2dvi.1:77 original/man1/pdftexi2dvi.1:77 original/man1/texi2pdf.1:77
+#, no-wrap
+msgid "B<-r>, B<--recode>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:80 original/man1/pdftexi2dvi.1:80 original/man1/texi2pdf.1:80
+msgid "call recode before TeX to translate input"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:80 original/man1/pdftexi2dvi.1:80 original/man1/texi2pdf.1:80
+#, no-wrap
+msgid "B<--recode-from>=I<ENC>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:83 original/man1/pdftexi2dvi.1:83 original/man1/texi2pdf.1:83
+msgid "recode from ENC to the @documentencoding"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:83 original/man1/pdftexi2dvi.1:83 original/man1/texi2pdf.1:83
+#, no-wrap
+msgid "B<--src-specials>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:86 original/man1/pdftexi2dvi.1:86 original/man1/texi2pdf.1:86
+msgid "pass B<--src-specials> to TeX"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:86 original/man1/pdftexi2dvi.1:86 original/man1/texi2pdf.1:86
 #, no-wrap
-msgid "B<-t>, B<--texinfo>=I<CMD>"
+msgid "B<-t>, B<--command>=I<CMD>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:65
+#: original/man1/texi2dvi.1:89 original/man1/pdftexi2dvi.1:89 original/man1/texi2pdf.1:89
+msgid "insert CMD in copy of input file"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:89 original/man1/pdftexi2dvi.1:89 original/man1/texi2pdf.1:89
+#, no-wrap
+msgid "or B<--texinfo>=I<CMD>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:92 original/man1/pdftexi2dvi.1:92 original/man1/texi2pdf.1:92
+msgid "multiple values accumulate"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:92 original/man1/pdftexi2dvi.1:92 original/man1/texi2pdf.1:92
+#, no-wrap
+msgid "B<--translate-file>=I<FILE>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:95 original/man1/pdftexi2dvi.1:95 original/man1/texi2pdf.1:95
+msgid "use given charset translation file for TeX"
+msgstr ""
+
+#. type: SS
+#: original/man1/texi2dvi.1:95 original/man1/pdftexi2dvi.1:95 original/man1/texi2pdf.1:95
+#, no-wrap
+msgid "Build modes:"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:96 original/man1/pdftexi2dvi.1:96 original/man1/texi2pdf.1:96
+#, no-wrap
+msgid "B<--build>=I<MODE>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:99 original/man1/pdftexi2dvi.1:99 original/man1/texi2pdf.1:99
+msgid "specify the treatment of auxiliary files [local]"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:99 original/man1/pdftexi2dvi.1:99 original/man1/texi2pdf.1:99
+#, no-wrap
+msgid "B<--tidy>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:102 original/man1/pdftexi2dvi.1:102 original/man1/texi2pdf.1:102
+msgid "same as B<--build>=I<tidy>"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:102 original/man1/pdftexi2dvi.1:102 original/man1/texi2pdf.1:102
+#, no-wrap
+msgid "B<-c>, B<--clean>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:105 original/man1/pdftexi2dvi.1:105 original/man1/texi2pdf.1:105
+msgid "same as B<--build>=I<clean>"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:105 original/man1/pdftexi2dvi.1:105 original/man1/texi2pdf.1:105
+#, no-wrap
+msgid "B<--build-dir>=I<DIR>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:110 original/man1/pdftexi2dvi.1:110 original/man1/texi2pdf.1:110
+msgid ""
+"specify where the tidy compilation is performed; implies B<--tidy>; defaults "
+"to TEXI2DVI_BUILD_DIRECTORY [.]"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:110 original/man1/pdftexi2dvi.1:110 original/man1/texi2pdf.1:110
+#, no-wrap
+msgid "B<--mostly-clean>"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:114 original/man1/pdftexi2dvi.1:114 original/man1/texi2pdf.1:114
+msgid "remove the auxiliary files and directories but not the output"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:118 original/man1/pdftexi2dvi.1:118 original/man1/texi2pdf.1:118
+msgid ""
+"The MODE specifies where the TeX compilation takes place, and, as a "
+"consequence, how auxiliary files are treated.  The build mode can also be "
+"set using the environment variable TEXI2DVI_BUILD_MODE."
+msgstr ""
+
+#. type: SS
+#: original/man1/texi2dvi.1:118 original/man1/pdftexi2dvi.1:118 original/man1/texi2pdf.1:118
+#, no-wrap
+msgid "Valid MODEs are:"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:119 original/man1/pdftexi2dvi.1:119 original/man1/texi2pdf.1:119
+#, no-wrap
+msgid "`local'"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:123 original/man1/pdftexi2dvi.1:123 original/man1/texi2pdf.1:123
+msgid ""
+"compile in the current directory, leaving all the auxiliary files around.  "
+"This is the traditional TeX use."
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:123 original/man1/pdftexi2dvi.1:123 original/man1/texi2pdf.1:123
+#, no-wrap
+msgid "`tidy'"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:127 original/man1/pdftexi2dvi.1:127 original/man1/texi2pdf.1:127
+msgid ""
+"compile in a local *.t2d directory, where the auxiliary files are left.  "
+"Output files are copied back to the original file."
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:127 original/man1/pdftexi2dvi.1:127 original/man1/texi2pdf.1:127
+#, no-wrap
+msgid "`clean'"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:131 original/man1/pdftexi2dvi.1:131 original/man1/texi2pdf.1:131
+msgid ""
+"same as `tidy', but remove the auxiliary directory afterwards.  Every "
+"compilation therefore requires the full cycle."
+msgstr ""
+
+#. type: SS
+#: original/man1/texi2dvi.1:131 original/man1/pdftexi2dvi.1:131 original/man1/texi2pdf.1:131
+#, no-wrap
+msgid "Using the `tidy' mode brings several advantages:"
+msgstr ""
+
+#. type: TP
+#: original/man1/texi2dvi.1:132 original/man1/texi2dvi.1:135 original/man1/texi2dvi.1:139 original/man1/texi2dvi.1:143 original/man1/texi2dvi.1:148 original/man1/texi2dvi.1:152 original/man1/pdftexi2dvi.1:132 original/man1/pdftexi2dvi.1:135 original/man1/pdftexi2dvi.1:139 original/man1/pdftexi2dvi.1:143 original/man1/pdftexi2dvi.1:148 original/man1/pdftexi2dvi.1:152 original/man1/texi2pdf.1:132 original/man1/texi2pdf.1:135 original/man1/texi2pdf.1:139 original/man1/texi2pdf.1:143 original/man1/texi2pdf.1:148 original/man1/texi2pdf.1:152
+#, no-wrap
+msgid "-"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:135 original/man1/pdftexi2dvi.1:135 original/man1/texi2pdf.1:135
+msgid "the current directory is not cluttered with plethora of temporary files."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:139 original/man1/pdftexi2dvi.1:139 original/man1/texi2pdf.1:139
 msgid ""
-"insert CMD after @setfilename in copy of input file multiple values "
-"accumulate"
+"clutter can be even reduced using B<--build-dir>=I<dir>: all the *.t2d "
+"directories are stored there."
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:69
+#: original/man1/texi2dvi.1:143 original/man1/pdftexi2dvi.1:143 original/man1/texi2pdf.1:143
+msgid ""
+"clutter can be reduced to zero using, e.g., B<--build-dir=>/tmp/$USER.t2d or "
+"B<--build-dir=>$HOME/.t2d."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:148 original/man1/pdftexi2dvi.1:148 original/man1/texi2pdf.1:148
+msgid ""
+"the output file is updated after every succesful TeX run, for sake of "
+"concurrent visualization of the output.  In a `local' build the viewer stops "
+"during the whole TeX run."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:152 original/man1/pdftexi2dvi.1:152 original/man1/texi2pdf.1:152
+msgid ""
+"if the compilation fails, the previous state of the output file is "
+"preserved."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:156 original/man1/pdftexi2dvi.1:156 original/man1/texi2pdf.1:156
+msgid ""
+"PDF and DVI compilation are kept in separate subdirectories preventing any "
+"possibility of auxiliary file incompatibility."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:161 original/man1/pdftexi2dvi.1:161 original/man1/texi2pdf.1:161
+msgid ""
+"On the other hand, because `tidy' compilation takes place in another "
+"directory, occasionally TeX won't be able to find some files (e.g., when "
+"using \\egraphicspath): in that case use B<-I> to specify the additional "
+"directories to consider."
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texi2dvi.1:166 original/man1/pdftexi2dvi.1:166 original/man1/texi2pdf.1:166
 msgid ""
 "The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO, TEX (or "
-"PDFTEX), and TEXINDEX environment variables are used to run those commands, "
-"if they are set."
+"PDFTEX), TEXINDEX, and THUMBPDF environment variables are used to run those "
+"commands, if they are set.  Any CMD strings are added after @setfilename for "
+"Texinfo input, in the first line for LaTeX input."
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:73
+#: original/man1/texi2dvi.1:170 original/man1/pdftexi2dvi.1:170 original/man1/texi2pdf.1:170
 msgid ""
 "Email bug reports to E<lt>bug-texinfo@gnu.orgE<gt>, general questions and "
 "discussion to E<lt>help-texinfo@gnu.orgE<gt>.  Texinfo home page: "
@@ -1267,7 +1902,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:86
+#: original/man1/texi2dvi.1:184 original/man1/pdftexi2dvi.1:184 original/man1/texi2pdf.1:184
 msgid ""
 "The full documentation for B<texi2dvi> is maintained as a Texinfo manual.  "
 "If the B<info> and B<texi2dvi> programs are properly installed at your site, "
@@ -1275,7 +1910,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texi2dvi.1:88
+#: original/man1/texi2dvi.1:186 original/man1/pdftexi2dvi.1:186 original/man1/texi2pdf.1:186
 msgid "B<info texi2dvi>"
 msgstr ""
 
@@ -1288,7 +1923,7 @@ msgstr ""
 #. type: TH
 #: original/man1/texindex.1:2
 #, no-wrap
-msgid "texindex 4.4"
+msgid "texindex 4.13"
 msgstr ""
 
 #. type: Plain text
@@ -1316,73 +1951,109 @@ msgstr ""
 #. type: TP
 #: original/man1/texindex.1:15
 #, no-wrap
-msgid "B<-k>, B<--keep>"
+msgid "B<-o>, B<--output> FILE"
 msgstr ""
 
 #. type: Plain text
 #: original/man1/texindex.1:18
-msgid "keep temporary files around after processing"
+msgid "send output to FILE"
 msgstr ""
 
-#. type: TP
-#: original/man1/texindex.1:18
+#. type: Plain text
+#: original/man1/texindex.1:21
+msgid "display version information and exit"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texindex.1:39
+msgid ""
+"The full documentation for B<texindex> is maintained as a Texinfo manual.  "
+"If the B<info> and B<texindex> programs are properly installed at your site, "
+"the command"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/texindex.1:41
+msgid "B<info texindex>"
+msgstr ""
+
+#. type: TH
+#: original/man1/infokey.1:2
 #, no-wrap
-msgid "B<--no-keep>"
+msgid "INFOKEY"
+msgstr ""
+
+#. type: TH
+#: original/man1/infokey.1:2
+#, no-wrap
+msgid "infokey 4.13"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texindex.1:21
-msgid "do not keep temporary files around after processing (default)"
+#: original/man1/infokey.1:5
+msgid "infokey - compile customizations for Info"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/infokey.1:8
+msgid "B<infokey> [I<OPTION>]... [I<INPUT-FILE>]"
+msgstr ""
+
+#. type: Plain text
+#: original/man1/infokey.1:11
+msgid ""
+"Compile infokey source file to infokey file.  Reads INPUT-FILE (default "
+"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info."
 msgstr ""
 
 #. type: TP
-#: original/man1/texindex.1:21
+#: original/man1/infokey.1:12
 #, no-wrap
-msgid "B<-o>, B<--output> FILE"
+msgid "B<--output> FILE"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texindex.1:24
-msgid "send output to FILE"
+#: original/man1/infokey.1:15
+msgid "output to FILE instead of $HOME/.info"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texindex.1:27
-msgid "display version information and exit"
+#: original/man1/infokey.1:39
+msgid ""
+"The full documentation for B<infokey> is maintained as a Texinfo manual.  If "
+"the B<info> and B<infokey> programs are properly installed at your site, the "
+"command"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texindex.1:44
-msgid ""
-"The full documentation for B<texindex> is maintained as a Texinfo manual.  "
-"If the B<info> and B<texindex> programs are properly installed at your site, "
-"the command"
+#: original/man1/infokey.1:41
+msgid "B<info infokey>"
 msgstr ""
 
 #. type: Plain text
-#: original/man1/texindex.1:46
-msgid "B<info texindex>"
+#: original/man1/pdftexi2dvi.1:5 original/man1/texi2pdf.1:5
+msgid "texi2dvi - convert Texinfo documents to PDF"
 msgstr ""
 
 #. type: TH
-#: original/man5/info.5:20
+#: original/man5/info.5:30
 #, no-wrap
 msgid "GNU Info"
 msgstr ""
 
 #. type: TH
-#: original/man5/info.5:20 original/man5/texinfo.5:20
+#: original/man5/info.5:30 original/man5/texinfo.5:30
 #, no-wrap
 msgid "FSF"
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:23
+#: original/man5/info.5:33
 msgid "info - readable online documentation"
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:30
+#: original/man5/info.5:40
 msgid ""
 "The Info file format is an easily-parsable representation for online "
 "documents.  It can be read by I<emacs(1)> and I<info(1)> among other "
@@ -1390,14 +2061,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:36
+#: original/man5/info.5:46
 msgid ""
 "Info files are usually created from I<texinfo(5)> sources by I<makeinfo(1)>, "
 "but can be created from scratch if so desired."
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:40 original/man5/texinfo.5:31
+#: original/man5/info.5:50 original/man5/texinfo.5:41
 msgid ""
 "For a full description of the Texinfo language and associated tools, please "
 "see the Texinfo manual (written in Texinfo itself).  Most likely, running "
@@ -1405,87 +2076,89 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:42 original/man5/texinfo.5:33
-msgid "I<info texinfo>"
+#: original/man5/info.5:52 original/man5/texinfo.5:43
+#, no-wrap
+msgid "info texinfo\n"
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:44 original/man5/texinfo.5:35
+#: original/man5/info.5:54 original/man5/texinfo.5:45
 msgid "or this key sequence from inside Emacs:"
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:46 original/man5/texinfo.5:37
-msgid "I<M-x info RET m texinfo RET>"
+#: original/man5/info.5:56 original/man5/texinfo.5:47
+#, no-wrap
+msgid "M-x info RET m texinfo RET\n"
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:48 original/man5/texinfo.5:39
+#: original/man5/info.5:58 original/man5/texinfo.5:49
 msgid "will get you there."
 msgstr ""
 
 #. type: SH
-#: original/man5/info.5:48 original/man5/texinfo.5:39
+#: original/man5/info.5:58 original/man5/texinfo.5:49
 #, no-wrap
 msgid "AVAILABILITY"
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:50
+#: original/man5/info.5:60
 msgid "ftp://ftp.gnu.org/pub/gnu/texinfo-E<lt>versionE<gt>.tar.gz"
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:52 original/man5/texinfo.5:43
+#: original/man5/info.5:62 original/man5/texinfo.5:53
 msgid "or any GNU mirror site."
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:55 original/man5/texinfo.5:46
+#: original/man5/info.5:65 original/man5/texinfo.5:56
 msgid ""
 "Please send bug reports to bug-texinfo@gnu.org, general questions and "
 "discussion to help-texinfo@gnu.org."
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:57
+#: original/man5/info.5:67
 msgid "info(1), install-info(1), makeinfo(1), texi2dvi(1),"
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:59
+#: original/man5/info.5:69
 msgid "texindex(1)."
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:61 original/man5/texinfo.5:50
+#: original/man5/info.5:71 original/man5/texinfo.5:60
 msgid "emacs(1), tex(1)."
 msgstr ""
 
 #. type: Plain text
-#: original/man5/info.5:62
+#: original/man5/info.5:72
 msgid "texinfo(5)."
 msgstr ""
 
 #. type: TH
-#: original/man5/texinfo.5:20
+#: original/man5/texinfo.5:30
 #, no-wrap
 msgid "TEXINFO"
 msgstr ""
 
 #. type: TH
-#: original/man5/texinfo.5:20
+#: original/man5/texinfo.5:30
 #, no-wrap
 msgid "GNU Texinfo"
 msgstr ""
 
 #. type: Plain text
-#: original/man5/texinfo.5:23
+#: original/man5/texinfo.5:33
 msgid "texinfo - software documentation system"
 msgstr ""
 
 #. type: Plain text
-#: original/man5/texinfo.5:27
+#: original/man5/texinfo.5:37
 msgid ""
 "Texinfo is a documentation system that uses a single source file to produce "
 "both online information and printed output.  It is primarily designed for "
@@ -1493,16 +2166,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: original/man5/texinfo.5:41
+#: original/man5/texinfo.5:51
 msgid "ftp://ftp.gnu.org/gnu/texinfo/"
 msgstr ""
 
 #. type: Plain text
-#: original/man5/texinfo.5:48
+#: original/man5/texinfo.5:58
 msgid "info(1), install-info(1), makeinfo(1), texi2dvi(1), texindex(1)."
 msgstr ""
 
 #. type: Plain text
-#: original/man5/texinfo.5:51
+#: original/man5/texinfo.5:61
 msgid "info(5)."
 msgstr ""