571 files changed, 104496 insertions, 36370 deletions

diff --git a/Build/source/utils/README b/Build/source/utils/README
index 2511556c3b0..9f72b4aeee7 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -27,7 +27,7 @@ psutils p17 - ok 25nov06
 t1utils 1.34 - checked 2mar08
   http://www.lcdf.org/type/
 
-texinfo 4.8 - ok 25nov06
+texinfo 4.12 - ok 20apr08
 
 vlna - (old) only for Windows
 
diff --git a/Build/source/utils/texinfo/ABOUT-NLS b/Build/source/utils/texinfo/ABOUT-NLS
index 2f50c6693ef..83bc72ec268 100644
--- a/Build/source/utils/texinfo/ABOUT-NLS
+++ b/Build/source/utils/texinfo/ABOUT-NLS
@@ -1,10 +1,11 @@
-Notes on the Free Translation Project
-*************************************
+1 Notes on the Free Translation Project
+***************************************
 
 Free software is going international!  The Free Translation Project is
 a way to get maintainers of free software, translators, and users all
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
 
    If you found this `ABOUT-NLS' file inside a distribution, you may
 assume that the distributed package does use GNU `gettext' internally,
@@ -15,15 +16,15 @@ this package with messages translated.
    Installers will find here some useful hints.  These notes also
 explain how users should proceed for getting the programs to use the
 available translations.  They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
+work on translations can contact the appropriate team.
 
    When reporting bugs in the `intl/' directory or bugs which may be
 related to internationalization, you should tell about the version of
 `gettext' which is used.  The information can be found in the
 `intl/VERSION' file, in internationalized packages.
 
-Quick configuration advice
-==========================
+1.1 Quick configuration advice
+==============================
 
 If you want to exploit the full power of internationalization, you
 should configure it using
@@ -45,8 +46,8 @@ to change to GNU `gettext' as soon as possible.
 you have installed a recent copy of the GNU gettext package with the
 included `libintl'.
 
-INSTALL Matters
-===============
+1.2 INSTALL Matters
+===================
 
 Some packages are "localizable" when properly installed; the programs
 they contain can be made to speak your own native language.  Most such
@@ -55,27 +56,27 @@ internationalization, predating GNU `gettext'.
 
    By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
-provides the GNU `gettext' functions.  If not, the GNU `gettext' own
-library will be used.  This library is wholly contained within this
-package, usually in the `intl/' subdirectory, so prior installation of
-the GNU `gettext' package is _not_ required.  Installers may use
-special options at configuration time for changing the default
-behaviour.  The commands:
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
 
      ./configure --with-included-gettext
      ./configure --disable-nls
 
-will respectively bypass any pre-existing `gettext' to use the
+will, respectively, bypass any pre-existing `gettext' to use the
 internationalizing routines provided within this package, or else,
 _totally_ disable translation of messages.
 
    When you already have GNU `gettext' installed on your system and run
 configure without an option for your new package, `configure' will
 probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might be not what is desirable.  You
-should use the more recent version of the GNU `gettext' library.  I.e.
-if the file `intl/VERSION' shows that the library which comes with this
-package is more recent, you should use
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
 
      ./configure --with-included-gettext
 
@@ -86,7 +87,7 @@ and therefore it will not be used.  The reason is that even an
 emulation of `gettext' on top of `catgets' could not provide all the
 extensions of the GNU `gettext' library.
 
-   Internationalized packages have usually many `po/LL.po' files, where
+   Internationalized packages usually have many `po/LL.po' files, where
 LL gives an ISO 639 two-letter code identifying the language.  Unless
 translations have been forbidden at `configure' time by using the
 `--disable-nls' switch, all available translations are installed
@@ -95,13 +96,16 @@ may be set, prior to configuration, to limit the installed set.
 `LINGUAS' should then contain a space separated list of two-letter
 codes, stating which languages are allowed.
 
-Using This Package
-==================
+1.3 Using This Package
+======================
 
 As a user, if your language has been installed for this package, you
 only have to set the `LANG' environment variable to the appropriate
-`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
-and `CC' is an ISO 3166 two-letter country code.  For example, let's
+`LL_CC' combination.  If you happen to have the `LC_ALL' or some other
+`LC_xxx' environment variables set, you should unset them before
+setting `LANG', otherwise the setting of `LANG' will not have the
+desired effect.  Here `LL' is an ISO 639 two-letter language code, and
+`CC' is an ISO 3166 two-letter country code.  For example, let's
 suppose that you speak German and live in Germany.  At the shell
 prompt, merely execute `setenv LANG de_DE' (in `csh'),
 `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
@@ -117,8 +121,8 @@ country code serves to distinguish the dialects.
 language and `CC' denoting the country, is the one use on systems based
 on GNU libc.  On other systems, some variations of this scheme are
 used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
-locales supported by your system for your country by running the command
-`locale -a | grep '^LL''.
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
 
    Not all programs have translations for all languages.  By default, an
 English message is shown in place of a nonexistent translation.  If you
@@ -144,16 +148,15 @@ to denote the language's main dialect.  For example, `de' is equivalent
 to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
 (Portuguese as spoken in Portugal) in this context.
 
-Translating Teams
-=================
+1.4 Translating Teams
+=====================
 
 For the Free Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
 able to synergize with other translators speaking the same language.
 Each translation team has its own mailing list.  The up-to-date list of
 teams can be found at the Free Translation Project's homepage,
-`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
-area.
+`http://translationproject.org/', in the "Teams" area.
 
    If you'd like to volunteer to _work_ at translating messages, you
 should become a member of the translating team for your own language.
@@ -167,569 +170,866 @@ message to `sv-request@li.org', having this message body:
 _actively_ in translations, or at solving translational difficulties,
 rather than merely lurking around.  If your team does not exist yet and
 you want to start one, or if you are unsure about what to do or how to
-get started, please write to `translation@iro.umontreal.ca' to reach the
-coordinator for all translator teams.
+get started, please write to `coordinator@translationproject.org' to
+reach the coordinator for all translator teams.
 
    The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skill are praised more than
-programming skill, here.
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
 
-Available Packages
-==================
+1.5 Available Packages
+======================
 
 Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of January
-2004.  The matrix shows, in regard of each package, for which languages
+matrix shows the current state of internationalization, as of November
+2007.  The matrix shows, in regard of each package, for which languages
 PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 
-     Ready PO files       af am ar az be bg bs ca cs da de el en en_GB eo es
+     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB eo
                         +----------------------------------------------------+
-     a2ps               |             []             [] [] []                |
-     aegis              |                               ()                   |
-     ant-phone          |                               ()                   |
-     anubis             |                                                    |
+     Compendium         |                      []       [] []        []      |
+     a2ps               |             []                [] [] []     []      |
+     aegis              |                                  ()                |
+     ant-phone          |                                  ()                |
+     anubis             |                                  []                |
      ap-utils           |                                                    |
-     aspell             |             []                                     |
-     bash               |                      []       []             [] [] |
-     batchelor          |                                                    |
-     bfd                |                            []                   [] |
-     binutils           |                            []                   [] |
-     bison              |                            [] []                [] |
-     bluez-pin          | []                      []                   []    |
-     clisp              |                                                    |
-     clisp              |                               []    []          [] |
-     console-tools      |                         []    []                   |
-     coreutils          |                      []    [] []                [] |
-     cpio               |                            [] []                [] |
-     darkstat           |                []          ()                   [] |
-     diffutils          |                      [] [] [] [] []          [] [] |
-     e2fsprogs          |                         []    []                [] |
-     enscript           |                      []    [] []        []         |
-     error              |                      []    [] []        []      [] |
-     fetchmail          |                      [] () [] [] []             [] |
-     fileutils          |                            [] []                [] |
-     findutils          |             []       []    [] [] []          [] [] |
-     flex               |                      []    [] []                [] |
+     aspell             |                      [] []    [] []        []      |
+     bash               |                                                 [] |
+     bfd                |                                                    |
+     bibshelf           |                                  []                |
+     binutils           |                                                    |
+     bison              |                               [] []                |
+     bison-runtime      |                                  []                |
+     bluez-pin          | []                      []       [] []          [] |
+     cflow              |                               []                   |
+     clisp              |                               [] []    []          |
+     console-tools      |                         []       []                |
+     coreutils          |                []    [] []       []                |
+     cpio               |                                                    |
+     cpplib             |                      []       [] []                |
+     cryptonit          |                                  []                |
+     dialog             |                                                    |
+     diffutils          |                      [] []    [] [] []          [] |
+     doodle             |                                  []                |
+     e2fsprogs          |                         []       []                |
+     enscript           |                      []       [] []        []      |
+     fetchmail          |                      []       [] () []     []      |
+     findutils          |                []                                  |
+     findutils_stable   |                []    []       []                   |
+     flex               |                      []       [] []                |
      fslint             |                                                    |
-     gas                |                                                 [] |
-     gawk               |                      []    [] []                [] |
-     gbiff              |                               []                   |
+     gas                |                                                    |
+     gawk               |                      []       [] []                |
      gcal               |                      []                            |
-     gcc                |                            []                   [] |
-     gettext            |             []       []    [] []                [] |
-     gettext-examples   | []                   []       []                [] |
-     gettext-runtime    |             []       []    [] []                [] |
-     gettext-tools      |                      []       []                [] |
-     gimp-print         |                         [] [] []        []      [] |
-     gliv               |                                                    |
-     glunarclock        |                            [] []                   |
-     gnubiff            |                               []                   |
-     gnucash            |                         []    ()        []      [] |
-     gnucash-glossary   |                            [] ()                [] |
-     gnupg              |                      [] ()    [] []          [] [] |
-     gpe-aerial         |                         []                         |
-     gpe-beam           |                         []    []                   |
-     gpe-calendar       |                         []    []                   |
-     gpe-clock          |                         []    []                   |
-     gpe-conf           |                         []    []                   |
-     gpe-contacts       |                         []    []                   |
+     gcc                |                                  []                |
+     gettext-examples   | []                   []          [] []          [] |
+     gettext-runtime    |             []       []       [] []             [] |
+     gettext-tools      |                      []          []                |
+     gip                |                []                                  |
+     gliv               |                []                []                |
+     glunarclock        |                []                                  |
+     gmult              | []                               []                |
+     gnubiff            |                                  ()                |
+     gnucash            |                      [] []       () ()     []      |
+     gnuedu             |                                                    |
+     gnulib             |                []                                  |
+     gnunet             |                                                    |
+     gnunet-gtk         |                                                    |
+     gnutls             |                                  []                |
+     gpe-aerial         |                         []       []                |
+     gpe-beam           |                         []       []                |
+     gpe-calendar       |                                                    |
+     gpe-clock          |                         []       []                |
+     gpe-conf           |                         []       []                |
+     gpe-contacts       |                                                    |
      gpe-edit           |                         []                         |
+     gpe-filemanager    |                                                    |
      gpe-go             |                         []                         |
-     gpe-login          |                         []    []                   |
-     gpe-ownerinfo      |                         []    []                   |
-     gpe-sketchbook     |                         []    []                   |
-     gpe-su             |                         []    []                   |
-     gpe-taskmanager    |                         []    []                   |
+     gpe-login          |                         []       []                |
+     gpe-ownerinfo      |                         []       []                |
+     gpe-package        |                                                    |
+     gpe-sketchbook     |                         []       []                |
+     gpe-su             |                         []       []                |
+     gpe-taskmanager    |                         []       []                |
      gpe-timesheet      |                         []                         |
-     gpe-today          |                         []    []                   |
-     gpe-todo           |                         []    []                   |
-     gphoto2            |                         [] [] []                [] |
-     gprof              |                            [] []                [] |
-     gpsdrive           |                               ()    ()          () |
-     gramadoir          |                               []                   |
-     grep               |             [] []    []       [] []             [] |
-     gretl              |                                                 [] |
-     gtick              | []                            ()                   |
-     hello              |                      []    [] [] []          [] [] |
-     id-utils           |                            [] []                   |
-     indent             |                      []       []             [] [] |
-     iso_3166           |          []    [] [] [] [] [] [] []          [] [] |
-     iso_3166_1         |                      [] [] [] [] []             [] |
+     gpe-today          |                         []       []                |
+     gpe-todo           |                                                    |
+     gphoto2            |                         []    [] []        []      |
+     gprof              |                               [] []                |
+     gpsdrive           |                                                    |
+     gramadoir          | []                               []                |
+     grep               |                         []                      [] |
+     gretl              |                                  ()                |
+     gsasl              |                                                    |
+     gss                |                                                    |
+     gst-plugins-bad    |                []             []                   |
+     gst-plugins-base   |                []             []                   |
+     gst-plugins-good   |                []    []       []                   |
+     gst-plugins-ugly   |                []             []                   |
+     gstreamer          | []             []    [] []    [] []        []      |
+     gtick              |                                  ()                |
+     gtkam              |             []          []    [] []                |
+     gtkorphan          |                []                []                |
+     gtkspell           |             []                   [] []          [] |
+     gutenprint         |                               []                   |
+     hello              |                []    []       [] []             [] |
+     herrie             |                                  []                |
+     hylafax            |                                                    |
+     idutils            |                               [] []                |
+     indent             |                      [] []       []             [] |
+     iso_15924          |                                                    |
+     iso_3166           |       []    [] [] [] [] [] [] [] [] []          [] |
      iso_3166_2         |                                                    |
-     iso_3166_3         |                               []                   |
-     iso_4217           |                      []    [] []                [] |
-     iso_639            |                                                    |
-     jpilot             |                         [] []                   [] |
+     iso_4217           |                         []    [] []                |
+     iso_639            |                         []    [] []             [] |
+     jpilot             |                         []                         |
      jtag               |                                                    |
-     jwhois             |                                                 [] |
-     kbd                |                         [] [] [] []             [] |
-     latrine            |                               ()                   |
-     ld                 |                            []                   [] |
-     libc               |                      [] [] [] [] []             [] |
-     libgpewidget       |                         []    []                   |
-     libiconv           |                      []    [] []             [] [] |
-     lifelines          |                            [] ()                   |
-     lilypond           |                               []                   |
+     jwhois             |                                                    |
+     kbd                |                         []    [] [] []             |
+     keytouch           |                      []          []                |
+     keytouch-editor    |                                  []                |
+     keytouch-keyboa... |                      []                            |
+     latrine            |                                  ()                |
+     ld                 |                               []                   |
+     leafpad            |                []    [] []       [] []             |
+     libc               |                      [] []    [] []                |
+     libexif            |                                  []                |
+     libextractor       |                                  []                |
+     libgpewidget       |                         []    [] []                |
+     libgpg-error       |                                  []                |
+     libgphoto2         |                               [] []                |
+     libgphoto2_port    |                               [] []                |
+     libgsasl           |                                                    |
+     libiconv           |                                  []             [] |
+     libidn             |                         []    []                [] |
+     lifelines          |                               [] ()                |
+     lilypond           |                                  []                |
      lingoteach         |                                                    |
-     lingoteach_lessons |                               ()                () |
-     lynx               |                      [] [] [] []                   |
-     m4                 |                         [] [] [] []                |
-     mailutils          |                      []                         [] |
-     make               |                            [] []                [] |
-     man-db             |                      [] () [] []                () |
-     minicom            |                         []    []                [] |
-     mysecretdiary      |                            [] []                [] |
-     nano               |                      [] () [] []                [] |
-     nano_1_0           |                      [] () [] []                [] |
-     opcodes            |                                                 [] |
-     parted             |                      [] [] [] []                [] |
-     ptx                |                      []    [] []             [] [] |
-     python             |                                                    |
-     radius             |                                                 [] |
-     recode             |             []       []    [] [] []          [] [] |
-     rpm                |                         [] []                      |
+     lprng              |                                                    |
+     lynx               |                      [] []    [] []                |
+     m4                 |                         []    [] [] []             |
+     mailfromd          |                                                    |
+     mailutils          |                      []                            |
+     make               |                               [] []                |
+     man-db             |                      []       [] []                |
+     minicom            |                         []    [] []                |
+     nano               |                []    []          []                |
+     opcodes            |                                  []                |
+     parted             |                         []       []                |
+     pilot-qof          |                                                    |
+     popt               |                         []    [] []                |
+     psmisc             |                []                                  |
+     pwdutils           |                                                    |
+     qof                |                                                    |
+     radius             |                      []                            |
+     recode             |             []       []       [] [] []          [] |
+     rpm                |                               []                   |
      screem             |                                                    |
-     scrollkeeper       |             []       [] [] [] []                [] |
-     sed                | []                   []    [] []             [] [] |
-     sh-utils           |                            [] []                [] |
-     shared-mime-info   |                                                    |
-     sharutils          |                      [] [] [] [] []             [] |
-     silky              |                               ()                   |
-     skencil            |                            [] ()                [] |
-     sketch             |                            [] ()                [] |
-     soundtracker       |                            [] []                [] |
-     sp                 |                               []                   |
-     tar                |                         [] [] []                [] |
-     texinfo            |                            [] []             []    |
-     textutils          |                      []    [] []                [] |
-     tin                |                               ()        ()         |
-     tp-robot           |                                                    |
-     tuxpaint           |                      [] [] [] [] []     []      [] |
+     scrollkeeper       |          [] []       [] [] [] [] []        []      |
+     sed                |                      []          []             [] |
+     shared-mime-info   |                []    [] []    [] () []     []   [] |
+     sharutils          |                []    [] []    [] [] []             |
+     shishi             |                                                    |
+     skencil            |                               [] ()                |
+     solfege            |                                                    |
+     soundtracker       |                               [] []                |
+     sp                 |                                  []                |
+     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
+     tar                |                []                []                |
+     texinfo            |                               [] []             [] |
+     tin                |                                  ()        ()      |
+     tuxpaint           | []             []             [] []        []   [] |
      unicode-han-tra... |                                                    |
      unicode-transla... |                                                    |
-     util-linux         |                      [] [] [] []                [] |
-     vorbis-tools       |             []          [] []                   [] |
-     wastesedge         |                               ()                   |
-     wdiff              |                      []    [] []                [] |
-     wget               |                []    []    [] [] []             [] |
-     xchat              |                      []       [] []             [] |
-     xfree86_xkb_xml    |                         [] []                      |
-     xpad               |                                                 [] |
+     util-linux         |                      [] []    [] []                |
+     util-linux-ng      |                      [] []    [] []                |
+     vorbis-tools       |                         []                         |
+     wastesedge         |                                  ()                |
+     wdiff              |                      []       [] []        []      |
+     wget               |                      [] []       []                |
+     xchat              |             [] []    [] []       [] []     []      |
+     xkeyboard-config   |                []                                  |
+     xpad               |                []             []           []      |
                         +----------------------------------------------------+
-                          af am ar az be bg bs ca cs da de el en en_GB eo es
-                           4  0  0  1  9  4  1 40 41 60 78 17  1   5   13 68
-     
-                          et eu fa fi fr ga gl he hr hu id is it ja ko lg
-                        +-------------------------------------------------+
-     a2ps               | []       [] []                      ()    ()    |
-     aegis              |                                                 |
-     ant-phone          |             []                                  |
-     anubis             |             []                                  |
-     ap-utils           |             []                                  |
-     aspell             |             [] []                               |
-     bash               |             []             []                   |
-     batchelor          |             [] []                               |
-     bfd                |             []                                  |
-     binutils           |             []                         []       |
-     bison              | []          []                []    []          |
-     bluez-pin          |          [] [] []          [] []                |
-     clisp              |                                                 |
-     clisp              |             []                                  |
-     console-tools      |                                                 |
-     coreutils          | []       [] [] []                   [] []       |
-     cpio               |             []    []       []             []    |
-     darkstat           |             () []          [] []                |
-     diffutils          |          [] []    [] []    [] []       []       |
-     e2fsprogs          |                                                 |
-     enscript           |             []          []                      |
-     error              |          [] [] []          []                   |
-     fetchmail          |                                        []       |
-     fileutils          | []          [] []          []       [] []       |
-     findutils          | []       [] [] [] []    [] [] []    [] [] []    |
-     flex               |             [] []                         []    |
-     fslint             |             []                                  |
-     gas                |             []                                  |
-     gawk               |             []       []                []       |
-     gbiff              |             []                                  |
-     gcal               |             []                                  |
-     gcc                |             []                                  |
-     gettext            |             []                         [] []    |
-     gettext-examples   |             []                         []       |
-     gettext-runtime    |          [] []                []       [] []    |
-     gettext-tools      |             []                         [] []    |
-     gimp-print         |             []                         []       |
-     gliv               |             ()                                  |
-     glunarclock        |          []    [] []       []                   |
-     gnubiff            |             []                                  |
-     gnucash            |             ()                      []          |
-     gnucash-glossary   |                                     []          |
-     gnupg              | []       [] []    []          []    [] []       |
-     gpe-aerial         |             []                                  |
-     gpe-beam           |             []                                  |
-     gpe-calendar       |             []             [] []                |
-     gpe-clock          |             []                                  |
-     gpe-conf           |             []                                  |
-     gpe-contacts       |             []             []                   |
-     gpe-edit           |             []                []                |
-     gpe-go             |             []                                  |
-     gpe-login          |             []             []                   |
-     gpe-ownerinfo      |             []             [] []                |
-     gpe-sketchbook     |             []                                  |
-     gpe-su             |             []                                  |
-     gpe-taskmanager    |             []                                  |
-     gpe-timesheet      |             [] []             []                |
-     gpe-today          |             [] []                               |
-     gpe-todo           |             []                []                |
-     gphoto2            |             []             []          []       |
-     gprof              |             []                []                |
-     gpsdrive           |             ()                      () ()       |
-     gramadoir          |             [] []                               |
-     grep               | []       [] [] [] [] [] [] [] []    [] []       |
-     gretl              |             []                      []          |
-     gtick              |          [] [] []                               |
-     hello              | []    [] [] [] [] [] [] [] [] []    [] [] []    |
-     id-utils           |             []             [] []    []          |
-     indent             | []       [] [] [] []       [] []    [] []       |
-     iso_3166           |    []       [] []       [] [] []    []          |
-     iso_3166_1         |    []       [] []          [] []                |
-     iso_3166_2         |                                                 |
-     iso_3166_3         |                                                 |
-     iso_4217           | []          []    []       []       [] []       |
-     iso_639            |                                                 |
-     jpilot             |             []                         ()       |
-     jtag               |             []                                  |
-     jwhois             |             []             [] []    []          |
-     kbd                |             []                                  |
-     latrine            |             []                                  |
-     ld                 |             []                                  |
-     libc               |          [] []    []       []          [] []    |
-     libgpewidget       |             [] []          [] []                |
-     libiconv           | []       [] [] [] []    [] [] []    []          |
-     lifelines          |             ()                                  |
-     lilypond           |             []                                  |
-     lingoteach         |             []                []                |
-     lingoteach_lessons |                                                 |
-     lynx               | []                         []       [] []       |
-     m4                 |             []    []          []       []       |
-     mailutils          |                                                 |
-     make               |             []    [] [] []             [] []    |
-     man-db             |                                     () ()       |
-     minicom            |          [] []             []          []       |
-     mysecretdiary      |             []                []                |
-     nano               |             []    []          []    []          |
-     nano_1_0           |             []    []          []    []          |
-     opcodes            |             []                                  |
-     parted             |             []    []                   []       |
-     ptx                | []       [] [] [] []       [] []                |
-     python             |                                                 |
-     radius             |             []                                  |
-     recode             |             []    [] []    [] []    []          |
-     rpm                |             []                            []    |
-     screem             |                                                 |
-     scrollkeeper       |                            []                   |
-     sed                | []       [] [] [] []       [] []    [] []       |
-     sh-utils           | []       [] [] []          []       [] []       |
-     shared-mime-info   |          [] []             []                   |
-     sharutils          | []          []    []       []          []       |
-     silky              |          () []             ()       ()          |
-     skencil            |             []                                  |
-     sketch             |             []                                  |
-     soundtracker       |             []                      []          |
-     sp                 |             []                         ()       |
-     tar                | []       [] []    []    [] [] []    [] []       |
-     texinfo            |             []       [] []             []       |
-     textutils          |             [] [] []       []          [] []    |
-     tin                | []          ()                                  |
-     tp-robot           |             []                                  |
-     tuxpaint           |          [] []       []    [] [] [] [] [] []    |
-     unicode-han-tra... |                                                 |
-     unicode-transla... |             [] []                               |
-     util-linux         | []       [] []             []       () []       |
-     vorbis-tools       |             []                                  |
-     wastesedge         |             ()                                  |
-     wdiff              | []          [] [] []       [] []                |
-     wget               | []       [] []    []    [] []          []       |
-     xchat              | []       [] []                                  |
-     xfree86_xkb_xml    |             []             []                   |
-     xpad               |             [] []                               |
-                        +-------------------------------------------------+
-                          et eu fa fi fr ga gl he hr hu id is it ja ko lg
-                          22  2  1 26 106 28 24  8 10 41 33  1 26 33 12  0
-     
-                          lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
-                        +-----------------------------------------------------+
-     a2ps               |             []       []    ()     ()     []   [] [] |
-     aegis              |                      ()                       () () |
-     ant-phone          |                      []                       []    |
-     anubis             |             []    [] []           []          [] [] |
-     ap-utils           |                      []           ()          []    |
-     aspell             |                      []                             |
-     bash               |                                          []   [] [] |
-     batchelor          |                                               []    |
-     bfd                |                                               []    |
-     binutils           |                                                  [] |
-     bison              |             []       []                  []   [] [] |
-     bluez-pin          |                      []           []          []    |
-     clisp              |                                                     |
-     clisp              |                      []                             |
-     console-tools      |                                                  [] |
-     coreutils          |                                   []             [] |
-     cpio               |                      []           []     []   [] [] |
-     darkstat           |             []       []                  []   []    |
-     diffutils          |             []       []           []     []   [] [] |
-     e2fsprogs          |                                   []                |
-     enscript           |                      []                  []   [] [] |
-     error              |                      []                  []   []    |
-     fetchmail          |                      []           []     ()      [] |
-     fileutils          |                                   []          [] [] |
-     findutils          |                      []           []     []   [] [] |
-     flex               |                                   []     []   [] [] |
-     fslint             |                      []                       []    |
-     gas                |                                                     |
-     gawk               |                                   []     []   []    |
-     gbiff              |                      []                       []    |
-     gcal               |                                                     |
-     gcc                |                                                     |
-     gettext            |                                   []          [] [] |
-     gettext-examples   |                      []           []          []    |
-     gettext-runtime    |                      []           []          [] [] |
-     gettext-tools      |                                   []          []    |
-     gimp-print         |                      []                             |
-     gliv               |                      []                  []   []    |
-     glunarclock        |             []       []                       [] [] |
-     gnubiff            |                      []                             |
-     gnucash            |                      []              []  ()      [] |
-     gnucash-glossary   |                      []              []             |
-     gnupg              |                                               []    |
-     gpe-aerial         |                      []              []       [] [] |
-     gpe-beam           |                      []              []       [] [] |
-     gpe-calendar       |                      []              []       [] [] |
-     gpe-clock          |                      []              []       [] [] |
-     gpe-conf           |                      []              []       [] [] |
-     gpe-contacts       |                      []              []       [] [] |
-     gpe-edit           |                      []              []       [] [] |
-     gpe-go             |                      []                       [] [] |
-     gpe-login          |                      []              []       [] [] |
-     gpe-ownerinfo      |                      []              []       [] [] |
-     gpe-sketchbook     |                      []              []       [] [] |
-     gpe-su             |                      []              []       [] [] |
-     gpe-taskmanager    |                      []              []       [] [] |
-     gpe-timesheet      |                      []              []       [] [] |
-     gpe-today          |                      []              []       [] [] |
-     gpe-todo           |                      []              []       [] [] |
-     gphoto2            |                                               []    |
-     gprof              |                                          []   []    |
-     gpsdrive           |                      ()    ()                 []    |
-     gramadoir          |                      ()                       []    |
-     grep               |                                   [] []  []   [] [] |
-     gretl              |                                                     |
-     gtick              |                      []                       [] [] |
-     hello              |    []       []    [] [] [] []     []     []   [] [] |
-     id-utils           |                      []                  []   [] [] |
-     indent             |                      []                  []   [] [] |
-     iso_3166           |          []                [] []                    |
-     iso_3166_1         |                      []    []                       |
-     iso_3166_2         |                                                     |
-     iso_3166_3         |                      []                             |
-     iso_4217           |          []          [] [] []     [] []  []      [] |
-     iso_639            |          []                                         |
-     jpilot             |                      ()    ()                       |
-     jtag               |                                                     |
-     jwhois             |                      []           []     []   [] () |
-     kbd                |                      []           []          []    |
-     latrine            |                                               []    |
-     ld                 |                                                     |
-     libc               |                   []       []     []     []         |
-     libgpewidget       |                      []              []       []    |
-     libiconv           |                      []           []     []   [] [] |
-     lifelines          |                                                     |
-     lilypond           |                                                     |
-     lingoteach         |                                                     |
-     lingoteach_lessons |                                                     |
-     lynx               |                      []                  []      [] |
-     m4                 |                      []           []     []   [] [] |
-     mailutils          |                                   []          [] [] |
-     make               |                      []           []     []      [] |
-     man-db             |                                               []    |
-     minicom            |                                   []     []   [] [] |
-     mysecretdiary      |                      []                  []   []    |
-     nano               |             []       []           []          [] [] |
-     nano_1_0           |             []    []    []        []          [] [] |
-     opcodes            |                      []                       []    |
-     parted             |                         []        [] []  []         |
-     ptx                |                   [] []    []     [] []  []   [] [] |
-     python             |                                                     |
-     radius             |                                   []             [] |
-     recode             |                                   []     []   [] [] |
-     rpm                |                                   [] []          [] |
-     screem             |                                                     |
-     scrollkeeper       |                   [] []           []          [] [] |
-     sed                |                                   []     []   []    |
-     sh-utils           |                   []                             [] |
-     shared-mime-info   |                      [] []                          |
-     sharutils          |                      []                          [] |
-     silky              |                                                  () |
-     skencil            |                                      []  []         |
-     sketch             |                                      []  []         |
-     soundtracker       |                                                     |
-     sp                 |                                                     |
-     tar                |             []    []       []     []     []   []    |
-     texinfo            |                   []              []          [] [] |
-     textutils          |                   []                             [] |
-     tin                |                                                     |
-     tp-robot           |                      []                             |
-     tuxpaint           | []          []       [] []        [] []  []   []    |
-     unicode-han-tra... |                                                     |
-     unicode-transla... |                                                     |
-     util-linux         |                      []                  []      [] |
-     vorbis-tools       |                      []                       [] [] |
-     wastesedge         |                                                     |
-     wdiff              |             []                    []     []   [] [] |
-     wget               |                                   []          [] [] |
-     xchat              |    []                []                          [] |
-     xfree86_xkb_xml    |                      []                          [] |
-     xpad               |                      []                       []    |
-                        +-----------------------------------------------------+
-                          lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
-                           1  2  0  3 12  0 10 69  6  7  1  40 26  36   76 63
-     
-                          sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
-                        +-----------------------------------------------------+
-     a2ps               |    []    []       [] []                             | 16
-     aegis              |                                                     |  0
-     ant-phone          |                                                     |  3
-     anubis             |                   [] []                             |  9
-     ap-utils           |                      ()                             |  3
-     aspell             |                                                     |  4
-     bash               |                                                     |  9
-     batchelor          |                                                     |  3
-     bfd                |          []       []                                |  6
-     binutils           |          []       []                  []            |  8
-     bison              |          []       []                                | 14
-     bluez-pin          | []       []                    []                   | 14
-     clisp              |                                                     |  0
-     clisp              |                                                     |  5
-     console-tools      |                                                     |  3
-     coreutils          |    []    []       []                        []      | 16
-     cpio               |          []                           []            | 14
-     darkstat           | []    [] []                           ()    ()      | 12
-     diffutils          |          []       []                        []      | 23
-     e2fsprogs          |          []       []                                |  6
-     enscript           |          []       []                                | 12
-     error              | []                []                        []      | 15
-     fetchmail          | []                []                                | 11
-     fileutils          |    []    []       []                  []    []      | 17
-     findutils          | [] [] [] []       []                  []            | 29
-     flex               |          []       []                                | 13
-     fslint             |                                                     |  3
-     gas                |                   []                                |  3
-     gawk               |          []       []                                | 12
-     gbiff              |                                                     |  4
-     gcal               |          []       []                                |  4
-     gcc                |                   []                                |  4
-     gettext            | [] []    []       []                        []      | 16
-     gettext-examples   | []    [] []       []                  []            | 14
-     gettext-runtime    | [] [] [] []       [] []               []    []      | 22
-     gettext-tools      | [] [] [] []       []                  []            | 14
-     gimp-print         | []       []                                         | 10
-     gliv               |                                                     |  3
-     glunarclock        |       [] []                    []                   | 13
-     gnubiff            |                                                     |  3
-     gnucash            | []                                          []      |  9
-     gnucash-glossary   | []       []                                 []      |  8
-     gnupg              | []       []       []                        []      | 17
-     gpe-aerial         |          []                                         |  7
-     gpe-beam           |          []                                         |  8
-     gpe-calendar       | []       []                    []           []      | 13
-     gpe-clock          | []    [] []                                         | 10
-     gpe-conf           | []       []                                         |  9
-     gpe-contacts       | []       []                                 []      | 11
-     gpe-edit           | []    [] []                    []           []      | 12
-     gpe-go             |                                                     |  5
-     gpe-login          | []    [] []                    []           []      | 13
-     gpe-ownerinfo      | []    [] []                                 []      | 13
-     gpe-sketchbook     | []       []                                         |  9
-     gpe-su             | []    [] []                                         | 10
-     gpe-taskmanager    | []    [] []                                         | 10
-     gpe-timesheet      | []    [] []                                 []      | 12
-     gpe-today          | []    [] []                    []           []      | 13
-     gpe-todo           | []       []                    []           []      | 12
-     gphoto2            | []       []                           []            | 11
-     gprof              |          []       []                                |  9
-     gpsdrive           | []       []                                         |  3
-     gramadoir          | []                                                  |  5
-     grep               |    [] []          [] []                             | 26
-     gretl              |                                                     |  3
-     gtick              |                                                     |  7
-     hello              | []    [] []       [] []                             | 34
-     id-utils           |          []       []                                | 12
-     indent             | []    [] []       []                                | 21
-     iso_3166           | [] [] [] []       []    []     []                   | 27
-     iso_3166_1         | [] []             []                                | 16
-     iso_3166_2         |                                                     |  0
-     iso_3166_3         |                                                     |  2
-     iso_4217           | [] []    []       [] []               []            | 24
-     iso_639            |                                                     |  1
-     jpilot             |          []       []        []        []    []      |  9
-     jtag               | []                                                  |  2
-     jwhois             |          ()       []                        []      | 11
-     kbd                |          []       []                                | 11
-     latrine            |                                                     |  2
-     ld                 |          []       []                                |  5
-     libc               | []       []       []                  []            | 20
-     libgpewidget       | []    [] []                    []                   | 13
-     libiconv           | [] [] [] []       [] []        []     []            | 27
-     lifelines          |          []                                         |  2
-     lilypond           |          []                                         |  3
-     lingoteach         |                                                     |  2
-     lingoteach_lessons |                                       ()            |  0
-     lynx               |          []       [] []                             | 14
-     m4                 |          []                           []            | 15
-     mailutils          |                                                     |  5
-     make               |          []       []                  []            | 16
-     man-db             |          []                                         |  5
-     minicom            |                                                     | 11
-     mysecretdiary      |          []       []                                | 10
-     nano               |       [] []       [] []                             | 17
-     nano_1_0           |          []       [] []                             | 17
-     opcodes            |          []       []                                |  6
-     parted             |          []       []                  []            | 15
-     ptx                |          []       []                                | 22
-     python             |                                                     |  0
-     radius             |                                                     |  4
-     recode             |    []    []       []                                | 20
-     rpm                |          []       []                                |  9
-     screem             |          []                           []            |  2
-     scrollkeeper       | []    [] []                                         | 15
-     sed                | [] [] [] []       [] []                             | 24
-     sh-utils           |    []             []                                | 14
-     shared-mime-info   |       [] []                                         |  7
-     sharutils          |       [] []       []                        []      | 17
-     silky              | ()                                                  |  3
-     skencil            |          []                                         |  6
-     sketch             |          []                                         |  6
-     soundtracker       | []       []                                         |  7
-     sp                 |                   []                                |  3
-     tar                | [] []    []       []                  []            | 24
-     texinfo            |          []       []                  []            | 14
-     textutils          |    []    []       []                        []      | 16
-     tin                |                                                     |  1
-     tp-robot           |                                                     |  2
-     tuxpaint           | []       []       []           []     []            | 29
-     unicode-han-tra... |                                                     |  0
-     unicode-transla... |                                                     |  2
-     util-linux         |          []       []                                | 15
-     vorbis-tools       |                                                     |  8
-     wastesedge         |                                                     |  0
-     wdiff              | []       []       []                                | 18
-     wget               | [] [] [] []       [] []               []    []      | 24
-     xchat              | [] [] [] []                           []            | 15
-     xfree86_xkb_xml    | []    []          [] []               []            | 11
-     xpad               |                                                     |  5
-                        +-----------------------------------------------------+
-       63 teams           sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
-      131 domains         47 19 28 83  0  0 59 13  1   1 11  0  22    22    0  1373
+                          af am ar az be bg bs ca cs cy da de el en en_GB eo
+                           6  0  2  1  8 26  2 40 48  2 56 88 15  1  15   18
+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                        +--------------------------------------------------+
+     Compendium         | []          [] []  []                []          |
+     a2ps               |    []       [] []                             () |
+     aegis              |                                                  |
+     ant-phone          |                []                                |
+     anubis             |                []                                |
+     ap-utils           |             [] []                                |
+     aspell             |                []  []                         [] |
+     bash               | []                                               |
+     bfd                | []          []                                   |
+     bibshelf           | []                 []                         [] |
+     binutils           | []          [] []                                |
+     bison              | [] []          []  []                   []    [] |
+     bison-runtime      |    []          []  []                   []    [] |
+     bluez-pin          |             [] []  []                [] []       |
+     cflow              |                    []                            |
+     clisp              | []             []                                |
+     console-tools      |                                                  |
+     coreutils          | [] []       [] []  []                []          |
+     cpio               | []             []  []                            |
+     cpplib             | []             []                                |
+     cryptonit          |                []                                |
+     dialog             |       []           []                         [] |
+     diffutils          | []          [] []  [] []    []       [] []    [] |
+     doodle             |                    []                         [] |
+     e2fsprogs          | []             []                             [] |
+     enscript           |                []  []             []             |
+     fetchmail          | []                                               |
+     findutils          |    []              []                []          |
+     findutils_stable   |    []          []  []                []          |
+     flex               | []             []  []                            |
+     fslint             |                                                  |
+     gas                | []             []                                |
+     gawk               | []             []  []       []                () |
+     gcal               | []             []                                |
+     gcc                | []                                               |
+     gettext-examples   | []          [] []  []                [] []    [] |
+     gettext-runtime    | []          [] []  []                   []    [] |
+     gettext-tools      | []    []       []                             [] |
+     gip                | []    []       []  []                            |
+     gliv               |                ()                                |
+     glunarclock        |             []     []                []          |
+     gmult              |       []       []                             [] |
+     gnubiff            |                ()                             () |
+     gnucash            | ()             ()                    ()          |
+     gnuedu             | []                                               |
+     gnulib             | [] []              []                            |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gpe-aerial         | []             []                                |
+     gpe-beam           | []             []                                |
+     gpe-calendar       |                                                  |
+     gpe-clock          | []          [] []                    []          |
+     gpe-conf           |                []                                |
+     gpe-contacts       | []             []                                |
+     gpe-edit           | []             []                    [] []       |
+     gpe-filemanager    | []                                               |
+     gpe-go             | []             []                    []          |
+     gpe-login          | []             []                    []          |
+     gpe-ownerinfo      | []          [] []                    [] []       |
+     gpe-package        | []                                               |
+     gpe-sketchbook     | []             []                                |
+     gpe-su             | []          [] []                    []          |
+     gpe-taskmanager    | []          [] []                                |
+     gpe-timesheet      | []             []  []                   []       |
+     gpe-today          | []          [] []  []                            |
+     gpe-todo           | []                                               |
+     gphoto2            | []          [] []                    []       [] |
+     gprof              | []          [] []  []                   []       |
+     gpsdrive           |    []                                            |
+     gramadoir          |                []  []                            |
+     grep               | []          []     []                            |
+     gretl              | []    []       []                             () |
+     gsasl              |                    []                   []       |
+     gss                |                []  []                            |
+     gst-plugins-bad    | []          []                       []       [] |
+     gst-plugins-base   | []          []                       []       [] |
+     gst-plugins-good   | []    []    []                       []       [] |
+     gst-plugins-ugly   | []          []                       []       [] |
+     gstreamer          |             []                       []       [] |
+     gtick              |             []     []                         [] |
+     gtkam              | []             []                    []       [] |
+     gtkorphan          |                []                             [] |
+     gtkspell           | []    []    [] []  []                []       [] |
+     gutenprint         |                                      []          |
+     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
+     herrie             |                    []                            |
+     hylafax            |                                                  |
+     idutils            |                []  []                [] []    [] |
+     indent             | [] [] []    [] []  [] []             [] []    [] |
+     iso_15924          |                []                                |
+     iso_3166           | [] [] []    [] []     [] [] [] [] [] [] []    [] |
+     iso_3166_2         |                []                                |
+     iso_4217           | [] []       [] []                    []       [] |
+     iso_639            | []       [] [] []  []                []          |
+     jpilot             | []             []                                |
+     jtag               |                []                                |
+     jwhois             | []             []                    [] []    [] |
+     kbd                | []             []                                |
+     keytouch           |                []  []                         [] |
+     keytouch-editor    |                    []                            |
+     keytouch-keyboa... |                    []                         [] |
+     latrine            |                    []                         [] |
+     ld                 | []          [] []  []                            |
+     leafpad            | []             []  []       []       []       [] |
+     libc               | []          [] []     []             []          |
+     libexif            | []                                               |
+     libextractor       |                    []                            |
+     libgpewidget       | []             []  []                [] []       |
+     libgpg-error       |                []                                |
+     libgphoto2         | []             []                             [] |
+     libgphoto2_port    |                []                             [] |
+     libgsasl           |                []  []                            |
+     libiconv           |    []       []     []                            |
+     libidn             |                []                             [] |
+     lifelines          |                ()                                |
+     lilypond           | []          [] []                                |
+     lingoteach         |                []                       []    [] |
+     lprng              |                                                  |
+     lynx               |    []                                []       [] |
+     m4                 |                []  [] []                []       |
+     mailfromd          |                                                  |
+     mailutils          | []             []                                |
+     make               | []          [] []  [] []    []    []    []       |
+     man-db             |                                               [] |
+     minicom            | []          [] []                    []          |
+     nano               | []    []       []  [] []             []       [] |
+     opcodes            | []          [] []  []                            |
+     parted             |                []                       []    [] |
+     pilot-qof          |                                                  |
+     popt               |                []  [] []                   []    |
+     psmisc             |                                      []       [] |
+     pwdutils           |                                                  |
+     qof                |                                         []       |
+     radius             | []             []                                |
+     recode             | []             []  [] []    []       [] []    [] |
+     rpm                |                []                       []       |
+     screem             |                                                  |
+     scrollkeeper       | []          []                       []          |
+     sed                | [] []          []  []                []          |
+     shared-mime-info   | []    []    [] []                    []       [] |
+     sharutils          | [] []       [] []  [] []             []       [] |
+     shishi             |                []                                |
+     skencil            | []             []                                |
+     solfege            |                                               [] |
+     soundtracker       | []             []                             [] |
+     sp                 |                []                                |
+     system-tools-ba... | []    []    [] []  []             [] [] []    [] |
+     tar                |    [] []    []     []                []          |
+     texinfo            |                []           []       []          |
+     tin                |    []          ()                                |
+     tuxpaint           |                    []                []          |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                []  []                            |
+     util-linux         | [] []       [] []                    [] []    [] |
+     util-linux-ng      | [] []       [] []                    [] []    [] |
+     vorbis-tools       |                                                  |
+     wastesedge         |                ()                                |
+     wdiff              | [] []          []  [] []             [] []    [] |
+     wget               |    []       [] []  []             [] [] []    [] |
+     xchat              | []          [] []        []    []    []       [] |
+     xkeyboard-config   | []          [] []                    []          |
+     xpad               | []                 []                []          |
+                        +--------------------------------------------------+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                          85 22 14  2 48 101 61 12  2  8  2  6 53 29  1 52
+
+                          ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl  nn
+                        +--------------------------------------------------+
+     Compendium         |                                           []     |
+     a2ps               |       ()                      []          []     |
+     aegis              |                                           ()     |
+     ant-phone          |                                           []     |
+     anubis             |                               []    []    []     |
+     ap-utils           |                               []                 |
+     aspell             |                            []             []     |
+     bash               |                                           []     |
+     bfd                |                                                  |
+     bibshelf           |                               []                 |
+     binutils           |                                                  |
+     bison              |                               []    []    []     |
+     bison-runtime      |                               []    []    []     |
+     bluez-pin          |          []                   []          []     |
+     cflow              |                                                  |
+     clisp              |                                           []     |
+     console-tools      |                                                  |
+     coreutils          |                                           []     |
+     cpio               |                                           []     |
+     cpplib             |                                           []     |
+     cryptonit          |                                           []     |
+     dialog             |                               []          []     |
+     diffutils          | []                            []          []     |
+     doodle             |                                                  |
+     e2fsprogs          |                                           []     |
+     enscript           |                                           []     |
+     fetchmail          | []                                        []     |
+     findutils          |                                           []     |
+     findutils_stable   |                                           []     |
+     flex               |       []                                  []     |
+     fslint             |                                                  |
+     gas                |                                                  |
+     gawk               | []                                        []     |
+     gcal               |                                                  |
+     gcc                |                                                  |
+     gettext-examples   | []                            []          []     |
+     gettext-runtime    | []    []                                  []     |
+     gettext-tools      | []    []                                         |
+     gip                |                               []          []     |
+     gliv               |                                           []     |
+     glunarclock        |                               []          []     |
+     gmult              | []                            []          []     |
+     gnubiff            |                                                  |
+     gnucash            | ()                                  () ()        |
+     gnuedu             |                                                  |
+     gnulib             | []                                        []     |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gnutls             |                               []                 |
+     gpe-aerial         |                                           []     |
+     gpe-beam           |                                           []     |
+     gpe-calendar       | []                                               |
+     gpe-clock          | []    []                                  []     |
+     gpe-conf           | []    []                                  []     |
+     gpe-contacts       |       []                                         |
+     gpe-edit           | []    []                                  []     |
+     gpe-filemanager    | []    []                                         |
+     gpe-go             | []    []                                  []     |
+     gpe-login          | []    []                                  []     |
+     gpe-ownerinfo      | []                                        []     |
+     gpe-package        | []    []                                         |
+     gpe-sketchbook     |       []                                  []     |
+     gpe-su             | []    []                                  []     |
+     gpe-taskmanager    | []    [] []                               []     |
+     gpe-timesheet      |                                           []     |
+     gpe-today          | []                                        []     |
+     gpe-todo           | []                                               |
+     gphoto2            | []                                        []     |
+     gprof              |                               []                 |
+     gpsdrive           |                                           []     |
+     gramadoir          |                                           ()     |
+     grep               |             []                            []     |
+     gretl              |                                                  |
+     gsasl              |                                           []     |
+     gss                |                                                  |
+     gst-plugins-bad    |                                           []     |
+     gst-plugins-base   |                                           []     |
+     gst-plugins-good   |                                           []     |
+     gst-plugins-ugly   |                                           []     |
+     gstreamer          |                                           []     |
+     gtick              |                                           []     |
+     gtkam              | []                                        []     |
+     gtkorphan          |                                           []     |
+     gtkspell           |                            []             []     |
+     gutenprint         |                                           []     |
+     hello              | [] [] []                      []    []    []  [] |
+     herrie             |                                           []     |
+     hylafax            |                                                  |
+     idutils            |                                           []     |
+     indent             | []                                        []     |
+     iso_15924          |                                           []     |
+     iso_3166           | []    [] []       []    []          []    []  [] |
+     iso_3166_2         |                                           []     |
+     iso_4217           | []                []                      []     |
+     iso_639            | []                []                      []  [] |
+     jpilot             | ()                                        ()     |
+     jtag               |                                                  |
+     jwhois             |                                           []     |
+     kbd                |                                           []     |
+     keytouch           |                                           []     |
+     keytouch-editor    |                                           []     |
+     keytouch-keyboa... |                                                  |
+     latrine            |                                           []     |
+     ld                 |                                                  |
+     leafpad            | []                []                             |
+     libc               | []    []                                  []     |
+     libexif            |                                                  |
+     libextractor       |                                                  |
+     libgpewidget       |                                           []     |
+     libgpg-error       |                                                  |
+     libgphoto2         | []                                               |
+     libgphoto2_port    | []                                               |
+     libgsasl           |                                           []     |
+     libiconv           |                                           []     |
+     libidn             | []                                        []     |
+     lifelines          |                                           []     |
+     lilypond           |                                           []     |
+     lingoteach         |                                           []     |
+     lprng              |                                                  |
+     lynx               | []                                        []     |
+     m4                 | []                                        []     |
+     mailfromd          |                                                  |
+     mailutils          |                                                  |
+     make               | []    []                                  []     |
+     man-db             |                                                  |
+     minicom            | []                                               |
+     nano               |                               []    []    []     |
+     opcodes            |                                           []     |
+     parted             | []                                        []     |
+     pilot-qof          |                                                  |
+     popt               | []    []                                  []     |
+     psmisc             | []                                  []    []     |
+     pwdutils           |                                                  |
+     qof                |                                                  |
+     radius             |                                                  |
+     recode             |                                           []     |
+     rpm                | []    []                                         |
+     screem             | []                                               |
+     scrollkeeper       |                                     [] [] []  [] |
+     sed                | []                                        []     |
+     shared-mime-info   | []    []          []          []    []    []  [] |
+     sharutils          | []                                        []     |
+     shishi             |                                                  |
+     skencil            |                                                  |
+     solfege            |                                     ()        () |
+     soundtracker       |                                                  |
+     sp                 | ()                                               |
+     system-tools-ba... | []    []          []                      []     |
+     tar                | []          []                            []     |
+     texinfo            |                                     []    []     |
+     tin                |                                                  |
+     tuxpaint           |                                     ()    []  [] |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         | []                                        []     |
+     util-linux-ng      | []                                        []     |
+     vorbis-tools       |                                                  |
+     wastesedge         |                                           []     |
+     wdiff              |                               []    []           |
+     wget               | []                                        []     |
+     xchat              | []    []                []                []     |
+     xkeyboard-config   |    [] []                                  []     |
+     xpad               |       []                      []          []     |
+                        +--------------------------------------------------+
+                          ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl  nn
+                          51  2 25  3  2  0  6  0  2  2 20  0 11  1 103  6
+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                        +--------------------------------------------------+
+     Compendium         |          []  []      []       []          []     |
+     a2ps               |       ()     []      [] []       []    [] []     |
+     aegis              |                      () ()                       |
+     ant-phone          |                      []                   []     |
+     anubis             |       []             [] []                       |
+     ap-utils           |       ()                                         |
+     aspell             |                      [] []    []                 |
+     bash               |       []                      []                 |
+     bfd                |                                                  |
+     bibshelf           |                                           []     |
+     binutils           |                         []    []                 |
+     bison              |       []     []      [] []                []     |
+     bison-runtime      |       []     []      []          []       []     |
+     bluez-pin          |       []     []   [] [] []    [] []    [] []     |
+     cflow              |       []                                         |
+     clisp              |                         []                       |
+     console-tools      |                         []                       |
+     coreutils          |       []                []       []       []     |
+     cpio               |       []                []                []     |
+     cpplib             |                                           []     |
+     cryptonit          |              []                           []     |
+     dialog             |                                           []     |
+     diffutils          |       []     []      [] []             [] []     |
+     doodle             |                                     []    []     |
+     e2fsprogs          |       []                                  []     |
+     enscript           |              []      [] []       []       []     |
+     fetchmail          |       []                []          []           |
+     findutils          |       [] []                               []     |
+     findutils_stable   |       [] []          []       [] []       []     |
+     flex               |       []     []      [] []                []     |
+     fslint             |                                           []     |
+     gas                |                                                  |
+     gawk               |       []     []      []                   []     |
+     gcal               |                                           []     |
+     gcc                |                                        [] []     |
+     gettext-examples   |       [] []          [] []    [] []    [] []     |
+     gettext-runtime    |       [] []          [] []    [] []    [] []     |
+     gettext-tools      |       []             [] []    [] []    [] []     |
+     gip                |                   []          []       [] []     |
+     gliv               |       []     []      [] []    []          []     |
+     glunarclock        |              []      [] []    []       [] []     |
+     gmult              |                   [] []                [] []     |
+     gnubiff            |                      ()                   []     |
+     gnucash            |       ()                                  []     |
+     gnuedu             |                                                  |
+     gnulib             |       []                         []       []     |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                           []     |
+     gnutls             |       []                                  []     |
+     gpe-aerial         |          []  []      [] []       []    [] []     |
+     gpe-beam           |          []  []      [] []       []    [] []     |
+     gpe-calendar       |                         []       []    [] []     |
+     gpe-clock          |          []  []      [] []    [] []    [] []     |
+     gpe-conf           |          []  []      [] []    [] []       []     |
+     gpe-contacts       |                      [] []       []    [] []     |
+     gpe-edit           |       [] []  []      [] []    [] []    [] []     |
+     gpe-filemanager    |                                  []       []     |
+     gpe-go             |       []     []      [] []    [] []    [] []     |
+     gpe-login          |          []  []      [] []    [] []    [] []     |
+     gpe-ownerinfo      |          []  []      [] []    [] []    [] []     |
+     gpe-package        |                                  []       []     |
+     gpe-sketchbook     |          []  []      [] []    [] []    [] []     |
+     gpe-su             |          []  []      [] []    [] []    [] []     |
+     gpe-taskmanager    |          []  []      [] []    [] []    [] []     |
+     gpe-timesheet      |          []  []      [] []    [] []    [] []     |
+     gpe-today          |          []  []      [] []    [] []    [] []     |
+     gpe-todo           |                         []       []    [] []     |
+     gphoto2            |    [] []             []       []       [] []     |
+     gprof              |              []      []                   []     |
+     gpsdrive           |                         []                []     |
+     gramadoir          |                               []          []     |
+     grep               |       []                      [] []       []     |
+     gretl              |       [] []  []                                  |
+     gsasl              |       []                               [] []     |
+     gss                |       []             []       []          []     |
+     gst-plugins-bad    |       []     []                           []     |
+     gst-plugins-base   |       []                                  []     |
+     gst-plugins-good   |       []                                  []     |
+     gst-plugins-ugly   |       []     []                           []     |
+     gstreamer          |       []                            [] [] []     |
+     gtick              |                         []                       |
+     gtkam              |    [] []     []         []                []     |
+     gtkorphan          |                                           []     |
+     gtkspell           |              []   [] [] []    [] []    [] []     |
+     gutenprint         |                                           []     |
+     hello              |       []     []      [] []    [] []    [] []     |
+     herrie             |       []                []                []     |
+     hylafax            |                                                  |
+     idutils            |       []     []      [] []                []     |
+     indent             |       []     []      [] []    []       [] []     |
+     iso_15924          |                                                  |
+     iso_3166           |    [] [] []  []      [] [] [] [] [] [] [] []  [] |
+     iso_3166_2         |                                                  |
+     iso_4217           |       [] []             [] []    []    [] []     |
+     iso_639            |       []                [] [] [] []    [] []     |
+     jpilot             |                                                  |
+     jtag               |                               []                 |
+     jwhois             |       []     []      []                   []     |
+     kbd                |       []             []                   []     |
+     keytouch           |                                           []     |
+     keytouch-editor    |                                           []     |
+     keytouch-keyboa... |                                           []     |
+     latrine            |                                                  |
+     ld                 |                                           []     |
+     leafpad            |       [] []             []    []          []  [] |
+     libc               |       []                []    []          []     |
+     libexif            |       []                      []                 |
+     libextractor       |                      []                   []     |
+     libgpewidget       |       [] []  []      []       [] []    [] []     |
+     libgpg-error       |       []             []                   []     |
+     libgphoto2         |       []                                         |
+     libgphoto2_port    |       []                []                []     |
+     libgsasl           |       []             []                [] []     |
+     libiconv           |                                  []    [] []     |
+     libidn             |       []                               [] ()     |
+     lifelines          |       []                                  []     |
+     lilypond           |                                                  |
+     lingoteach         |              []                                  |
+     lprng              |       []                                         |
+     lynx               |              []         []                []     |
+     m4                 |       []     []      [] []                []     |
+     mailfromd          |       []                                         |
+     mailutils          |       []                []                []     |
+     make               |       []     []         []                []     |
+     man-db             |       []             [] []                []     |
+     minicom            |       []     []      [] []                []     |
+     nano               |              []      [] []                []     |
+     opcodes            |                      []                   []     |
+     parted             |       []                                         |
+     pilot-qof          |                                                  |
+     popt               |       [] []             []                []     |
+     psmisc             |       []                                  []     |
+     pwdutils           |       []                                  []     |
+     qof                |              []                           []     |
+     radius             |       []                []                       |
+     recode             |       [] []  []      [] []       []       []     |
+     rpm                |       [] []             []                []     |
+     screem             |                                                  |
+     scrollkeeper       |       []             [] []    []    [] [] []     |
+     sed                |       [] []  []      [] []    [] []    [] []     |
+     shared-mime-info   |       [] []  []                     [] [] []     |
+     sharutils          |       []                []             [] []     |
+     shishi             |       []                                         |
+     skencil            |          []  []                           []     |
+     solfege            |              []                                  |
+     soundtracker       |                               []          []     |
+     sp                 |                                                  |
+     system-tools-ba... |    [] [] []  []      []             [] [] []  [] |
+     tar                |       []                []       []       []     |
+     texinfo            |       []             [] []                []     |
+     tin                |                         ()                       |
+     tuxpaint           |       [] []                      [] [] [] []     |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         |              []         []       []       []     |
+     util-linux-ng      |              []         []       []       []     |
+     vorbis-tools       |                         []                       |
+     wastesedge         |                                                  |
+     wdiff              |       []     []      [] []    [] []       []     |
+     wget               |          []             []    []          []     |
+     xchat              |    []                   []    [] [] [] [] []     |
+     xkeyboard-config   |                               [] []       []     |
+     xpad               |                               [] []       []     |
+                        +--------------------------------------------------+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                           0  5 77 31  53    4 58 72  3 45 46  9 45 122  3
+
+                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+                        +---------------------------------------------------+
+     Compendium         |          []        []         []          []      | 19
+     a2ps               |          [] []     []                             | 19
+     aegis              |                    []                             |  1
+     ant-phone          |          []        []                             |  6
+     anubis             |          [] []     []                             | 11
+     ap-utils           |             ()     []                             |  4
+     aspell             |             []     []  []                         | 16
+     bash               |          []                                       |  6
+     bfd                |                                                   |  2
+     bibshelf           |                    []                             |  7
+     binutils           |          [] []     []                     []      |  9
+     bison              |          [] []     []                     []      | 20
+     bison-runtime      |             []     []         []          []      | 18
+     bluez-pin          |          [] []     []  []     []          []      | 28
+     cflow              |             []     []                             |  5
+     clisp              |                                                   |  9
+     console-tools      |          []        []                             |  5
+     coreutils          |          [] []     []                             | 18
+     cpio               |          [] []     []         []                  | 11
+     cpplib             |          [] []     []         []          []      | 12
+     cryptonit          |                    []                             |  6
+     dialog             |                    []  []     []                  |  9
+     diffutils          |          [] []     []         []          []      | 29
+     doodle             |                    []                             |  6
+     e2fsprogs          |          []        []                             | 10
+     enscript           |          [] []     []                             | 16
+     fetchmail          |          []        []                             | 12
+     findutils          |          [] []     []                             | 11
+     findutils_stable   |          [] []     []                     []      | 18
+     flex               |          []        []                             | 15
+     fslint             |                    []                             |  2
+     gas                |          []                                       |  3
+     gawk               |          []        []         []                  | 16
+     gcal               |          []                                       |  5
+     gcc                |          []                   []          []      |  7
+     gettext-examples   |          [] []     []         []    []    []      | 29
+     gettext-runtime    |          [] []     []         []    []    []      | 28
+     gettext-tools      |          [] []     []         []          []      | 20
+     gip                |                    []                     []      | 13
+     gliv               |          []        []                             | 11
+     glunarclock        |                    []  []                 []      | 15
+     gmult              |          []        []         []          []      | 16
+     gnubiff            |                    []                             |  2
+     gnucash            |          () []                                    |  5
+     gnuedu             |                    []                             |  2
+     gnulib             |                    []                             | 10
+     gnunet             |                                                   |  0
+     gnunet-gtk         |          []        []                             |  3
+     gnutls             |                                                   |  4
+     gpe-aerial         |                    []         []                  | 14
+     gpe-beam           |                    []         []                  | 14
+     gpe-calendar       |                    []  []                         |  7
+     gpe-clock          |          []        []  []     []                  | 21
+     gpe-conf           |                    []  []     []                  | 16
+     gpe-contacts       |                    []         []                  | 10
+     gpe-edit           |          []        []  []     []          []      | 22
+     gpe-filemanager    |                    []  []                         |  7
+     gpe-go             |          []        []  []     []                  | 19
+     gpe-login          |          []        []  []     []          []      | 21
+     gpe-ownerinfo      |          []        []         []          []      | 21
+     gpe-package        |                    []                             |  6
+     gpe-sketchbook     |          []        []                             | 16
+     gpe-su             |          []        []  []     []                  | 21
+     gpe-taskmanager    |          []        []  []     []                  | 21
+     gpe-timesheet      |          []        []         []          []      | 18
+     gpe-today          |          []        []  []     []          []      | 21
+     gpe-todo           |                    []  []                         |  8
+     gphoto2            |             []     []         []          []      | 21
+     gprof              |          []        []                             | 13
+     gpsdrive           |                    []                             |  5
+     gramadoir          |                    []                             |  7
+     grep               |                    []                             | 12
+     gretl              |                                                   |  6
+     gsasl              |                    []         []          []      |  9
+     gss                |                    []                             |  7
+     gst-plugins-bad    |             []     []         []                  | 13
+     gst-plugins-base   |             []     []                             | 11
+     gst-plugins-good   |             []     []         []    []    []      | 16
+     gst-plugins-ugly   |             []     []         []                  | 13
+     gstreamer          |          [] []     []                             | 18
+     gtick              |             []     []                             |  7
+     gtkam              |                    []                             | 16
+     gtkorphan          |                    []                             |  7
+     gtkspell           |             []     []  []     []    []    []      | 27
+     gutenprint         |                                                   |  4
+     hello              |          [] []     []         []          []      | 38
+     herrie             |          []        []                             |  8
+     hylafax            |                                                   |  0
+     idutils            |          []        []                             | 15
+     indent             |          [] []     []         []          []      | 28
+     iso_15924          |                    []         []                  |  4
+     iso_3166           |    [] [] [] []     []  []     []    []    []      | 54
+     iso_3166_2         |                    []         []                  |  4
+     iso_4217           |    []    []        []         []    []            | 24
+     iso_639            |             []     []  []     []    []            | 26
+     jpilot             |          [] []     []         []                  |  7
+     jtag               |                    []                             |  3
+     jwhois             |          []        []                     []      | 13
+     kbd                |          [] []     []                             | 13
+     keytouch           |                    []                             |  8
+     keytouch-editor    |                    []                             |  5
+     keytouch-keyboa... |                    []                             |  5
+     latrine            |          []        []                             |  5
+     ld                 |          []        []         []          []      | 10
+     leafpad            |          [] []     []         []          []      | 24
+     libc               |          []                   []          []      | 19
+     libexif            |                    []                             |  5
+     libextractor       |                    []                             |  5
+     libgpewidget       |                    []  []     []                  | 20
+     libgpg-error       |                    []                             |  6
+     libgphoto2         |             []     []                             |  9
+     libgphoto2_port    |             []     []                     []      | 11
+     libgsasl           |                    []                             |  8
+     libiconv           |                    []  []                         | 11
+     libidn             |                    []         []                  | 11
+     lifelines          |                                                   |  4
+     lilypond           |                    []                             |  6
+     lingoteach         |                    []                             |  6
+     lprng              |                    []                             |  2
+     lynx               |          [] []     []                             | 15
+     m4                 |                    []         []          []      | 18
+     mailfromd          |             []     []                             |  3
+     mailutils          |             []     []                             |  8
+     make               |          []        []         []                  | 20
+     man-db             |                    []                             |  9
+     minicom            |                    []                             | 14
+     nano               |                    []         []          []      | 20
+     opcodes            |          []        []                             | 10
+     parted             |          [] []                            []      | 11
+     pilot-qof          |                    []                             |  1
+     popt               |          []        []         []          []      | 18
+     psmisc             |                    []         []                  | 10
+     pwdutils           |                    []                             |  3
+     qof                |                    []                             |  4
+     radius             |             []     []                             |  7
+     recode             |          []        []         []                  | 25
+     rpm                |          [] []     []                     []      | 13
+     screem             |                    []                             |  2
+     scrollkeeper       |          [] []     []                     []      | 26
+     sed                |          []        []         []          []      | 23
+     shared-mime-info   |             []     []         []                  | 29
+     sharutils          |          []        []                     []      | 23
+     shishi             |                    []                             |  3
+     skencil            |                    []                             |  7
+     solfege            |                    []                             |  3
+     soundtracker       |          []        []                             |  9
+     sp                 |          []                                       |  3
+     system-tools-ba... |    []    [] []     []     []  []          []      | 38
+     tar                |          [] []     []                             | 17
+     texinfo            |          []        []         []                  | 15
+     tin                |                                                   |  1
+     tuxpaint           |                    []  []                 []      | 19
+     unicode-han-tra... |                                                   |  0
+     unicode-transla... |                                                   |  2
+     util-linux         |          [] []     []                             | 20
+     util-linux-ng      |          [] []     []                             | 20
+     vorbis-tools       |             []     []                             |  4
+     wastesedge         |                                                   |  1
+     wdiff              |          []        []                             | 23
+     wget               |          []        []                     []      | 20
+     xchat              |             []     []         []          []      | 29
+     xkeyboard-config   |          [] []     []                             | 14
+     xpad               |                    []         []          []      | 15
+                        +---------------------------------------------------+
+       76 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+      163 domains          0  3  1 74 51  0  143 21  1  57     7    45    0  2036
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -742,13 +1042,13 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 
-   If January 2004 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
-matrix with full percentage details can be found at
-`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
+   If November 2007 seems to be old, you may fetch a more recent copy
+of this `ABOUT-NLS' file on most GNU archive sites.  The most
+up-to-date matrix with full percentage details can be found at
+`http://translationproject.org/extra/matrix.html'.
 
-Using `gettext' in new packages
-===============================
+1.6 Using `gettext' in new packages
+===================================
 
 If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
@@ -763,6 +1063,6 @@ the use of `gettext' the only thing missing are the translations.  The
 Free Translation Project is also available for packages which are not
 developed inside the GNU project.  Therefore the information given above
 applies also for every other Free Software Project.  Contact
-`translation@iro.umontreal.ca' to make the `.pot' files available to
-the translation teams.
+`coordinator@translationproject.org' to make the `.pot' files available
+to the translation teams.
 
diff --git a/Build/source/utils/texinfo/AUTHORS b/Build/source/utils/texinfo/AUTHORS
index ce8ee85e6d0..4d918be4732 100644
--- a/Build/source/utils/texinfo/AUTHORS
+++ b/Build/source/utils/texinfo/AUTHORS
@@ -1,30 +1,38 @@
-$Id: AUTHORS,v 1.10 2004/04/11 17:56:45 karl Exp $
+$Id: AUTHORS,v 1.14 2008/03/05 09:05:15 gray Exp $
 Texinfo authors.
 
-  Copyright (C) 2003 Free Software Foundation, Inc.
+  Copyright (C) 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
   
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
-Akim Demaille		texi2dvi.
+Karl Berry		all files.
+Per Bothner		makeinfo/xml.c, makeinfo/docbook.c updates.
+Torsten Bronger         texinfo.dtd.
+Bob Chassell		texinfo.tex, original texinfo.txi.
+Akim Demaille		texi2dvi, util/* tests.
 Alper Ersoy		makeinfo: enhancements in all files, especially
                           html-, xml-, and docbook-related.
-Andreas Schwab		texinfo.tex, configure.ac, most makeinfo files.
-Bob Chassell		texinfo.tex, original texinfo.txi.
 Brian Fox		all makeinfo/* and info/* files, info-stnd.texi.
+Noah Friedman		original texi2dvi.
+Oleg Katsitadze		doc/*
 Dave Love		original makeinfo/html.[ch].
-Eli Zaretskii		all files.
-Karl Berry		all files.
 Karl Heinz Marbaise	original makeinfo language support, most files.
-Noah Friedman		original texi2dvi.
-Paul Rubin		original makeinfo/multi.c.
 Philippe Martin		original makeinfo xml/docbook output.
+Sergey Poznyakoff	all files.
+Paul Rubin		original makeinfo/multi.c.
+Andreas Schwab		texinfo.tex, configure.ac, most makeinfo files.
 Richard Stallman	original texinfo.tex, install-info.c,
 			texindex.c, texinfo.txi.
 Zack Weinberg		texinfo.tex: @macro implementation.
+Ralf Wildenhues		util/gendocs.sh, makeinfo/tests/*,
+			makeinfo/html.c, makeinfo/cmds.c, makeinfo/footnote.c,
+			doc/texinfo.txi,
+			Makefile.am, configure.ac.
+Eli Zaretskii		all files.
 
-See http://www.iro.umontreal.ca/contrib/po/HTML/team-LL.html for the
+See http://translationproject.org/team/index.html for the
 translation teams for a given language LL.
 
 Many files included in the Texinfo distribution are copied from other
diff --git a/Build/source/utils/texinfo/COPYING b/Build/source/utils/texinfo/COPYING
index d60c31a97a5..9a2708d7782 100644
--- a/Build/source/utils/texinfo/COPYING
+++ b/Build/source/utils/texinfo/COPYING
@@ -1,284 +1,625 @@
 		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+		       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 			    Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+
+		       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -304,37 +645,30 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Build/source/utils/texinfo/ChangeLog b/Build/source/utils/texinfo/ChangeLog
index 6630a6b65c4..b4495100518 100644
--- a/Build/source/utils/texinfo/ChangeLog
+++ b/Build/source/utils/texinfo/ChangeLog
@@ -1,10 +1,2940 @@
-2008-02-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+2008-04-19  Karl Berry  <karl@gnu.org>
 
-	* acinclude.m4: add quotes to DEFUN's first args.
+	* Version 4.12.
 
-2008-02-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
+2008-04-19  Per Øyvind Karlsen  <peroyvind@mandriva.org>  (tiny change)
 
-	* configure.ac: --enable-muliplatform modifies libdir.
+	* info/filesys.c (compress_suffices): decompress .lzma with unlzma.
+	* install-info/install-info.c: support lzma.
+
+2008-04-18  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\math): \let the Texinfo accent commands
+	(\" \' ... \dotaccent) to their plain TeX math equivalents
+	(\ddot \acute ... \dot), where possible.
+	Report from John Mandereau, 17 Apr 2008 17:53:28.
+
+2008-04-17  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: allow more characters special to plain TeX
+	in the directory name in tidy mode (but not the base file name).
+	
+	* util/texi2dvi: more quoting of file name args for the sake of
+	names containing whitespace.  A spurious message still results.
+
+	* install-info/tests/defs.in: new file.
+	* configure.ac: generate install-info/tests/defs.
+	* install-info/tests/ii-*-test: source it.
+	* install-info/tests/Makefile.am: do not use export,
+	which is only supported by GNU make.
+
+2008-04-13  Juan Manuel Guerrero  <juan.guerrero@gmx.de>
+
+	DJGPP specific issues.
+	* djgpp/config.sed: Fixes required to use configure scripts generated
+	by autoconf 2.62.
+
+2008-04-09  Karl Berry  <karl@gnu.org>
+
+	* pretest 4.11.96.
+
+	* doc/texinfo.txi (geq leq): New node to document new commands
+	@geq{} and @leq{}, suggested by Arnold Robbins.
+	* doc/texinfo.tex (\geq, \leq): new macros.
+	* makeinfo/cmds.c (cm_geq, cm_leq): new fns.
+	(cm_minus): make static.
+	* makeinfo/cmds.h (cm_minus): remove decl.
+
+	* makeinfo/insertion.c (handle_verbatim): ignore rest of @verbatim
+	line, including the newline.
+	Report from Thien-Thi Nguyen, 01 Apr 2008 11:14:48.
+
+2008-04-09  Reinhold Kainhofer  <reinhold@kainhofer.com>  (tiny change)
+
+	* makeinfo/insertion.c (begin_insertion): do not indent via
+	whitespace for html, since we already do <blockquote>.
+	Reported 30 Mar 2008 00:56:56.
+
+2008-04-02  Jim Meyering  <jim@meyering.net>  (tiny change)
+
+	* doc/texinfo.tex: fix typos in comments.
+
+2008-03-31  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\dopdfimage): try .PDF too.
+	(\imagexxx): reduce space around vmode image to \medskip from \bigskip.
+	Start \noindent paragraph for vmode image so that @quotation etc.
+	indentation will be respected.
+	Report from Reinhold Kainhofer, 28 Mar 2008 17:33:05.
+
+2008-03-28  Karl Berry  <karl@gnu.org>
+
+	* info/Makefile.am (funs.h): change target from all of
+	$(generated_sources) to avoid problems with parallel builds.
+	From Michael Haubenwallner, 20 Mar 2008 22:52:20.
+
+2008-03-26  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (search_forward): use const.
+	Also (from William Xu) fix typo in comment.
+	* makeinfo/makeinfo.h (search_forward): change decl.
+
+2008-03-25  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (TEX): only unset it if it was nonempty and a
+	directory.
+
+2008-03-25  Akim Demaille  <akim@epita.fr>
+
+	* doc/Makefile.am: Use util_srcdir (new var) where appropriate.
+	(man_MANS): Also install texi2pdf.1 and pdftexi2dvi.1.
+	(unset_envvars): New.
+	Use it.
+	* util/local.test: Check we don't use $().
+	Simplify sed usage: don't use \| which is not portable enough.
+	* util/Makefile.am: Re-enable tests, in maintainer mode.
+
+2008-03-23  Benno Schulenberg  <bensberg@justemail.net>  (tiny change)
+
+	* info/session.c (_scroll_backward): better cursor placement.
+
+2008-03-23  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (TEX): unset if it refers to a directory; I think
+	the University of Utah installation does this.
+
+2008-03-22  Karl Berry  <karl@gnu.org>
+
+	* info/session.c (info_move_to_xref): conditionalize "no xref"
+	message on cursor_movement_scrolls_p.  Proposed by
+	Benno, 22 Mar 2008 15:17:49.
+
+2008-03-21  Karl Berry  <karl@gnu.org>
+
+	* pretest 4.11.95.
+
+	* info/Makefile.am (funs.h): use this as the dependency
+
+2008-03-21  Karl Berry  <karl@gnu.org>
+
+	* info/session.c (_scroll_forward): leave cursor on last line.
+	(_scroll_backward): use info_beginning_of_node for consistency.
+	Changes proposed by Benno Schulenberg, 21 Mar 2008 16:31:27.
+
+2008-03-20  Karl Berry  <karl@gnu.org>
+
+	* info/info.c (main): avoid declaration after statement.
+
+2008-03-17  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\xrefX): avoid TeX expansions of _ etc.
+	in the info filename argument (#4).
+	Report from Ralf Wildenhues, 15 Mar 2008 11:23:38.
+
+2008-03-14  Karl Berry  <karl@gnu.org>
+
+	* pretest 4.11.94.
+
+	* install-info/install-info.c: portability fixes.
+	(parse_dir_file): declare void, since it is.
+	(split_entry): Remove unused variable ostream.
+	(add_missing_basenames, add_missing_descriptions): Avoid
+		declarations after statements.
+	(main): Do not use // comments.
+	(format_entry): avoid using isblank, linking fails on osf-alpha,
+	others.
+	* util/texi2dvi: use `...` instead of $(...).  Avoid
+	(...) as case labels.
+
+2008-03-12  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (exdent): typo in example.
+	Report from Jaakko Hollmen, 11 Mar 2008 19:25:01.
+
+2008-03-12  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* info/session.c (_scroll_backward): Avoid wrapping to the end of
+	page when a backward scrolling is requested on the top node.
+	Patch proposed by Benno Schulenberg.
+
+2008-03-07  Karl Berry  <karl@gnu.org>
+
+	* pretest 4.11.93.
+
+	* info/infodoc.c (info_internal_help_text): reorder, regroup.
+	Suggestion from Benno Schulenberg, 06 Mar 2008 11:59:06.
+
+2008-03-07  Joseph Myers  <joseph@codesourcery.com>  (tiny change)
+
+	* doc/texinfo.tex (\includezzz): Use \turnoffactive before
+	expanding @value.
+
+2008-03-06  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* info/session.c (info_search_internal): Reword wrap-around
+	messages.
+	* configure.ac (AM_INIT_AUTOMAKE): Finally remove dist-bzip2.
+
+2008-03-05  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* util/gendocs.sh: Pass --node-files to texi2html only together
+	with the --split option.
+
+	* info/session.c (last_node_p): Remove unused variable.
+	(info_search_internal): Print a message if the search wraps over
+	the end or beginning of the document.
+
+	* configure.ac (AM_INIT_AUTOMAKE): Move all automake options here.
+	Add dist-bzip2 for completeness.
+	* Makefile.am (AUTOMAKE_OPTIONS): Remove in favor of
+	AM_INIT_AUTOMAKE.
+	* AUTHORS: Update the URL of Translation Project.
+
+2008-03-04  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* info/session.c (_scroll_backward): Place cursor at the end of
+	node if cursor_movement_scrolls_p is on.
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Raise version requirement to
+	1.10.1. This is needed for dist-lzma.
+
+	* system.h: Include <ctype.h>
+	* info/session.c (scroll_last_node_choices, scroll_last_node): New
+	variables.
+	(forward_move_node_structure): Special behavior when a scrolling
+	command is issued while on the last node.
+	* info/session.h (scroll_last_node_choices, scroll_last_node): New
+	variables.
+	(SLN_Stop,SLN_Scroll,SLN_Top): New defines.
+	* info/variables.c (info_variables): New variable
+	scroll-last-node.
+	* info/variables.h (scroll_last_node): New variable.
+	* doc/info-stnd.texi: Document scrolling behavior at the last node
+	and the scroll-last-node variable.
+	* NEWS: Document scrolling behavior at the last node.
+
+2008-03-02  Karl Berry  <karl@gnu.org>
+
+	* configure.ac (AM_INIT_AUTOMAKE): dist-lzma instead of dist-bzip2.
+
+2008-03-01  Juan Manuel Guerrero  <juan.guerrero@gmx.de>
+
+	DJGPP specific issues.
+	* system.h [O_BINARY]: Use HAVE_DRIVE in IS_ABSOLUTE.
+	* djgpp/config.sed: Fix regex pattern to handle version numbers that
+	looks like 4.NN.NN
+
+2008-02-29  Karl Berry  <karl@gnu.org>
+
+	* pretest 4.11.92.
+
+2008-02-28  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\includezzz): \edef the filename in order
+	to expand @value constructs (include-value).  This fix
+	from Joseph S. Myers, 1 Feb 2008 01:11:11.
+	Document that the \expandafter trickery is necessary in order to
+	read the file outside of a group (mac-incl).
+	This report from John Mandereau, 28 Feb 2008 22:12:34.
+
+	* info/infodoc.c (info_internal_help_text): more tweaks.
+	* info/infomap.c: move up/down to end, too.
+	Suggestions from Benno Schulenberg, 27 Feb 2008 23:44:17
+	and 28 Feb 2008 22:49:27.
+
+2008-02-28  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (absolute): Add a missing "local".
+
+2008-02-28  Akim Demaille  <akim@epita.fr>
+
+	Let texi2dvi keep the trailing //.
+	* bin/texi2dvi ($space, $tab): New.
+	($IFS): Use them to be robust to zealous white space cleanups.
+	(absolute): Preserve the trailing slashes.
+	(tex_envvars): Add MPINPUTS, MFINPUTS, and TFMFONTS.
+
+2008-02-28  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi: Don't use "local foo=`cmd`", because in that case
+	failures of cmd, including with set -e, will go unnoticed.  So
+	always first declare with local, then run the assignment.
+	(index_file_p): Adjust to be usable with index.sty.
+	* util/local.test: Make the test more robust.
+
+2008-02-27  Karl Berry  <karl@gnu.org>
+
+	* pretest 4.11.91.
+
+	* info/infomap.c [!INFOKEY]: remove this whole block.  It is too
+	confusing having two sets of key bindings.
+
+	* info/infodoc.c (info_internal_help_text): more tweaks.
+	Suggestions from Benno Schulenberg, 26 Feb 2008 00:34:22.
+
+2008-02-26  Brendan O'Dea <bod@debian.org>  (tiny change)
+
+	* util/texi2dvi: slightly reformat usage message for help2man.
+	(sent by peb 26 Feb 2008 12:01:11)
+
+	* install-info/install-info.c (print_help): keep two spaces
+	between option name and description, or help2man can't do a good job.
+
+2008-02-26  Peter Breitenlohner <peb@mppmu.mpg.de>
+
+	* info/doc.h, info/echo-area.c, info/echo-area.h,
+	info/footnotes.c, info/indices.c, info/info.c, info/info.h,
+	info/infodoc.c, info/infokey.c, info/infomap.c, info/m-x.c,
+	info/nodemenu.c, info/session.c, info/session.h,
+	info/variables.c, info/variables.h, info/window.c,
+	info/window.h:
+	declare constant strings as such and remove
+	many `(char *)' casts -- in particular for `_(...)'.
+	Avoid gcc warnings (for --disable-nls and maybe without).
+
+2008-02-25  Karl Berry  <karl@gnu.org>
+
+	* autogen.sh: run autoconf before autoheader, then automake
+        (per autoreconf).
+
+2008-02-24  Karl Berry  <karl@gnu.org>
+
+	* info/infomap.c (x): bind to delete_window.
+	* info/infodoc.c (info_internal_help_text): more rearrangements.
+	(create_internal_info_help_node: omit incorrect exiting suggestion
+		at end.
+	Suggestions from Benno Schulenberg, 24 Feb 2008 22:56:44.
+
+	* install-info/install-info.c (munge_old_style_debian_options):
+	avoid use of asprintf, just xmalloc ourselves.
+	In report from Juan Manuel Guerrero, 24 Feb 2008 22:06:35.
+
+	* install-info/install-info.c (spec_entry) <text_len>: declare
+	as size_t instead of int, to avoid warning.
+	In report from Juan Manuel Guerrero, 24 Feb 2008 22:06:35.
+
+2008-02-22  Karl Berry  <karl@gnu.org>
+
+	* pretest 4.11.90.
+
+2008-02-22  Peter Breitenlohner <peb@mppmu.mpg.de>
+
+	* configure.ac (--enable-multiplatform): also set libdir.
+	* util/defs.in (PATH): include @abs_builddir@.
+	* util/texi2dvi (usage): consistently escape \$HOME.
+
+2008-02-21  Karl Berry  <karl@gnu.org>
+
+	* info/infodoc.c (info_internal_help_text): more simplifications.
+	Suggestions from Benno Schulenberg, 21 Feb 2008 23:35:38.
+
+	* install-info/tests/ii-0041-test,
+	* install-info/tests/ii-0041-test: ensure target dir file is rw.
+
+2008-02-19  Karl Berry  <karl@gnu.org>
+
+	* info/infodoc.c (info_internal_help_text): rearrangements.
+	* info/session.c (cursor_movement_scrolls_p): 1 by default.
+	* info/window.c (window_scroll_step): 1 by default.
+	* info/infomap.c <key bindings>: h to info_get_help_window,
+	H to info_get_info_help_node,
+	PgUp to info_scroll_backward, PgDown to info_scroll_forward,
+	move q to after C-x C-c .
+	Suggestions from Benno Schulenberg, 04 Jan 2008 23:20:46.
+
+2008-02-17  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (EGREP): need egrep early.
+
+	* util/texi2dvi: path_sep is : on djgpp too.  From Eli Z.
+
+	* makeinfo/makeinfo.c: typos in comments.
+
+	* makeinfo/cmds.c (cm_direntry): call close_single_paragraph,
+	instead of add_char('\n'), or the INFO-DIR-SECTION lines from two
+	consecutive @dircategory's are munged together.
+	Bug report from Ralf Angeli, 16 Feb 2008 18:59:42.
+
+2008-02-16  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: path_sep is : on mingw as well as cygwin.
+	Report from: FX Coudert, 16 Feb 2008 15:43:15.
+
+	* makeinfo/cmds.c (cm_cite): avoid double apostrophe in
+	Info output of, e.g., ... @cite{Foo}'s ...
+	Report from Bob Chassell.
+
+2008-02-15  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\tex): spurious space in redefinition of \top.
+
+	* makeinfo/cmds.c (handle_include): set in_fixed_width_font
+	for expanding the filename argument, so -- doesn't become -.
+	Bug report from Daniel Richard G., 13 Feb 2008 01:50:00.
+
+2008-02-11  Karl Berry  <karl@gnu.org>
+
+	* info/session.c (incremental_search): if a regex search,
+	search every time through the loop, not only if the search
+	succeeded.
+	Bug report from Ralf Wildenhues, 8 Feb 2008 23:30:51.
+
+2008-02-10  Karl Berry  <karl@gnu.org>
+
+	* info/session.c (show_isearch_prompt): Start with "Regexp" if
+	it's a regexp i-search.
+	Suggestion from Ralf Wildenhues, 8 Feb 2008 23:30:51.
+
+2008-02-04  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\includezzz): simply do the \input (instead of
+	trickily expanding it after the }) a la \verbatiminput; otherwise,
+	@value expansions are not done.  The trickery just seems unnecessary.
+	Report from Joseph S. Myers, 1 Feb 2008 01:11:11.
+
+2008-02-01  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\ptextop): save plain tex \top (a math symbol).
+	(tex env): restore plain text \top.
+
+2008-01-31  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Click Sequences): new section to document new
+	commands @arrow, @clicksequence, @click, and @clickstyle.
+	* doc/texinfo.tex (\clicksequence, \click, \clickstyle): define them.
+	* makeinfo/cmds.h,
+	* makeinfo/cmds.c (cm_arrow, cm_click, cm_clicksequence,
+	cm_clickstyle): new fns.
+	* insertion.h,
+	* insertion.c (get_item_function): no longer static.
+	* xml.h,
+	* xml.c (CLICK, CLICKSEQUENCE): new elements.
+	* util/texinfo.dtd (Inline.misc): add click and clicksequence.
+	(rarr): new entity.
+
+	* makeinfo/xml.c (xml_insert_entity): only do XML checks if we are
+	actually outputting XML; this routine is also used for HTML output.
+
+	* makeinfo/makeinfo.c (convert_from_loaded_file): move
+	xml_begin_document to after we are sure the output file is open.
+
+2008-01-30  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi, doc/info-stnd.texi (Back-Cover Text): new
+	wording from rms.
+
+2008-01-24  Karl Berry  <karl@gnu.org>
+
+	* info/session.c (info_move_to_xref): must use fixed-string
+	searches for these Info keywords that contain *.
+	Report from Ben Asselstine, 29 Dec 2007 11:21:40 (et al.).
+
+	* doc/info-stnd.texi (What is Info): that's C-x C-c to exit, not
+	C-x C-x.  Report from Benno, 24 Jan 2008 00:40:04.
+
+2008-01-23  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/insertion.c (begin_insertion) <direntry>: ignore
+	whitespace beginning the first * line inside @direntry,
+	to work around the zsh manual.
+	Report from Norbert Preining, 14 Jan 2008 09:09:01.
+
+2008-01-21  Karl Berry  <karl@gnu.org>
+
+	* info/info.c (main): silently switch to info-stnd if given
+	-O (--usage) info.
+	Suggestion from Benno, 19 Jan 2008 19:58:47.
+
+2008-01-20  Karl Berry  <karl@gnu.org>
+
+	* install-info/install-info.c (print_help): split up big help string,
+	some rewording.
+
+2008-01-19  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (run_tex): use verbose, not echo, so -q is respected.
+	Report from Kurt Hornik, 19 Jan 2008 11:16:27.
+
+2008-01-18  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Other Info Directories): mention starting at 0
+	and what-cursor-position when figuring column positions.
+
+2008-01-16  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (move_to_dest): compare with filenames, rather
+	than cmp -s, since the output file might not actually change.
+	Report from Ralf Wildenhues, 15 Jan 2008 07:20:34.
+
+	* doc/texinfo.txi (Invoking makeinfo): --document-language default
+	is @documentlanguage, as of 4.11.
+
+	* doc/texinfo.txi (Makeinfo Pointer Creation): mention the
+	need for @detailmenu here, too.
+
+2008-01-14  Karl Berry  <karl@gnu.org>
+
+	* NEWS: install-info NEWS details.
+
+2008-01-13  Bruno Haible  <bruno@clisp.org>
+
+	* util/gendocs.sh (curdate): Execute 'date' command in the locale
+	specified by SETLANG.
+
+2008-01-12  Bruno Haible  <bruno@clisp.org>
+
+	* doc/texinfo.txi (Cross Reference Parts): better description of arg2.
+	bug-texinfo mail of 12 Jan 2008 15:52:23 +0100.
+
+2008-01-02  Karl Berry  <karl@gnu.org>
+
+	* info/info.c (info_short_help) [__MSDOS__]: puts -b string directly.
+	Suggestion from Benno.
+
+2008-01-02  Karl Berry  <karl@tug.org>
+
+	* util/Makefile.am (TESTS): remove dvipdf.test, it is too
+	dependent on functional TeX installations.  Not our place to test that.
+
+2008-01-02  Karl Berry  <karl@tug.org>
+
+	* install-info/, install-info/tests/: new subdirectories.
+	* util/Makefile.am: move install-info stuff to its own dir, with tests.
+	* configure.ac,
+	* Makefile.am (SUBDIRS): take care of new dirs.
+	* doc/Makefile.am (install-info.1): new source location for man page.
+	* po/POTFILES.in: update source list.
+
+2008-01-02  Ben Asselstine  <benasselstine@gmail.com>
+
+	* install-info/install-info.c: much work toward Debian compatibility.
+	(line_data): new member num_sections to add; change type of
+	add_entries_before.
+	(spec_entry): new members missing_name, missing_description,
+	missing_basename.
+	(longopts): new options --name, --menuentry, --description,
+	--no-indent, --keep-old, --maxwidth, --max-width,
+	--section-regex, --dry-run.
+        (remove_empty_sections, add_entries_into_all_matching_sections,
+        keep_old_flag, indent_flag,
+        order_new_sections_alphabetically_flag): new globals.
+        (print_help): list new options.
+        (output_dirfile): count sections added, and possibly sort them.
+        (parse_input): handle delete_flag.
+        (parse_dir_file): write the end of the last node.
+        (mark_entry_for_deletion, adjust_column, format_entry,
+        split_entry, reformat_new_entries, add_missing_basenames,
+        add_missing_names, add_missing_descriptions,
+        munge_old_style_debian_options): new fns.
+        (main): new variables calign, align, maxwidth,
+        entries_to_add_from_file; munge per debian if needed; handle new
+        options.
+        (compare_entries_text): use mbsncasecmp.
+	* doc/texinfo.txi (Invoking install-info): mention the new options.
+
+2008-01-01  Karl Berry  <karl@gnu.org>
+
+	* info/info.c (info_short_help): break help string into smaller
+	pieces, to help translators.
+	Suggestion from Benno Schulenberg, 01 Jan 2008 12:22:31.
+
+2008-01-01  Ben Asselstine  <benasselstine@gmail.com>  (tiny change)
+
+	* doc/info-stnd.texi (Invoking Info): document this.
+	* info/info.c (long_options, short_options): use -k as an alias
+	for --apropos.
+	(main): recognize it.
+	(info_short_help): document it.
+	(APROPOS_OPTION): no longer needed.
+
+2007-12-23  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.17.
+
+2007-12-19  Norbert Preining  <preining@logic.at>  (tiny change)
+
+	* makeinfo/insertion.c (begin_insertion) <direntry>: use add_word
+	instead of insert_string, so that the "This is ..." line is
+	written before the START-INFO-DIR-ENTRY.
+
+2007-12-17  Karl Berry  <karl@gnu.org>
+
+	* doc/info-stnd.texi (Searching Commands): Document the new regex
+	search, a little.
+	(@copying): Update Back-Cover Text.
+	* doc/info.texi (@copying): Update Back-Cover Text.
+
+2007-12-17  Stephane Chazelas  <stephane_chazelas@yahoo.fr>
+
+	* info/infomap.c (R): new command info_toggle_regexp.
+	* info/session.c (use_regex): new static (true by default).
+	(info_toggle_regexp): new command.
+	* info/session.h (info_toggle_regexp): declare it.
+	* info/search.c (regexp_search): new fn.
+	* info/search.h (regexp_search): declare it.
+	Savannah bug 15572.
+
+2007-12-16  Karl Berry  <karl@gnu.org>
+
+	* info/session.c: remove more status messages.
+	Report from Benno Schulenberg, 16 Dec 2007 12:24:12.
+
+2007-12-15  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\pdffontattr): only do the cmaps if this pdftex
+	primitive is defined, for the sake of those running ancient versions.
+
+2007-12-13  Karl Berry  <karl@gnu.org>
+
+	* info/session.c: remove status report messages, said to be noise.
+	Report from Benno Schulenberg, 11 Dec 2007 00:19:57.
+
+2007-12-09  Benno Schulenberg  <bensberg@justemail.net>  (tiny change)
+
+	* makeinfo/makeinfo.c (usage): improve help message.
+	bug-texinfo mail of 02 Dec 2007 23:43:10 +0100.
+
+2007-12-09  Fabian Groffen  <grobian@gentoo.org>  (tiny change)
+
+	* info/makedoc.c (main): reorder calls following the Makefile
+	dependencies, for high-precision filesystems.
+	http://bugs.gentoo.org/show_bug.cgi?id=200662
+	bug-texinfo mail of 3 Dec 2007 17:59:13 +0100.
+
+2007-12-02  Karl Berry  <karl@gnu.org>
+
+	* info/info.c (main): undo change of 2006-08-13 in this file,
+	so info can be easily tested in multibyte locales.
+
+	* all files: use the multibyte case comparison functions
+	mbscasecmp and mbsncasecmp from gnulib, instead of simply
+	strcasecmp and strncasecmp.  (1) gnulib strcase is buggy,
+	declaring the str* functions in string.h instead of strings.h,
+	leading to build failure on AIX 4.3.3 (report from Gary E. Barnes,
+	21 Nov 2007 12:37:12).  (2) we want to support multibyte locales
+	better anyway.
+
+2007-11-30  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* doc/Makeinfo.am: Rename txi-no.tex to txi-nb.tex (see
+	2007-10-31).
+
+2007-11-27  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (headings on off): clarify the meaning of
+	@headings on.  Report from Dilyan Palauzov, 25 Nov 2007 17:07:09.
+
+2007-11-25  Stephane Chazelas  <stephane_chazelas@yahoo.fr>
+
+	*  info/indices.c (info_next_index_match): use the line number
+	specified in the index entry, if available.
+
+2007-11-23  Benno Schulenberg <bensberg@justemail.net>  (tiny change)
+
+	* info/infodoc.c: keep help strings together for translation.
+
+2007-11-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* util/texi2dvi: Fix quoting for white space in file names.
+
+2007-11-21  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/lang.h (hz): #undef, since apparently it is defined on
+	AIX 4.3.3.
+	Report from: Gary E. Barnes, 21 Nov 2007 12:37:12.
+
+2007-11-16  Karl Berry  <karl@gnu.org>
+
+	* info/info.c (info_error): use puts instead of fprintf if we
+	don't actually have any arguments.  Else
+	info --file=".%x.%x." will try to print NULL.
+	Report from Cody Rester, 16 Nov 2007 08:59:48.
+
+2007-10-31  Karl Berry  <karl@gnu.org>
+
+	* doc/txi-no.tex: rename to txi-nb.tex.
+	* po/no.po: remove.
+	* po/LINGUAS: remove no.
+
+2007-10-24  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/node.c (cm_node),
+	* makeinfo/cmds.c (cm_settitle): no need to call xml_begin_document.
+	* makeinfo/makeinfo.c (convert_from_loaded_file): call
+	xml_begin_document in docbook case too, else some frontmatter
+	can be lost.
+	Bug report from Sam Varshavchik, 14 Oct 2007 12:10:04, for binutils.
+
+	* makeinfo/insertion.c: formatting.
+
+	* makeinfo/xml.c (xml_begin_document): arg can be const;
+	use basename of @setfilename instead of "book-root".
+	(xml_push_current_element, xml_pop_current_element): use
+	warning fn for consistent formatting.
+
+	* util/dir-example: binutils update, etc.
+
+2007-10-24  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* util/gendocs.sh: New option --texi2html, to use texi2html for
+	creating HTML output.
+	Handle special conditional constructs in the template: %%IF
+	HTML_SECTION%% and %%IF HTML_CHAPTER%% (both closed with a
+	corresponding %%ENDIF) to conditionally enable parts of the output
+	depending on texi2html split outputs.
+	* util/gendocs_template: Conditionally enable section and chapter
+	split HTMLs.
+	* util/gendocs_template_min: Likewise.
+
+2007-10-19  Karl Berry  <karl@gnu.org>
+
+	* info/display.c (display_update_one_window): don't try to display
+	a window unless both width and height are >0.
+	* window/window.c (window_new_screen_size): try to ensure that
+	no window width/height ever becomes negative.
+	Bug report and ideas from Vitezslav Crhonek, 18 Oct 2007 15:15:51,
+	as well as https://bugzilla.redhat.com/show_bug.cgi?id=243971.
+
+2007-10-13  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/cmds.c (cm_dircategory): use add_word instead of
+	insert_string so that the info file header ("This is ...") comes
+	after the INFO-DIR-SECTION magic.
+	Bug report from Katsumi Yamaoka, emacs-devel 10 Oct 2007 11:17:10.
+
+2007-10-08  Bruno Haible  <bruno@clisp.org>
+
+	* makeinfo/lang.c (unicode_map): New variable.
+	(cm_search_iso_map): In case of UTF-8 encoding, return a Unicode code
+	point.
+	(add_encoded_char_from_code): New function.
+	(add_encoded_char, cm_accent_generic_no_headers): Use it.
+
+2007-10-03  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (math): @math{k_{75}} is allowed, despite bare
+	braces.
+
+2007-10-02  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (math): Make description more accurate.
+	Ideas by Patrice Dumas, 16 Sep 2007 12:02:46.
+
+2007-09-26  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/index.c (count_strn_chars): new fn.
+	(insert_index_output_line_no): call it.
+	(cm_printindex): call it.
+	This is to fix off-by-one width computation due to @tie{},
+	reported by Werner Lemberg, 16 Sep 2007 16:48:47.
+
+	* makeinfo/cmds.c,
+	* makeinfo/xref.c: #include "index.h", instead of explicit
+	extern printing_index.
+	* makeinfo/index.c (the_indices, index_element_compare): can be static.
+	* makeinfo/index.h: make order of decls match index.c.
+
+2007-09-25  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Six Parts): End segment should not have toc anymore.
+
+2007-09-24  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (convert_from_file): free `input_filename' leak.
+	Reported by Stephen Compall, 21 Sep 2007 20:25:54.
+
+2007-09-21  Stephen Compall <s11@member.fsf.org>  (tiny change)
+
+	* makeinfo/makeinfo.c (convert_from_file): excise code testing
+	case in suffixes that doesn't arise.
+
+2007-09-21  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c,
+	* info/info.c,
+	* util/texindex.c,
+	* util/install-info.c (main): unify declaration on char *argv[].
+
+2007-09-20  Greg Schafer <gschafer@zip.com.au>  (tiny change)
+
+	* util/dvipdf.test,
+	* util/texi2dvi.test (required): need tex, or the tests fail.
+
+2007-09-17  Karl Berry  <karl@gnu.org>
+
+	* util/defs.in (TEXI2DVI_run): try "type" instead of "which".
+	Report from Michael Deutschmann, 13 Sep 2007 01:29:39.
+
+	* util/defs.in (optionset_get): use `...`, not $(...).  Still too
+	newfangled.  Report from Bert Deknuydt.
+
+2007-09-16  Thien-Thi Nguyen  <ttn@gnuvola.org>  (tiny change)
+
+	* doc/texinfo.tex (w): Do s/indenting manual/manual indenting/.
+
+2007-09-15  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.h,
+	* makeinfo/makeinfo.c,
+	* makeinfo/defun.c,
+	* makeinfo/html.c,
+	* makeinfo/node.c,
+	* makeinfo/toc.c,
+	* makeinfo/xref.c (__): rename to gdt, since HP-UX uses it in
+	<stdsyms.h>.  (Report from Bert Deknuydt, 12 Sep 2007 12:17:34).
+
+2007-09-09  Karl Berry  <karl@gnu.org>
+
+	* Version 4.11.
+
+2007-09-05  Karl Berry  <karl@gnu.org>
+
+	* doc/info-stnd.texi (Variables): make an anchor for
+	scroll-behavior, and use it.  Idea from Benno Schulenberg,
+	04 Sep 2007 00:21:01.
+
+2007-09-03  Karl Berry  <karl@gnu.org>
+
+	* pretest 4.9.92.
+
+	* doc/texinfo.tex (\baselinefactor): new macro, 1 by default.
+	(\setleading): use it, to allow for poor man's double spacing.
+	(\afourpaper, \letterpaper): use absolute dimension for height,
+	instead of a multiple of \baselineskip.  (Otherwise things run off
+	the bottom when double-spacing.)
+
+2007-09-01  Juan Manuel Guerrero  <juan.guerrero@gmx.de>
+
+	* djgpp/config.bat: change file names arguments and configure.orig
+	to args and configure.org.
+	Remove the command line that deletes co*.tmp files.
+
+2007-08-31  Karl Berry  <karl@gnu.org>
+
+	* info/info.c (main) [LC_MESSAGES]: conditionalize setlocale on
+	LC_MESSAGES, since djgpp 2.04 doesn't have it.
+	Report from Juan Manuel Guerrero, 28 Aug 2007 21:38:18.
+	* info/man.c (get_manpage_contents) [LC_MESSAGES]: likewise.
+	* makeinfo/makeinfo.c (main): doc fix, likewise.
+
+2007-08-26  Karl Berry  <karl@gnu.org>
+
+	* info/infodoc.c (info_internal_help_text): hardwire
+	menu-digits help string; bug report from Benno.
+
+2007-08-16  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/lang.c (iso8859_2_map): include known HTML entities,
+	from the 88592.txt file in the GNU enscription distribution.
+
+2007-08-04  Juan Manuel Guerrero  <juan.guerrero@gmx.de>
+
+	* djgpp/config.bat: replace the string diffutil*.pot by
+	the correct one texinfo*.pot
+
+	* djgpp/config.sed: adjust for the use with autoconf 2.61
+
+	* djgpp/config.site: adjust for the use with autoconf 2.61
+
+2007-08-04  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* doc/info-stnd.texi: Document cursor-movement-scrolls variable.
+	Document different spellings of scroll-behaviour variable.
+	* info/info-utils.c (info_references_internal): Initialize
+	line_number.
+	* info/infodoc.c (info_internal_help_text): Update docstrings
+	for move-to-next-xref and move-to-prev-xref.
+	* info/session.c (forward_move_node_structure)
+	(backward_move_node_structure): Return int
+	(cursor_movement_scrolls_p): New variable.
+	(info_next_line,info_prev_line,info_forward_char,info_backward_char)
+	(info_forward_word,info_backward_word): Scroll through the
+	entire document if cursor_movement_scrolls_p is set.
+	(info_move_to_xref,info_move_to_prev_xref): Return int
+	* info/session.h (cursor_movement_scrolls_p): New variable
+	* info/variables.h: Likewise
+	* info/variables.c (scroll-behavior): Alias for scroll-behaviour
+	(cursor-movement-scrolls): New variable.
+
+2007-07-30  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\badparencount, \badbrackcount): make these
+	just warnings, not \errmessage's.
+
+2007-07-29  Karl Berry  <karl@gnu.org>
+
+	* pretest 4.9.91.
+	* doc/texinfo.txi (Inserting Quotes): wording.
+
+	* util/Makefile.am (TESTS): remove local.test.  It fails and I
+	would prefer not to replace local with a shell function anyway.
+
+	* util/texi2dvi.test: with -o output, do not expect input.dvi
+	to remain.
+
+2007-07-26  Karl Berry  <karl@gnu.org>
+
+	* util/Makefile.am (pdftexi2dvi): copy texi2pdf, not texi2dvi.
+
+2007-07-24  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (move_to_dest): really move the file,
+	don't just copy it, else automake tests fail.
+	From Michael Deutschmann, 23 Jul 2007 20:55:32.
+
+2007-07-23  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (license notice): punctuation changes to
+	match recommendation.  From Paul Eggert.
+
+2007-07-23  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi: Update DVIPSHEADERS so that dvips finds its
+	special headers.
+	Don't rely on non-IFS splitting when using local.
+	Maybe we should just not use local at all.
+	Or never use it to assign at the same time: declare, then assign.
+	* util/local.test: Check that "local" is used properly with quotes.
+
+2007-07-23  Akim Demaille  <akim@epita.fr>
+
+	Use hevea more like we use tex itself, no longer as a tool
+	that does everything magically.
+	* util/texi2dvi (run_hevea): Remove trailing spaces in the
+	output.
+	(run_tex_suite): Change to the working directory here, no longer
+	in...
+	(run_core_conversion): here, so that even when running hevea where
+	are in the working directory.
+	No longer call cd_orig, do it...
+	(run_tex_suite): here.
+	(run_hevea): Pass verbose flags to it when --debug.
+	(run_tex_suite): Since we now want to run the whole suite of tools,
+	including bibtex, with hevea, use run_core_conversion, not
+	run_tex.
+	(run_core_conversion): Now call run_tex.
+
+2007-07-15  Karl Berry  <karl@gnu.org>
+
+	* doc/info-stnd.texi (@copying, GFDL): remove, since it's
+	not part of info.texi either.
+	(Invoking Info): mention customization here and elsewhere,
+	to make it a bit more prominent.
+
+2007-07-15  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* doc/texinfo.tex (\quotedblleft, \quotedblright, \quoteleft,
+	\quoteright): aliases for the quotation marks from the CM fonts.
+	(\guillemetleft, \guillemotleft, \guillemetright, \guillemotright,
+	 \guilsinglleft, \guilsinglright, \quotedblbase, \quotesinglbase):
+	 new macros to borrow quotation marks from the EC fonts.  The
+	 following font macros support these glyphs.
+	(\ecfont): new macro to switch to a EC font as close as possible
+	 to the current style.
+	(\textecsize, \smallecsize, \smallerecsize, titleecsize, \chapecsize,
+	 \sececsize, \ssececsize, \reducedecsize): new macros to store EC
+	 font name sizes.
+	* makeinfo/cmds.c, makeinfo/cmds.h: added defs for the new
+	quotation marks.
+	* makeinfo/lang.c (cm_special_char): added guillemetleft,
+	guillemotleft, guillemetright, guillemotright.
+	* util/texinfo.dtd (lsquo, rsquo, sbquo, bdquo, laquo, raquo,
+	 lsaquo, rsaquo): entities for the new quotation marks.
+	* doc/texinfo.txi (Inserting Quotation Marks): new section.
+	(General Syntactic Conventions): moved quotation mark syntax to
+	Inserting Quotation Marks.
+	(Preparing for TeX): added info on installation of EC and Euro fonts.
+
+2007-07-14  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (@copying, GNU Sample Texts),
+	* doc/info-stnd.texi (@copying): update Back-Cover Text.
+
+2007-07-12  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/lang.c (default_country_for_lang): strcasecmp returns 0
+	when we find en.
+
+2007-07-10  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.h (enable_encoding): default to 1.
+	* makeinfo/makeinfo.c (long_options): new option --disable-encoding
+	to set to zero.
+	(usage): document --disable-encoding.
+	* makeinfo/lang.c (add_encoded_char): don't enable 8-bit unless we
+	have a document encoding.
+	* doc/texinfo.txi (makeinfo Options, documentencoding): document this.
+
+2007-07-09  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\xrefX): use \putwordSection for external
+	cross-references, too.
+	Report from Ludovic C, 09 Jul 2007 18:09:13.
+
+2007-07-09  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* doc/texinfo.tex (\thissection): renamed to \lastsection.
+	(\thissectionname, \thissectionnum, \evenheadingmarks, \oddheadingmarks, \evenfootingmarks, \oddfootingmarks, \everyheadingmarks, \everyfootingmarks):
+	new macros.
+	(\thischapter, \thischaptername, \thischapternum, \thissection, \thissectionname, \thissectionnum):
+	defined these using marks.
+	(\chapoddpage): omit heading and footing on blank filler pages.
+	* doc/texinfo.txi (Page headings): documented
+	\thissection{,name,num} and \{even,odd,every}{head,foot}ingmarks.
+	* makeinfo/cmds.c (command_table): added
+	{even,odd,every}{head,foot}ingmarks.
+
+2007-07-08  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/node.c (validate_file): don't check for warning limit,
+	it was hit in gnulib.
+	* makeinfo/makeinfo.h (reference_warning_limit): remove.
+	* makeinfo/makeinfo.c (main): ignore the option (but leave it in
+	so any Makefiles or scripts that use it won't gratuitiously break).
+	* doc/texinfo.txi (Invoking makeinfo): remove documentation for
+	--reference-limit.
+
+2007-07-07  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (@copying): new Back-Cover Text.
+
+2007-07-06  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Other Info Directories): recommend columns 32
+	and 48.  Suggestion from Antonio Diaz Diaz.
+
+2007-07-05  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\setnonasciicharscatcodenonglobal,
+	\setnonasciicharscatcode): no newline after #1, that counts as a space.
+	(\pagebody, \pagesizesyyy): likewise.
+
+2007-07-03  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* doc/texinfo.tex: use \setcolor for color changes instead of
+	\pdfsetcolor, to preserve color changes across page breaks.  Use a
+	darker red (which comes out almost black in b&w print) for links
+	and urls.
+
+2007-07-02  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* doc/pdfcolor.tex: removed (merged with doc/texinfo.tex).
+	* doc/texinfo.tex: merged doc/pdfcolor.tex, omitting unused colors.
+	* doc/Makefile.am, doc/README, doc/texinfo.txi, util/srclist.txt:
+	removed any mention of pdfcolor.tex.
+
+	* doc/texinfo.tex (\chapmacro):  avoid potential breakpoint at
+	interline glue between \pdfdest and the heading.
+	(\safewhatsit): typo.
+
+2007-07-01  Karl Berry  <karl@gnu.org>
+
+	* pretest version 4.9.90.
+
+	* COPYING, all source files: GPLv3.
+
+	* makeinfo/makeinfo.c,
+	* info/info.c,
+	* info/infokey.c,
+	* util/install-info.c,
+	* util/texindex.c: update --version output.
+
+	* Makefile.am (EXTRA_DIST): remove config.rpath, it's in build-aux now.
+	* lib/Makefile.am (libtxi_A_SOURCES): system.h at top level now.
+
+	* util/texi2dvi (move_to_dest): still more tweaks to try avoid
+	complaints from cp and cmp.
+
+	* makeinfo/tests/copying.txi: test with nonempty copying text.
+	* makeinfo/insertion.c (cm_insert_copying): call output_head.
+
+2007-06-29  Karl Berry  <karl@gnu.org>
+
+	* Version 4.9 (GPLv3, made from 4.8 branch).
+
+2007-06-29  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (move_to_dest): do not cmp a directory.
+
+2007-06-27  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (move_to_dest): do not copy a file onto itself,
+	GNU cp complains.
+
+2007-06-27  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* doc/texinfo.tex (\setnonasciicharscatcodenonglobal): new macro.
+	(\scanctxt):  in case of non-ASCII encodings, un-activate 8-bit
+	chars to avoid their expansion.  Report from John Mandereau,
+	22 Jun 2007 17:26:09 +0200.
+
+2007-06-24  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\internalpagesizes): must reset \pdfhorigin and
+	\pdfvorigin after changing \pdfpageheight and \pdfpagewidth.
+
+2007-06-20  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\documentlanguagetrywithoutunderscore): new macro,
+	to try txi-de.tex if @documentlanguage de_DE.
+	(\documentlanguage): call it.
+
+	* lang.c (default_country_for_lang): just return country code, not
+	whole locale string.
+
+	* makeinfo.h (output_head_p): new global.
+	* makeinfo.c (info_output_head, output_head): new fns.
+	(add_char): call it.  This is so we can translate the file header
+	("produced by Makeinfo ...") in Info output as well as HTML.
+	* html.c,
+	* html.h,
+	* cmds.c: change usage of html_output_head_p to output_head_p, etc.
+
+2007-06-17  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/lang.c (default_country_for_lang): implement using the
+	same locales_with_principal_territory list as gettext's msginit.c.
+
+	* makeinfo/lang.c (language_table): update from current list,
+	write out update procedure for next time.
+	* makeinfo/lang.h (language_code_type): update enum.
+	* doc/texinfo.txi (documentlanguage): don't include the list of
+	language codes, change is too rapid.
+
+	* doc/texinfo.tex (\codequoteright, \codequoteleft): support
+	@set txicodequoteundirected and
+	@set txicodequotebacktick, respectively, as well as the non-txi names.
+	* doc/texinfo.txi (Inserting Quote Characters): new node.
+	* NEWS: mention both.
+
+2007-06-14  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/lang.c (cm_documentlanguage): add _CC part if necessary,
+	or split LL_CC if that's given.  Set document_language so that
+	getdocumenttext strings will be translated.
+	* doc/texinfo.txi (documentlanguage):
+	* NEWS: mention this.
+
+	* util/gendocs_template: mention possibility of buying manuals
+
+2007-06-13  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/xml.c (xml_insert_element_with_attribute): close
+	menu_entry and menu_entry_comment elements before handling the
+	detailmenu element (either start or end).
+	From Thien-Thi Nguyen, 04 Jun 2007 01:18:37.
+
+2007-06-03  Per Bothner  <per@bothner.com>
+
+	* xml.c (docbook_element_list): Map ANCHOR to "anchor".
+	* node.c (cm_anchor): Handle docbook.
+
+2007-05-22  Karl Berry  <karl@gnu.org>
+
+	* util/gendocs_template{,_min}: missing period on source link.
+
+2007-05-21  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/multi.c (select_output_environment): C is not Perl.
+
+	* util/install-info.c (--test, --debug): new options,
+	via new variable chicken_flag and debug_flag,
+	and (minimal) implementation thereof.
+	(--silent): synonym for --quiet.
+	* doc/texinfo.txi (Invoking install-info): document them.
+
+2007-05-18  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Invoking install-info): document them.
+
+2007-05-18  Norbert Preining  <preining@logic.at>
+
+	* util/install-info.c (longopts): new options --remove-exactly,
+	--section-regex.
+	(main): handle them.
+
+2007-05-17  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Image Syntax): findex entry should just be for
+	"-", not "@-".  (Which fails due to \initial{\} in texinfo.fns,
+	but that's a different story.)
+
+2007-05-04  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/node.c (cm_anchor): ignore following whitespace,
+	including newlines.  Reported by Kevin Ryde.
+	* doc/texinfo.txi (anchor): state this more clearly.
+
+	* doc/texinfo.tex (\tocreadfilename): allow override of
+	\jobname.toc for sake of 2-volume printed lispref.
+	(\finishentry): change test for no page number (and hence no
+	leaders) again, for "Volume N" in lispref.
+	(\smallbook): adjust margins to be more equal.
+
+2007-05-03  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\urlcolor, \linkcolor): define both as \BrickRed
+	by default.
+
+2007-04-29  Werner Koch  <wk@g10code.com>
+
+	* makeinfo/html.c (process_css_file): Don't omit copying the i
+	of @import.  (Reported on 27 Sep 06.)
+
+2007-04-29  Karl Berry  <karl@gnu.org>
+
+	* system.h [__CYGWIN__]: #define STRIP_DOT_EXE 0 (since gunzip.exe
+	may no longer exist), and PIPE_USE_FORK as 1.
+	From Christopher Faylor, 28 Apr 2007 20:25:56.
+
+	* makeinfo/cmds.c (cm_strong): doc fix.
+
+	* makeinfo/makeinfo.h (paragraph_buffer_len): move decl here ...
+	* makeinfo/makeinfo.c (paragraph_buffer_len): from here.
+	* makeinfo/multi.c (select_output_environment): save and restore
+	paragraph_buffer_len.  Otherwise, an exceptionally long multitable
+	entry (gcal.texi) might realloc output_paragraph, thus increasing
+	paragraph_buffer_len, and then we get back to the main text and
+	restore the old output_paragraph, we'll be out of sync.  Yikes.
+	(Thank you to Electric Fence and valgrind.)
+
+2007-04-26  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* doc/texinfo.tex (cmapOT1, cmapOT1IT, cmapOT1TT): new definitions
+	for pdf so that searching and copying from pdf documents will find
+	text properly, e.g., the "fi" in "file".  Report from
+	Frank K on tex-live.
+
+2007-04-26  Karl Berry  <karl@gnu.org>
+
+	* util/gendocs_template: conform to new GNU style.  From Yavor.
+	* util/gendocs_template_min: previous version, without SSI.
+
+2007-04-21  Karl Berry  <karl@gnu.org>
+
+	* system.h (DMALLOC_FUNC_CHECK) [DMALLOC_DEBUG]: #define.
+
+2007-04-17  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: findex set and clear.
+	From Kevin Ryde, 16 Apr 2007 11:15:00.
+
+2007-04-12  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: improve @: usage and documentation throughout.
+
+2007-04-08  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (bs_escape_quote): new fn.
+	(cm_image) <Info output>: call it, to escape the alt string.
+	Also expand the alt string.
+	bug-texinfo mail from Kevin Ryde, 26 Mar 2007 07:06:14.
+
+	* doc/texinfo.tex (\printindex): set \plainfrenchspacing.
+
+2007-04-07  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* doc/texinfo.tex (\defunpenalty): new register.
+	(\startdefun): use it to avoid page breaks between a defun and a
+	single defunx -- only allow breaks between multiple defunx's.
+
+2007-04-03  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* doc/texinfo.tex (\whatsitskip, \whatsitpenalty): new registers.
+	(\safewhatsit): generalization of \dosubindsanitize.  Change call.
+	(\pdfmkdest, \dosubind, \setref): call it.  This avoids a page
+	break at an anchor (lispref/loading.texi/load-read-function).
+
+2007-04-02  Karl Berry  <karl@gnu.org>
+
+	* util/gendocs_template: "bytes" is more accurate than "characters".
+	* util/gendocs.sh: force English settings; improve --help.
+	From Bruno.
+
+2007-03-31  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (init_paragraph): only free output_paragraph
+	if it is non-null.
+
+2007-03-31  Roland Levillain  <roland@lrde.epita.fr>
+
+	* makeinfo/makeinfo.c (cm_image): Look for a JPEG image in the
+	include search path before giving up.
+	Fix inclusion of JPEG images (with non explicit extension)
+	not present in the current directory, but in the include search path.
+
+2007-03-28  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Menus): missing word "text".
+	From Matt Kraai, 27 Mar 2007 10:26:28 -0700.
+
+2007-03-18  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (cm_image): malloc enough space for the .txt
+	when given an extension.
+
+2007-03-17  Karl Berry  <karl@gnu.org>
+
+	* util/dir-example: dmalloc, alignment.
+
+2007-03-13  Oleg Katsitadze  <olegkat@gmail.com>
+
+	* doc/texinfo.tex (\enddoublecolumns): add \penalty0 so the
+	recent contributions won't be spuriously added to an index page.
+
+2007-02-26  Karl Berry  <karl@gnu.org>
+
+	* info/info.c (info_short_example): example for dumping a whole
+	manual, suggested by Dan Jacobson, 21 Feb 2007 08:37:08.
+
+2007-02-24  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (The Top Node): no @insertcopying recommended,
+	per rms.
+
+2007-02-21  Karl Berry  <karl@gnu.org>
+
+	* system.h: simplify system header inclusion, following current
+	practice; that is, copied from GNU Hello.
+
+	* makeinfo/test/no-headers (nulldev): just always use /dev/null.
+	Also from Brian.
+
+	* system.h (strcase.h) [!HAVE_STRCASECMP...]: remove this
+	inclusion entirely, apparently with gnulib string.h suffices.
+	Report from Brian Dessent, 31 Oct 2006 15:50:34.
+
+2007-02-21  Brian Dessent  <brian@dessent.net>  (tiny change)
+
+	* info/info.c,
+	* info/infokey.c,
+	* info/makedoc.c,
+	* util/texindex.c (program_name): declare as non-static, for
+	non-glibc, e.g., Cygwin.  bug-texinfo mail from 31 Oct 2006 15:50:34.
+
+2007-02-14  Miloslav Trmac  <mitr@redhat.com>
+
+	* makeinfo/makeinfo.c (getdocumenttext): Correctly save and
+	restore the current locale configuration.
+	bug-texinfo mail of 14 Feb 2007 16:28:37 +0100.
+
+2007-02-11  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (HTML Xref Link Basics): manual is metasyntactic.
+
+	* doc/texinfo.txi (documentencoding, documentlanguage):
+	mention the UTF-8 is (sort of) supported, and that these commands
+	should be given after @setfilename.
+
+	* doc/texinfo.tex (\pdfmkdest): \makevalueexpandable,
+	so simple @value in @node names can work.
+	Report from Jorge Barros de Abreu, 14 Jan 2007 08:24:57 (+ff).
+
+2007-02-10  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* gnulib/m4/gettext.m4: Upgrade to gettext-0.16.
+	* gnulib/m4/lib-link.m4: Upgrade to gettext-0.16.
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.16.
+
+2007-02-07  Miloslav Trmac  <mitr@redhat.com>
+
+	* configure.ac: Remove unnecessary wcwidth () test.  Add missing
+	setlocale () test.
+	* makeinfo/makeinfo.c (string_width): Remove.
+	* makeinfo/makeinfo.h (string_width): Remove declaration.
+
+	* makeinfo/cmds.c (cm_center)
+	* makeinfo/index.c (insert_index_output_line_no, cm_printindex):
+	* makeinfo/makeinfo.c (do_flush_right_indentation)
+	* makeinfo/multi.c (output_multitable_row): Use mbswidth () and
+	mbsnwidth () instead of string_width ().
+
+2007-01-25  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/float.c (cm_listoffloats): always use the short caption
+	in the list of floats if it is provided.  Report from
+	Jay Berkenbilt, 19 Jan 2007 11:58:00 -0500.
+
+2007-01-16  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (insert_commands): Use fatal for errors.
+	(insert_commands): Actually, use "error", not "fatal".
+	White space changes.
+
+2007-01-16  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (run_makeinfo): Instead of putting the whole
+	function in a "case", return if the language is not texinfo.
+
+2007-01-16  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi: White space changes.
+
+2007-01-08  Karl Berry  <karl@gnu.org>
+
+	* util/texinfo.dtd (rArr): define, per Per.
+
+2007-01-07  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/cmds.c (cm_result): use rArr for html or docbook.
+
+	* makeinfo/lang.c (encoding_table): include UTF-8, just passing
+	through everything as-is.
+	(asis_map): rename us_ascii_map (and change US-ASCII entry).
+
+2007-01-03  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/xml.c (xml_id): oops, whitespace should be replaced
+	too.  And probably more, but let's leave it at this for now.
+
+2007-01-02  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/xml.c (xml_id): do not use the SGML rules for id's,
+	which were very restrictive (no 8-bit chars).  Instead, just pass
+	along what we are given, more or less, per current XML.
+
+2006-12-30  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/xml.c (xml_insert_element_with_attribute): remove the
+	warning again, the html-docdesc test triggers it for no apparent
+	reason, and I don't want to debug it now.
+
+	* doc/texinfo.tex (\DeclareUnicodeCharacter, et al.): new macros
+	to support @documentencoding UTF-8 (as well as Computer Modern
+	can).  From Werner Lemberg.
+
+2006-12-28  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/xml.c (xml_insert_element_with_attribute): give a
+	warning if we need to ignore an insertion because the book hasn't
+	started.  Can this ever happen with acceptable Texinfo documents?
+	I saw it in a document without @settitle but with @copying.
+	(xml_add_char): ensure that we have an element stack before
+	testing xml_current_element and failing the assertion.
+	(xml_pop_current_element): do not try to print the value of the
+	current element on underflow, there isn't one.
+
+2006-12-23  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\xrdef, \xrefX, \pdfmkdest): sanitize the node
+	name, so accents (either 8-bit chars or cmds) can be used.
+
+2006-12-22  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\setnormaldispenv, \setsmalldispenv): do
+	\endgraf before changing fonts, to get leading of previous
+	paragraph right when there is no blank line.
+	From John Gabriele, 21 Dec 2006 18:00:24.
+
+2006-12-11  Miloslav Trmac  <mitr@redhat.com>
+
+	* configure.ac: Test wcwidth () availability.
+	* makeinfo/makeinfo.h (string_width, current_output_column): New
+	declarations.
+	(output_column): Remove.  All users replaced by
+	current_output_column (), all modifications dropped.
+	* makeinfo/makeinfo.c (output_paragraph_start_column): New
+	variable.
+	(string_width, current_output_column): New functions.
+	(get_char_len): Remove.
+	(init_paragraph): Initialize output_paragraph_start_column.
+	(flush_output): Update output_paragraph_start_column.
+
+	* makeinfo/cmds.c (cm_center)
+	* makeinfo/index.c (insert_index_output_line_no, cm_printindex):
+	* makeinfo/makeinfo.c (do_flush_right_indentation)
+	* makeinfo/multi.c (output_multitable_row):
+	Don't assume number of columns == number of bytes.
+
+2006-12-11  Miloslav Trmac  <mitr@redhat.com>
+
+	* makeinfo/makeinfo.h (NON_BREAKING_SPACE): New macro.
+	(control_character_bit, meta_character_bit, CTL, UNCTL, META)
+	(UNMETA): Remove.
+	* makeinfo/makeinfo.c (add_char, flush_output): Use
+	NON_BREAKING_SPACE instead of META (' ').
+	(get_char_len): NON_BREAKING_SPACE is only one column wide.
+
+2006-12-05  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (@documentencoding): mention that it is
+	(somewhat) supported in TeX now.
+
+2006-12-05  Paulo Sequeira  <psequeira@gawab.com>
+
+	* doc/texinfo.tex (\documentencoding): real implementation.
+	(\setnonasciicharscatcode): new macro.
+	(\missingcharmsg): new macro.
+	(\latonechardefs, latninechardefs, \lattwochardefs): new macros.
+
+2006-11-24  Karl Berry  <karl@gnu.org>
+
+	* Makefile.am (po-check): new utility target from coreutils.
+
+2006-11-08  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\dopdfimage): look for png, jpg/jpeg/JPG, and
+	  as well as pdf images, since they are supported in pdftex with
+	  no further ado.
+	* doc/texinfo.txi (Image Syntax): document it.
+
+2006-11-05  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (Image Syntax): don't mention GIF any more.
+
+2006-11-01  Miloslav Trmac  <mitr@redhat.com>
+
+	* util/texindex.c (main): Remove off-line sort implementation.
+	(tempdir, tempbase, tempcount, last_deleted_tempcount)
+	keep_tempfiles): Remove variables.
+	(sort_offline, initbuffer, readline, merge_files, merge_direct)
+	(gettempname, maketempname, flush_tempfiles):
+	Remove functions.
+	(texindex_options): Remove --keep and --no-keep documentation.
+	(decode_command): Ignore --keep.
+	(writelines): Fix comment.
+
+2006-10-24  Karl Berry  <karl@gnu.org>  (tiny change)
+
+	* util/texindex.c (readline): do the reallocation (more) correctly.
+	From Miloslav Trmac.
+
+2006-10-10  Karl Berry  <karl@gnu.org>
+
+	* TODO: would be nice if accent commands implicitly used
+	dotless i/j.
+
+2006-10-09  Miloslav Trmac  <mitr@redhat.com>  (tiny change)
+
+	* util/texindex.c (gettempname): new fn, split off from maketempname.
+	(maketempname): call it.  We weren't deleting temp files.
+	(sort_offline): check result from maketempname.
+
+2006-10-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* makeinfo/tests/quote-args: Add missing $srcdir.
+
+2006-10-04  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\singlequotechar): rename to \codequoteright.
+	(\quoteexpand): rename to \rquoteexpand.
+	(\codequoteleft): new def, to look for @set codequotebacktick.
+	(\lquoteexpand, \quoteexpand): new defs.
+	(\lquoteChar, \rquoteChar, \dashChar, \underChar): new \chardef's.
+	(\code): must use new \...Char values, since now ` is active.
+
+2006-10-01  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (run_bibtex): also run bibtex if "no .aux file" in
+	the .log, and "\bibdata" in the aux, for the first run of a btxmac
+	file.  Report from Oleg Katsitadze.
+
+2006-09-30  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Inserting Braces): spurious ppp.
+
+2006-09-22  Stepan Kasal  <kasal@ucw.cz>
+
+	* configure.ac: Add a comment explaining `env -i PATH=$PATH'.
+
+2006-09-13  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (code): spurious "in the printed manual", from
+	Bob C.
+
+2006-09-01  Eli Zaretskii  <eliz@gnu.org>
+
+	* doc/texinfo.txi (Multitable Rows): Document the Info output of
+	@headitem.
+
+2006-08-26  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/cmds.c (command_table): new command @textdegree{}.
+	* makeinfo/lang.c (cm_special_char): handle textdegree.
+	* doc/texinfo.tex (\textdegree): define it.
+
+	* doc/texinfo.txi (Output Formats): update Beebe paper reference.
+	(Printed Books): update texinfo.tex reference.
+	Report from VAN VLIERBERGHE Stef, 22 Aug 2006 22:05:27 +0200.
+
+2006-08-23  Karl Berry  <karl@gnu.org>
+
+	* doc/Makefile.am (man_rule_bin): use help2man -o, instead of
+	redirection, so that `missing' can infer the output filename.
+
+2006-08-13  Alexander E. Patrakov  <patrakov@ums.usu.ru>  (tiny change)
+
+	* info/man.c (get_manpage_contents), info/info.c (main):
+	Info apparently assumes equivalence of bytes and characters,
+	leading to (for example) translated man output in multibyte
+	locales being broken within a character.  In lieu of a
+	real fix, if MB_CUR_MAX > 1, revert to C.  bug-texinfo mail,
+	07 Aug 2006 14:59:42 +0600.
+
+2006-08-12  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (error \box0): smaller font.
+
+2006-08-08  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Invoking Macros): all commas inside macro calls
+	are quoted, it seems.  From Patrice.
+
+2006-07-25  Karl Berry  <karl@gnu.org>
+
+	* configure.ac (AC_MINIX): remove, as it seems there is nowhere to
+	call it, and is it really necessary these days?
+
+	* doc/info-stnd.texi (What is Info?): suggest the Emacs Info
+	reader for the nicest display.
+
+2006-07-16  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\onepageout): hardwire a 24pt space before
+	\footlinebox, instead of 2\baselineskip.  If the page break occurs
+	at a heading, for instance, \baselineskip might be larger, causing
+	the footer to jump.
+	(\oddfootingyyy): likewise (although doesn't really matter here).
+	Report from Werner Lemberg, 02 Jun 2006 07:44:36 +0200.
+
+	* doc/texinfo.txi: use @copyright{} in @copying, not (C).
+
+2006-07-15  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\code): make ' active.
+	(@lisp,@example): call \quoteexpand.
+	(\quoteexpand): new definition to make ' active.
+	(\singlequotechar): the active definition of '; if
+	the variable codequoteundirected is @set, use char"d from tt
+	instead of the regular directed quote.
+	This is all to make pasting of ' in examples work in more pdf
+	viewers, at least evince.
+	From: Han-Wen Nienhuys, 2 Jun 2006 01:22:44 +0000.
+
+2006-07-10  <Ralf.Wildenhues@gmx.de>
+
+	* makeinfo/html.c (insert_html_tag_with_attribute): Treat `samp'
+	special, to allow it to nest.
+	* makeinfo/cmds.c (cm_code): use insert_html_tag to add `samp'
+	instead of add_word, so that the roll-back of outer tags works
+	correctly.  (This fixes @option inside of @emph causing badly
+	nested tags in the HTML output, see 8 Jun 2006 00:12:55 +0200 mail.
+	The general problem still remains.)
+	* makeinfo/tests/emph-option: New test.
+	* makeinfo/tests/emph-option.txi: New file.
+	* makeinfo/tests/Makefile.am: Adjust.
+
+2006-07-09  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (makeinfo Pointer Creation, Writing a Menu):
+	mention that accesskey is used in the HTML output.
+
+2006-07-09  <Ralf.Wildenhues@gmx.de>
+
+	* doc/texinfo.txi: Fix some typos.
+
+2006-07-04  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* makeinfo/macro.c (add_macro): Initialize def->argcount
+	(get_brace_args): Change argument type to enum quote_type.
+	(All callers updated.) Implement default argument quoting.
+	(expand_macro): Use def->argcount to control the number of passed
+	arguments.
+	(define_macro): Issue a warning if @allow-recursion or @quote-arg
+	is used.
+	* makeinfo/macro.h (MACRO_DEF): New member argcount
+	(enum quote_type): New data type.
+	(get_brace_args): Change argument type to enum quote_type
+	(ME_QUOTE_ARG): Remove the macro
+	* makeinfo/makeinfo.c (cm_ifeq): Update call to get_brace_args
+	* makeinfo/tests/Makefile.am (TESTS): New test quote-args
+	(EXTRA_DIST): New file quote-args.txi
+	* makeinfo/tests/quote-args: New test
+	* makeinfo/tests/quote-args.txi: New file
+	* doc/texinfo.txi: Document automatic argument quoting
+
+2006-07-03  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* doc/txi-pl.tex: Do not use \prefixing and \notprefixing. They
+	were defined in PLaTeX, but are no longer global. Use ISO-8859-1
+	instead.
+
+2006-06-27  Akim Demaille  <akim@epita.fr>
+
+	* util/defs.in ($latex_paragraph): New.
+	* util/latex2html.test (input.tex): Make it big enough to trigger
+	the info file splitting.
+	* util/texi2dvi (move_to_dest): Accept several arguments.
+	(run_hevea): Use it to move the whole family.
+
+2006-06-27  Akim Demaille  <akim@epita.fr>
+
+	Fix the clean invocations to hevea.
+	Note that this breaks document using images (to be fixed).
+	* util/latex2html.test (run_hevea_check): Extend to support
+	various build modes.
+	Test them.
+	Force the creation of aux files (something the previous test
+	failed to do...).
+	* util/defs.in (title): New.
+	* util/texi2dvi: Fix incorrect "error" invocations.
+	(run_hevea): Don't pass -o to hevea.
+	Move the result to the expected destination.
+	Don't pass -noiso.
+
+2006-06-26  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (generated_files_get): Call uniq.
+
+2006-06-07  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Require Automake 1.9, since
+	non-direct subdirs in SUBDIRS (gnulib/lib) is a 1.9 feature.
+
+2006-06-24  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (anchor): pxref Node Line Requirements since the
+	same name restrictions apply.  Suggested by Eli.
+
+2006-06-21  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (fatal): Rename as...
+	(error): this.
+	If the exit status is 0, don't exit.
+	(run): New.
+	Use it where appropriate.
+	(run_dvipdf): New.
+	Use it.
+
+2006-06-21  Akim Demaille  <akim@epita.fr>
+
+	* util/Makefile.am, info/Makefile.am, makeinfo/Makefile.am,
+	* lib/Makefile.am (DEFS): Remove, included in...
+	(AM_CPPFLAGS): this.
+	Add -I $(top_srcdir) to find system.h.
+
+2006-06-19  Karl Berry  <karl@gnu.org>
+
+	* system.h: move to top level.
+	* */Makefile.am (AM_CPPFLAGS): no longer need -I$(top_srcdir)/lib.
+
+	* makeinfo/makeinfo.c (getdocumenttext): replace with a modified
+	version of get_title from gettext, as suggested by Bruno Haible,
+	back on 2 Dec 2003.
+	* gnulib: import xsetenv module.
+
+	* doc/texinfo.tex (\indexdotfill): back to regular (non-italic)
+	periods, suggested by Werner Lemberg and others.
+
+2006-06-19  Akim Demaille  <akim@epita.fr>
+
+	Support dvips and dvipdf for sake of pstricks, and to
+	spare the use tweaking TEXINPUTS.
+	* util/defs.in (optionset_get, assert_and_remove_files): New.
+	* util/texi2dvi (out_lang_tex, out_lang_ext): New.
+	Use them.
+	($language): Rename as...
+	($in_lang): this for consistency.
+	Support --dvipdf and --ps.
+	Not documented yet.
+	* util/dvipdf.test: New.
+	* util/Makefile.am (TESTS): Adjust.
+	* util/texi2dvi.tests (one_run): New.
+
+2006-06-18  Karl Berry  <karl@gnu.org>
+
+	* gnulib: new subdirectory, managed by gnulib-tool.
+	* m4: delete entire subdirectory, now replaced by gnulib/m4.
+	* build-aux: new subdirectory.
+	* README.dev: doc.
+	* autogen.sh: aclocal needs -I gnulib/m4 now.
+	* Makefile.am, util/Makefile.am, lib/Makefile.am, info/Makefile.am,
+	  makeinfo/Makefile.am (AM_CPPFLAGS, LDADD): use new gnulib dirs.
+	* lib/alloca.c, lib/getopt*, lib/gettext.h, lib/mem*, lib/str*,
+	  etc.: delete, now using gnulib modules (as recorded in
+	  gnulib/m4/gnulib-cache.m4)
+
+2006-06-08  Karl Berry  <karl@gnu.org>
+
+	* po/Makevars (XGETTEXT_OPTIONS): add --keyword=__, so that the
+	gettext will mark the new __ strings (2006-05-29 change from
+	Norbert) for translation again.
+
+2006-06-07  <Ralf.Wildenhues@gmx.de>
+
+	* makeinfo/footnote.c (output_pending_notes): Use
+	add_html_block_elt instead of add_word for final part of
+	footnote, so no extra <p> is output.
+
+2006-06-05  Akim Demaille  <akim@epita.fr>
+
+	* util/bibtex.test: Add it for real.
+
+2006-06-03  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: always report tex command being used.
+
+2006-06-02  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (--src-specials): new option,
+	requested by Charlie Zender.
+
+2006-06-01  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\thischapternum): new macro for
+	headings/footings, requested by Werner.
+	* NEWS, doc/texinfo.txi (Command List, Custom Headings): document it.
+
+2006-06-01  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* makeinfo/html.c (html_output_head): Insert external CSS
+	reference if css_ref is set.
+	(fix_filename): Attempt to transliterate the name before falling
+	back to numeric symbol representation.
+	* makeinfo/lang.c (iso8859_2_map): Add transliterations
+	(koi8_map): New map for koi8-u and koi8-r encodings.
+	(encoding_table): Add koi8-u and koi8-r
+	(cm_search_iso_map_char,lang_transliterate_char): New functions.
+	* makeinfo/lang.h (encoding_code_type): Add KOI8_R, KOI8_U
+	(struct iso_map_type): New member `translit'.
+	(lang_transliterate_char): New function prototype.
+	* makeinfo/makeinfo.c: New options --css-ref and
+	  --transliterate-file-names.
+	* makeinfo/makeinfo.h (css_ref, transliterate_file_names): New
+	variables.
+	(URL_SAFE_CHAR): Bugfix: Make sure argument is in isalnum() domain.
+
+	* doc/texinfo.txi: Document new options.
+
+2006-05-30  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac (sigblock): Fix underquoted macro usage.
+
+2006-05-30  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (aux_file_p): Rename the second occurrence as...
+	(bibaux_file_p): this.
+	(run_bibtex): Use it.
+	(options processing, $usage): Support --dvi for symmetry and to
+	ease systematic tests.
+	* util/bibtex.test: New.
+
+2006-05-30  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi: Add support for latex to text and info using
+	hevea.
+	Don't document it yet, as it's preliminary and on some regards
+	incomplete.  It is usable though.
+	(IFS): Use a more robust definition, taken from Autoconf.
+	(bibaux_file_p): New, extracted from...
+	(run_html): Generalize and rename as...
+	(run_hevea): this.
+	(run_core_conversion): Adjust.
+	(option processing): Accept --text and --info.
+	* configure.ac: Check for TEX and HEVEA.
+	* util/defs.in: No longer create a texi file by default.
+	Handle hevea requests.
+	(create_input_tex, create_input_texi): New.
+	(assert_files, list_files): Rework to use diff instead of test.
+	And sort both lists of files before comparing them.
+	* util/latex2html.test: New.
+	* util/Makefile.am (TESTS): Update.
+
+2006-05-29  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.h (getdocumenttext, __): new definitions for
+	strings translated according to the document language, instead of
+	the interface language.
+	* makeinfo/makeinfo.c (getdocumenttext): new fn.
+	(usage): new option --document-language to specify.
+	* makeinfo/lang.h (document_language): new declaration.
+	* makeinfo/lang.c (document_language): define.
+	* makeinfo/defun.c, makeinfo/html.c, makeinfo/node.c,
+	makeinfo/toc.c, makeinfo/xref.c: use __ instead of _ for document
+		strings.
+	* doc/texinfo.txi (makeinfo options): minimal documentation.
+	From Norbert Preining, 10 Mar 2006 02:22:19 +0100.
+	Debian bugs 113988 and 355367.
+
+2006-05-28  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\indexdummies): \let\endinput=\empty, to
+	avoid premature end of processing when an index entry is generated
+	from a macro.
+	Report from Graham Percival to help-texinfo, 22 May 2006 12:03:12.
+
+	* doc/texinfo.tex (\dots): use width of three period characters if
+	that is wider than 1.5em.  Report from Steve Peter.
+
+	* system.h [__CYGWIN__] (NULL_DEVICE): define as /dev/null.
+	From Ralf W.
+
+2006-05-27  Karl Berry  <karl@gnu.org>
+
+	* texi2dvi (IFS): initialize, since otherwise when we save/restore
+	it may end up being set-but-empty, which may disable splitting.
+	Report from Ralf W.
+
+2006-05-20  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (run_makeinfo): use $TEX instead of hardwiring
+	tex, to maybe avoid running into some
+	misconfigured TeX installations, resulting in
+	 ---! /var/lib/texmf/web2c/etex.fmt was written by pdfetex
+	 (Fatal format file error; I'm stymied)
+	Original report from Ralf Wildenhues, 12 May 2006 11:19:13 +0200.
+
+2006-05-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* util/gendocs.sh: quoting, url fixes.
+
+2006-05-08  Karl Berry  <karl@gnu.org>
+
+	* autogen.sh: new name for bootstrap, and improve msg.  From Bruno
+	via hello.
+
+2006-05-07  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\dopdfimage): width and height args might have
+	whitespace.  Report from Bob Chassell.
+
+2006-05-05  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\definetextfonsizexi, \definetextfonsizex): new cmds.
+	(\fonttextsize): new user-level command @fonttextsize to change
+	text font size.  (To be used for the next Emacs edition.)
+	* makeinfo/cmds.c (cm_fonttextsize): new fn.
+	(command_table): include it.
+	* NEWS, doc/texinfo.txi (Fonts): document it.
+
+2006-05-04  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Reporting Bugs): wording to match hello.
+
+2006-04-26  Karl Berry  <karl@gnu.org>
+
+	* doc/Makefile.am (TXI_XLATE): add txi-ru.tex and txi-uk.tex,
+	from Sergey Poznyakoff.
+	* doc/txi-ru.tex, doc/txi-uk.tex: new files.
+
+2006-04-13  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/insertion.c (end_insertion): kill_self_indent(-1) to
+	remove all indentation.  From Brian Gough, 11 Apr 2006 16:42:29 +0100.
+
+2006-04-11  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (GNU Sample Texts): GFDL is version 1.2 now.
+	Report from Claudio.
+
+2006-03-28  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (HTML Xref Command Expansion): use U+2605 for
+	@point{} and U+22A3 for @print{}.  From Patrice.
+
+2006-03-25  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (copying): warn not to indent lines within the
+	@copying.
+
+2006-03-24  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/html.c (escape_string): do not free the old string,
+	that is dangerous, only the caller should do it.
+	(add_link): escape the title string.
+	Report from Ralf Wildenhues, 17 Mar 2006 05:08:11 +0100.
+
+2006-03-21  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/texinfo.tex (\parseargusing, \finishparsearg): Use \argtorun
+	  instead of \next.
+	(\argcheckspacesY): Change the wording of the comment about \next.
+	(\braceorline, \braceorlinexxx): Do not suppose that \next is
+	  preserved during the run of \parsearg, anyway.
+
+2006-03-14  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (section, subsection, unnumberedsubsec,
+	subsubsection): make it clear that @section can be used within
+	any chapter unit.
+	Report from: Hynek Hanke, 11 Mar 2006 20:44:34 +0100.
+
+	* doc/texinfo.tex (\imagexxx): do not center the image by default.
+	The manual says we don't do that, and Lilypond needs
+	left-justification.
+	From: Han-Wen Nienhuys, 9 Mar 2006 21:08:26 +0000.
+
+2006-03-13  Miloslav Trmac  <mitr@redhat.com>  (tiny changes)
+
+	* info/Makefile.am (infokey_LDADD): don't link with curses.
+
+	* makeinfo/sectioning.c: cast arguments to substring, to placate
+	current gcc.
+
+2006-03-13  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: reindent --help message.
+
+2006-03-07  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Writing a Node): show example of specifying
+	some pointers but not others.
+
+2006-02-28  Akim Demaille  <akim@epita.fr>
+
+	Be robust to spaces in directory names.
+	* util/texi2dvi (absolute): Be robust to non directories.
+	(run_tex): Quote in_input properly.
+	(compile): Quote args of eval properly.
+
+2006-02-25  Karl Berry  <karl@gnu.org>
+
+	* info/nodes.c (info_get_node_of_file_buffer): try to avoid
+	running man Top, which returns the top(1) man page on Debian.
+
+2006-02-14  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* util/texi2dvi: New options --translate-file and --recode-from.
+
+2006-02-13  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/cmds.c (cm_enddots): output three dots, not four, for
+	consistency with texinfo.tex.
+
+	* doc/texinfo.tex (\doignore): move \obeylines here.
+	(\dodoignore): from here.  (just putting catcode changes together.)
+	(\doignoretextyyy): revert to previous code, no ##2^^M;
+	that caused blank lines in verbatim envs inside failing conditionals.
+	(\enddoignore): ignore any text after the @end #1 here, instead.
+	Bug report from Bob Wilson, 5 Oct 2005 21:22:33 -0700,
+	amended fix from Stepan, 13 Feb 2006 21:57:07 +0100.
+
+	* info/nodes.c (info_get_node): don't try man Top and man top and
+	man TOP.  Debian bug 234848.
+
+2006-02-11  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (write_trailer): new fn.
+	(convert_from_loaded_file) <finished>: call it *after* the
+	tag table has been written, else Emacs likely won't seeit.
+	Report from: Juri Linkov, 11 Feb 2006 03:11:33 +0200.
+
+2006-02-10  Karl Berry  <karl@gnu.org>
+
+	* util/texinfo.dtd (menucomment): more inclusive.
+	(enumerate): allow indexes.
+	From Torsten.
+
+2006-02-06  Karl Berry  <karl@gnu.org>
+
+	* util/texinfo.dtd: apparently we cannot have -- in an XML
+	comment.  Kludge.
+
+2006-02-05  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (run_makeinfo): eval $makeinfo, for gettext
+	0.14.5's complex $MAKEINFO definition.
+
+2006-01-30  Karl Berry  <karl@gnu.org>
+
+	* util/texinfo.dtd: many additions and fixes from
+	Torsten Bronger.
+
+2006-01-27  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\sectionheading): \nobreak before the \vbox
+	with the heading.
+	Report from: Norbert Preining, 2 Nov 2005 10:07:57 +0100,
+	Debian bug 276000.
+
+2006-01-25  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/lang.c (cm_accent_generic_no_headers): do nothing
+	if end == 0 (accent command in @menu with --no-headers).
+	Report from Akim Demaille, 23 Jan 2006 16:41:38 +0100.
+
+2006-01-18  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (key): more examples.
+
+2006-01-18  Akim Demaille  <akim@epita.fr>
+
+	Sometimes the temporary directory remains.
+	Reported by Wybo Dekker.
+	* util/defs.in (assert_files): New.
+	* util/texi2dvi.test: Use it.
+	Extend to check the local builds.
+	* util/texi2dvi (aux_file_p, index_file_p, xref_file_p): Check
+	that the file exists.
+	(generated_files_get): Simplify according to these changes.
+	(remove, cleanup): New.
+	Use the latter in the cleaning trap.
+	(mostly_clean): Use them.
+
+2006-01-17  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (generated_files_get): Skip nonexistent files
+	earlier.
+
+2006-01-15  Karl Berry  <karl@gnu.org>
+
+	* info/infodoc.c (info_internal_help_text): combine messages
+	which are single sentences into one string.
+	Report from Clytie Siddall, via
+	http://sourceforge.net/tracker/index.php?func=detail&aid=1406541&group_id=40033&atid=426818.
+
+	* po/POTFILES.in: add missing makeinfo/xref.c, makeinfo/float.c.
+	Report from Torsten.
+
+2006-01-09  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi: set -e.
+	Stop using the idiom "test && action" in favor of "if test; then
+	action; fi".
+	(xref_files_save): Use tar instead of cp.
+	(run_makeinfo): Fix a "local" use.
+
+2006-01-08  Loic Minier  <lool@dooz.org>  (tiny change)
+
+	* info/display.c (display_update_one_window): systematize
+	check as to whether `entry' is non-null before referring to it.
+	Still some segfaults when resizing the window rapidly.
+
+2006-01-08  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\normalturnoffactive): restore setting of
+	active \ to \normalbackslash.
+	(\onepageout): restore call to \normalturnoffactive.
+	Otherwise, if a page break happens at the wrong time, the active
+	\ will result in writing an actual \ character,
+	instead of {\tt \backslashcurfont }.
+	Report from Kurt.Hornik@wu-wien.ac.at, 6 Jan 2006 14:38:38 +0100.
+	[test idxback-exts]
+
+2005-12-26  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (node, Node Names): pxref Node Line Requirements,
+	about restrictions on characters in node names.
+
+2005-12-25  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\pdfurl): make @/ a no-op.
+	Report from Kurt Hornik, 23 Dec 2005 13:17:56 +0100.
+
+	* util/texi2dvi (no_file_line_error): new control,
+	with option --no-line-error to set it.  Wybo Dekker's mk program
+	wants to parse TeX's original error messages.
+	(run_tex): obey it.
+
+2005-12-22  Akim Demaille  <akim@epita.fr>
+
+	Implement --mostly-clean, improve the detection of aux files.
+	* util/texi2dvi ($action): New.
+	(--mostly-clean): New.
+	(cd_orig): New.
+	(generated_files_get, aux_file_p, index_file_p, xref_files_p):
+	New.
+	(get_index_files): Remove, replaced by the previous functions.
+	(get_xref_files): Rename as...
+	(xref_files_get): this.
+	(run_index): Use generated_files_get.
+	(clean): Rename as...
+	(mostly_clean): this.
+	Strengthen.
+	($t2ddir): Try to have a `local' absolute file name, not a fully
+	absolute one to avoid very very long file names.
+	* util/texi2dvi.test: Exercise --mostly-clean.
+
+2005-12-20  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (key): DELETE, not DEL, per rms.
+
+2005-12-19  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (run_conversion): Rename as...
+	(run_core_conversion): this.
+	(compile): New.
+	This is the former main program.
+	(clean): New.
+	Use it.
+	(language): Compute it in the main loop.
+
+2005-11-18  Akim Demaille  <akim@epita.fr>
+
+	Factor the handling of list of directories.
+	* util/texi2dvi (list_append, list_prefix, list_infix)
+	(list_dir_to_abs, absolute): New.
+	Use them.
+	($miincludes, $txincludes): Remove, replaced by...
+	($includes): this one.
+	(func_dirname): Don't use fd6 that might not be set up yet.
+	(run_to_html): Use $includes.
+
+2005-11-13  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Top Node Example): missing @end iffnottex.
+	(The Top Node): @end ifnottex, not ifnottext.
+	From Steve Peter.
+
+2005-11-10  Akim Demaille  <akim@epita.fr>
+
+	Make the naming conventions more consistent and shorter.
+	* util/texi2dvi (oformat): Rename as...
+	(out_lang): this.
+	(filename_input, filename_src, filename_xtr, filename_rcd,
+	filename_noext, filename_dir, filename_dir_abs): Rename as...
+	(in_input, in_src, in_xtr, in_rcd, in_noext, in_dir, in_dir_abs)
+	this.
+	(in_base, out_name, out_dir, out_dir_abs, out_base, out_noext): New.
+	(output_base_name): New.
+	(move_to_dest): Use it.
+	(run_tex): Catch invalid calls.
+	Be robust to inclusion in subdirs.
+	(run_bibtex): Simplify when this is not a LaTeX file.
+	(run_tex_suite): cycle is local.
+	(input_file_name_decode): New, extracted from the main loop.
+	Some variables are now local.
+
+	Use the output file name as root for the t2d directory name.
+	* util/texi2dvi (t2ddir): Use $out_noext, no $in_noext.
+	* util/texi2dvi.test: Adjust.
+
+	Be robust to inclusion in subdirs.
+	* util/texi2dvi (run_tex): Look for \include of files in subdirs.
+	(run_bibtex): Citations might be in another aux file.
+
+	Support html.
+	* util/texi2dvi (run_to_html): New.
+	(run_conversion): New, extracted from the main loop.
+	Support --html.
+
+
+2005-11-10  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Def Cmd Template): mismatched example and output.
+	Report from: Steve Peter, 09 Nov 2005 12:46:02 -0500.
+
+2005-10-23  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (insert_commands): missing $ in case statement;
+	from report by Simon Josefsson.
+
+2005-10-09  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\doignoretext): ignore characters after
+	ignored conditionals, e.g., @end ifset.  Otherwise the newline
+	following results in a blank line being output in verbatim
+	environments.
+	From: Bob Wilson, 5 Oct 2005 21:22:33 -0700.
+
+2005-10-05  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi.test: Make sure --build=clean passes.
+	* util/texi2dvi: Fix the handling of --build.
+
+2005-10-05  Karl Berry  <karl@gnu.org>
+
+	* util/texindex.c (maketempname): use mode 0600.
+
+2005-10-02  Karl Berry  <karl@gnu.org>
+
+	* util/texindex.c (maketempname): avoid race condition.
+	(concat): now take three args, so rename to concat3.
+	Debian bug 328365.
+
+2005-09-30  Karl Berry  <karl@gnu.org>
+
+	* configure.ac: reenable utils/defs generation, now that we have
+	the files below.
+
+2005-09-29  Akim Demaille  <akim@epita.fr>
+
+	* doc/texinfo.txi: Document pdftexi2dvi.
+	* doc/Makefile.am (common_texi2dvi_deps): New.
+	Handle texi2pdf and pdftexi2dvi.
+	* util/texi2dvi: Stop supporting shortened long options, as it's
+	causing troubles.  Short options are here anyway.
+	(local): Provide a default implementation if not supported by the
+	shell.
+	(findprog): Use return.
+	(get_xref_files): Rename as...
+	(xref_files_get): this.
+	(xref_files_changed, xref_files_save): New.
+	(run_tex_suite): New.
+	(move_to_dest): Use `local'.
+	($textra_cmd): Compute it in...
+	(insert_commands): here.
+
+	* tests/defs.in, tests/texi2dvi.test, tests/local.test: New.
+	* configure.ac, tests/Makefile.am: Adjust.
+
+2005-09-22  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi ($build_dir): New.
+	(--build-dir): New.
+	($usage): Adjust.
+	($line_error): New.
+	AUC-TeX wants regular TeX error messages, so don't require
+	GNU style error message when under AUC-TeX.
+	($filename_dir_abs): New.
+	($t2ddir): When the build-dir is specified, make sure to avoid
+	collisions between files with equal names, but in different
+	directories.
+	($command_line_filename): Decode possible TeX commands.
+	* util/Makefile.am (pdftexi2dvi): New.
+
+2005-09-20  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi: Be sure to return to the current directory even
+	after obeying --clean.
+
+2005-09-17  Sergey Poznyakoff  <gray@Mirddin.farlep.net>  (tiny change)
+
+	* makeinfo/cmds.c (handle_include): don't expand @verbatiminclude,
+	so that texi2dvi will pass it through to texinfo.tex.  Otherwise
+	the dvi/pdf output is wrong.
+
+2005-09-05  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/texinfo.tex: Fix typo in a comment.
+
+2005-09-05  Karl Berry  <karl@gnu.org>  (tiny change)
+
+	* util/texi2dvi: look for btxmac.tex's "Undefined citation" message.
+	Then texi2dvi works with (e)plain, too, by setting LATEX=tex.
+	Report from Oleg Katsitadze.
+
+2005-08-31  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi: Fix white space issues.
+	Quote uses of directory and file names.
+	Don't expect "export var=val" to work (e.g., SunOS 5.9): do it in
+	two steps.
+	($tex_help): Compute it where needed (run_tex), in particular so
+	that $tex is defined when used.
+	(func_dirname): New.
+	($quiet, $verb): Now regular true/false variables.
+	(verbose): Adjust.
+	(run_tex): When we introduced white space by making absolute file
+	names, circumvent TeX's phobia of space in file names by
+	introducing a symbolic link.
+	(filename_dir): Keep it relative when not $tidy.
+
+2005-08-30  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/xref.c (cm_xref): if the following wrong char is ),
+	suggest @pxref.  Suggested by Kevin Ryde, 30 Aug 2005 09:23:39 +1000.
+
+2005-08-17  Predrag Rakic  <pec@uns.ns.ac.yu>
+
+	* doc/txi-sr.tex: Serbian translation.
+
+2005-08-15  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/texinfo.tex (\normalturnoffactive): Now contains the body of
+	\turnoffactive.  Don't explicitly restore the original value of active \
+	---just let it be.
+	(\turnoffactive): Can now be redefined as \normalturnoffactive
+	  \otherbackslash.
+	(\atdummies): All calls were followed by \turnoffactive; remove that
+	  and add \otherbackslash to the definition, since it already calls
+	  \normalturnoffactive indirectly.
+	(\xrefX): One of the calls of \refx missed the second parameter;
+	  fix that.
+	(\commondummiesnofonts): No need to make ~ other for the definition;
+	  it contains only \~ now.
+	(\backChar, \plusChar, \underChar): Nuke.
+	(\colonChar, \commaChar, \dotChar, \exclamChar, \questChar, \semiChar):
+	  Move just before the definition of ...
+	(\plainfrenchspacing): ... since it's the only place where it's used.
+	(\activebackslash): Remove both definitions; the first one was shadowed
+	  by the second one; and the second one can easily be eliminated; it
+	  was used only on one place.
+	(\backslashlparen): No need for this; \realbackslash( is enough.
+	(\backslashrparen): Likewise.
+
+2005-08-14  Per Bothner  <per@bothner.com>
+
+	* makeinfo/index.c (cm_printindex): Don't defer index if docbook,
+	since we don't need it and it prevents output to a pipe.
+
+	* makeinfo/insertion.h (default_item_function): New declaration.
+	* makeinfo/insertion.c (default_item_function): New variable.
+	(begin_insertion): Use default_item_function for @bullet default.
+	(pop_insertion): Check if item_function is default_item_function.
+	* makeinfo/xml.c (xml_begin_table): Don't emit mark attribute
+	if the item_function was implied.
+
+2005-08-13  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\writetocentry, ...): restore calls to
+	\turnoffactive after \atdummies removed in the July 1 change (v.194).
+	\turnoffactive and \normalturnoffactive are not the same -- we need
+	actual backslash characters in the pdf destinations and .aux and
+	index files, not expansions.  (I'm not sure we ever need
+	\normalturnoffactive, actually.)
+
+2005-08-12  Karl Berry  <karl@gnu.org>
+
+	* doc/info.texi: merge changes from Emacs, by Juri.
+
+2005-08-06  Per Bothner  <per@bothner.com>
+
+	* makeinfo/index.c (cm_printindex): Don't xml_insert_indexentry if
+	docbook, since we'll let the doxbook processor generate the index.
+	* makeinfo/xml.h (xml_sort_index, xml_insert_indexentry): Remove.
+	* makeinfo/xml.c (xml_begin_index): Don't actually do any formatting.
+	(xml_end_index):  Don't do anything except close <index>.
+	(xml_insert_indexentry): Remove no-longer-used function.
+
+	* makeinfo/xml.c (element docbook_element_list): The docbook <index>
+	element should *not* be contained_in_para.
+
+	* makeinfo/xml.c (xml_begin_document): Add id attribute to top-level
+	book if emitting docbook.
+
+2005-08-05  Stepan Kasal  <kasal@ucw.cz>
+
+	* configure.ac: (auto)update.
+	* info/Makefile.am, makeinfo/Makefile.am, utils/Makefile.am: s/INCLUDES/AM_CPPFLAGS/
+	* lib/Makefile.am (INCLUDES): Remove.
+
+2005-08-05  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/texinfo.tex (\Efloat): Revert the previous change, ...
+	(\commondummiesnofonts): ... instead, add the three commands here.
+
+2005-08-04  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\Efloat): make \xref, \pxref, \ref no-ops.
+	Report from: Aaron S. Hawley, 3 Aug 2005 19:46:40 -0400.
+	(But what about all the other commands, don't we need to no-op
+	everything?)
+
+2005-07-31  Per Bothner  <per@bothner.com>
+
+	* makeinfo/cmds.c (cm_code): For html output use lsquo and rsquot
+	entities around @samp.
+
+2005-07-10  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/texinfo.tex (\texinfoversion): Update.
+
+2005-07-05  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (verbatim): mention @verbatim inside
+	@smallformat, now that it works.
+
+2005-07-04  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/texinfo.tex (\commondummies): Remove \unsepspaces, it's already
+	  called by \normalturnoffactive.  Move \normalturnoffactive near the
+	  end of the macro.
+
+2005-07-01  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/texinfo.tex: Remove all occurences of \normalturnoffactive or
+	  \turnoffactive attached to \indexdummies or \atdummies, since they
+	  are redundant; \indexdummies and \atdummies both call \commondummies,
+	  which calls \normalturnoffactive, which calls \turnoffactive.
+	(\indexdummies, \atdummies): Move the definitions of \definedummy* ...
+	(\commondummies): ... here; they now take a control sequence as their
+	  parameter; all callers fixed.
+	(\indexnofonts): Fixed the definitions of \definedummy* macros.
+	(\indexdummies): Define \escapechar = `\\ ...
+	(\onepageout): ... thus remove it from here.
+	(\macrolist): Now has the form of \definedummyword\macro1...  It also
+	  gathers user-defined aliases, so there is ...
+	(\addtomacrolist): ... a new macro ...
+	(\macroxxx, \aliasyyy): ... caled from these two.
+	(\unmacro, \unmacrodo): Adapted to the new form of \macrolist.
+	(\turnoffmacros, \emptyusermacros): Removed, mere \macrolist is enough
+	  now.
+
+2005-07-01  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/texinfo.tex (\nonarrowing): Update the description.
+	(\cartouche): Set \nonarrowing to "t", not \comment.
+	(\nonfillstart, \quotation): Reset \nonarrowing.
+
+2005-06-30  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/texinfo.tex (\setupverbatim): Use \nonarrowing to declare that
+	we don't want to narrow the environment.
+
+2005-06-24  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi: Move the computation of $makeinfo to...
+	(run_makeinfo): here.
+
+	* util/texi2dvi (tex, bibtex, texindex): Move their computation to...
+	(run_tex, run_bibtex, run_texindex): here, to clarify.
+	(move_to_dest): New.
+	(run_tex): Use it to copy the result back.
+	Don't bother exporting the log.
+
+2005-06-10  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\., \!, \?): include \space after setting
+	\spacefactor, else all space disappears.
+	Report from Jim Meyering, 09 Jun 2005 23:03:22 +0200.
+
+2005-06-10  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (run_tex): Updating the output is also needed when
+	-o is used, not just when $tidy.
+
+2005-06-09  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi: Support --tidy, a new build mode which lets all the
+	compilations happen in a local directory.  This is
+	similar to using --clean, but the files are preserved.  The
+	benefits are:
+	- the output is updated when each tex compilation is completed:
+	  - to allow interactive viewing
+	  - to preserve the previous output is the compilation fails
+	- if the compilation fails, the previous state is preserved.
+	- a fixed set of files to clean in this end (this directory)
+	- complete independence between DVI and PDF compilations.
+
+	(comment_iftex_sed, uncomment_iftex_sed): No
+	longer external files, but simple strings named...
+	(comment_iftex, uncomment_iftex): like this.
+	(utildir): Remove.
+
+	Make the structure clearer by introducing auxiliary functions.
+	* util/texi2dvi (run_bibtex, run_index, insert_commands)
+	(run_recode, run_thumpdf): New.
+	Extracted from the main loop.
+
+	Simplify some variable handling.
+	* util/texi2dvi (clean, debug): Now true/false Booleans.
+	Adjust dependencies.
+
+	Introduce a cycle counter.
+	* util/texi2dvi (cycle): New, to inform the user about the number
+	of compilation cycles.  That's also a nice tool to help debugging:
+	look for "cycle" in the trace to go from cycle to cycle.
+
+	Introduce the work dir, and use it.
+	* util/texi2dvi (ensure_dir, workdir): New.
+	(tmpdir_src, tmpdir_xtr, tmpdir_rcd, tmpdir_bak): Replace with...
+	(work_src, work_xtr, work_rcd, work_bak): these.
+	Adjust dependencies.
+	(filename_src, filename_xtr, filename_rcd, filename_bak): these.
+	(run_tex): Update the output.
+	Remove this task from the core of the loop.
+	(get_xref_files): Simplify by considering all the files around,
+	instead of try to select only those that correspond to a given
+	pattern.
+	Also, there's no reason to build the string result and then echo
+	it, just directly echo all the components.
+	(get_index_files): New.
+	(build_mode): New.
+	Adjust all dependencies (tex_help, command line parsing, clean,
+	tidy).
+
+2005-06-05  Karl Berry  <karl@gnu.org>  (tiny change)
+
+	* doc/texinfo.txi: typos from Christian von Schultz,
+	5 Jun 2005 16:45:48 +0200.
+
+2005-06-03  Karl Berry  <karl@gnu.org>
+
+	* info/man.c (get_manpage_contents): pass -a to man if no explicit
+	section is found.  Suggestion from lacall@micron.com on
+	help-texinfo, 1 Jun 2005 16:44:20 -0600.
+
+2005-05-28  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.14.5.
+
+2005-05-25  Stepan Kasal  <kasal@ucw.cz>
+
+	* util/texi2dvi (findprog): Rewrite the test for an executable
+	again, per suggestion of Eric Blake.  Restore IFS earlier.
+
+2005-05-24  Stepan Kasal  <kasal@ucw.cz>
+
+	* util/texi2dvi (findprog): Rewrite the test for an executable and
+	the explanation above it.
+
+2005-05-20  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.texi (\allowcodebreaks, \kbdinputstyle): use \txiarg
+	instead of \arg; \arg already has a meaning in plain TeX (the
+	complex math function "arg").
+	Report from: Brian Gough, 19 May 2005 19:48:57 +0100.
+
+2005-05-19  Stepan Kasal  <kasal@ucw.cz>
+
+	* configure.ac (AM_GNU_GETTEXT): The comment should not recommend
+	calling gettextize with --intl.
+
+2005-05-13  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (First Node): ok for (dir) to be the prev node,
+	and fix missing example.
+	From from Christian von Schultz, 13 May 2005 10:37:26 +0200.
+
+2005-05-10  Matthias Kilian  <kili@outback.escape.de>
+
+	* makeinfo/cmds.c, makeinfo/defun.c, makeinfo/insertion.c,
+	makeinfo/lang.c, makeinfo/macro.c, makeinfo/multi.c,
+	makeinfo/node.c, makeinfo/xml.c: More bounds checking.
+
+2005-05-09  Andreas Vögele  <voegelas@gmx.net>  (tiny change)
+
+	* makeinfo/multi.c (output_multitable_row): don't look past
+		beginning of cell memory.  bug-texinfo mail,
+		1 May 2005 10:00:33 +0200.
+
+2005-05-09  Christian von Schultz  <admcvs@Skolwebben.tibro.se>  (tiny change)
+
+	* doc/texinfo.txi (Emacs chapter): wrong key bindings for
+		narrow-to-page, up-list, and texinfo-insert-braces.
+		bug-texinfo mail, 9 May 2005 10:01:06 +0200.
+
+2005-04-29  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: remove ls(1) and rcsintro(1) references at rms'
+	request.  No (n) in GNU.
+
+2005-04-24  Karl Berry  <karl@gnu.org>
+
+	* configure.ac (AM_GNU_GETTEXT): switch to [external], since this
+	seems the most popular method nowadays.
+	(AC_CONFIG_FILES): remove intl/Makefile, also m4/Makefile.
+	* Makefile.am (SUBDIRS): remove intl and m4.
+	* intl/*: remove.
+	* m4/Makefile.am: no longer needed.
+	* lib/system.h (locale.h): unconditionally include, else syntax
+	error from system locale.h.
+
+	* gettext 0.14.4.
+
+2005-04-22  Per Bothner  <per@bothner.com>
+
+	* makeinfo/xml.c (docbook_element_list): Map EMAILADDARESS to "email".
+	* makeinfo/xref.c (cm_email): For docbook, if there is no name,
+	use <email> tag, rather than <ulink>.  If there is a name, we must use
+	<ulink>, but we need to explicitly escape expansion of addr.
+
+2005-04-22  Per Bothner  <per@bothner.com>
+
+	* makeinfo/xml.c (docbook_element_list, xml_begin_defterm): Improved
+	docbook translation of definition commands: Use <synopsis> for the
+	summary line, and don't include it (only the body) in a <blockquote>.
+	Wrap the whole definition in an <informalfigure>.
+
+2005-04-21  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: also accept .drv and .dtx as LaTeX.
+	Suggestion from Wybo Dekker.
+
+2005-04-18  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\smallerbook): new (test) definition for 6x9,
+		which is what lulu.com (print-on-demand) accepts.
+
+2005-04-05  Matthias Kilian  <kili@outback.escape.de>  (tiny changes)
+
+	* makeinfo/html.c (rollback_empty_tag): be sure to avoid negative
+	array indexing.
+	* makeinfo/multi.c (env): make static.
+	* makeinfo/tests/cond, html-extrali, include-value: use grep -c,
+	instead of piping to wc -l, since that avoids the output files
+	being treated as binary on BSD.
+
+2005-04-04  Stepan Kasal  <kasal@ucw.cz>
+
+	* makeinfo/makeinfo.c (usage): Add indentation to the examples and
+	  fix the indentation of the --footnote-style option, so that
+	  help2man can recognize these; also some cosmetic indentation fixes.
+	* doc/Makefile.am (makeinfo.1): Add a sed command to postprocess
+	  the generated manpage.
+	* doc/makefile.1: Refresh.
+	Thanks to Jim Razmus for the bug report.
+
+2005-04-04  Torsten Bronger  <bronger@physik.rwth-aachen.de>  (tiny changes)
+
+	* doc/texinfo.txi: Fix several typos.
+
+2005-04-04  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/Makefile.am: Fix my previous patch, so that the rules work; and
+	  don't modify $PATH, it's simpler to give help2man the full pathname.
+
+2005-03-31  Per Bothner  <per@bothner.com>
+
+	* makeinfo/makeinfo.c (maybe_escaped_expansion): Don't start a new
+	para during string expansion.
+
+	* makeinfo/xml.c (xml_element_dummy): Dummy variable so that enum
+	names get emitted in debug symbols, which helps debugging.
+
+2005-03-31  ezra peisach <epeisach@med-xtal.bu.edu>  (tiny change)
+
+	(bug-texinfo mail 30 Mar 2005 16:40:24 -0500.)
+	* defun.h (get_base_type): now takes an enum insertion_type.
+	  defun.c (get_base_type): use enum instead of int internally.
+	  (defun_internal): takes enum insertion_type instead of int and use
+			  enum internally.
+	 (cm_defun): ditto.
+	* insertion.c (do_enumeration, end_insertion, cm_end): ditto.
+
+2005-03-27  Karl Berry  <karl@gnu.org>
+
+	* util/texinfo.dtd: remove -- and ^L from inside comments, since
+	apparently XML cannot handle them.
+	Report from Torsten, bronger@physik.rwth-aachen.de.
+
+	* configure.ac (AC_INIT): quote address.
+	(AC_PREREQ): move to after AC_INIT, per current recommendation.
+
+2005-03-25  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/Makefile.am: help2man should use the native binaries in the
+	  build tree, not the one found on $PATH; thanks to Thomas Schwinge
+	  for reporting the problem.
+	  The rules also make sure the binaries are up-to-date, and generate
+	  the man pages in the source tree, not build tree.
+	  There is no need to depend on MAINTAINER_MODE, because help2man is
+	  handled by the `missing' script.
+	(INSTALL_INFO): Comment out; it's not used.
+	* Makefile.am (distcleancheck_listfiles): Removed this variable, it
+	  doesn't seem to be needed.
+	* configure.ac (AC_INIT): Add our bug report address.
+
+2005-03-21  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (allowcodebreaks): new node.
+	* makeinfo/cmds.c: define @allowcodebreaks (as a no-op).
+	* doc/texinfo.tex (\allowcodebreaks): new macro.
+	(\code): use it.
+	(\realunder, \keywordtrue, \keywordfalse, \ifallowcodebreaks):
+	helpers.
+
+2005-03-15  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.14.3.
+
+2005-03-12  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.14.2.
+
+2005-03-12  Karl Berry  <karl@gnu.org>
+
+	* process_css_file: fclose the file when we're through with it,
+	to avoid fd leaks.
+	From: Matthias Kilian <kili@outback.escape.de>,
+	11 Mar 2005 19:42:27 +0100.
+
+2005-03-08  Keith Marshall  <keith.d.marshall@ntlworld.com>
+
+	* makeinfo/tests/no-headers: ($nulldev): new variable.
+	  set it to `/dev/null' normally, but to `nul' on Win32,
+	  so Cygwin doesn't fail this test, in `make check'.
+
+2005-03-08  Karl Berry  <karl@gnu.org>
+
+	* info/filesys.h (DEFAULT_INFOPATH): make . first in the path,
+	instead of last.  That way info -f foo/bar finds foo/bar.info.
+	From: Bruno Haible <bruno@clisp.org>, 8 Mar 2005 13:45:28 +0100.
+
+2005-03-07  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi: Fix -o when -c is not passed.
+	Don't make thumbpdf failures fatal.
+
+2005-03-05  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (General Index): Rename from Concept Index.
+
+2005-02-28  Stepan Kasal  <kasal@ucw.cz>
+
+	* util/texi2dvi: When running bibtex, improve quoting and again,
+	  we can save a process by not running ls.  (Thanks, Akim.)
+
+2005-02-24  Stepan Kasal  <kasal@ucw.cz>
+
+	* util/texi2dvi (get_xref_files): No need to use ls, save a process.
+
+2005-02-22  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (absolute_filenames): Skip nonexistent directories.
+	Factor its invocations for TeX envvars.
+	(fd6): Document and use more extensively.
+	(get_xref_files): Accept bu[0-9]#.aux files from the bibunits
+	package.
+	Also adjust the bibtex invocation.
+
+2005-02-19  Karl Berry  <karl@gnu.org>
+
+	The main user-visible change of all this is to make
+	section names with \ characters work in pdf outlines.  As a side
+	effect, .toc files now use @ instead of \ for the escape char.
+	* doc/texinfo.tex (\backChar, \plusChar): new \chardef's.
+	(\activebackslash): debugging macro.
+	(\activebackslashdouble): new macro.
+	(\HyPsdSubst): replace tokens.
+	(\HyReturnAfterFi): helper.
+	(\backslashparens): new macro, change () to \( and \) resp.
+	(\backslashlparen, \backslashrparen): new macros.
+	(\pdfmkdest): double backslashes, backslashparens, and @ for escape.
+	(\dopdfoutline): similarly.
+	(\pdfmakeoutlines): \readdatafile on the .toc the first time,
+	 instead of straight \input.
+	(\makelinks, \picknum, \pn, \ppn, \ppnn, \pdfmklink): rm.
+	(\writetocentry): now we use @ for escape in the .toc instead of \.
+	(\activecatcodes, \readtocfile): new macros.
+	(\startcontents): don't swap \ and @ catcodes from Texinfo.
+	(\setref, \dofloat): no need to call \otherbackslash.
+	(\xrefX): no need to call \otherbackslash, also double backslashes
+	and backslash parens for pdf output.
+	(\readauxfile): generalize and rename to \readdatafile.
+	(\doublebackslash): new macro.
+
+	* util/texi2dvi: do not have -o (used by Autoconf/make) imply
+	--clean.  That results in TeX always running at least twice, since
+	the aux files are stuck (and removed) in the temp directory for clean.
+
+2005-02-18  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: call absolute_filenames on BIBINPUTS and
+	BSTINPUTS, too.  te, 17 Feb 2005 20:10:23 +0100.
+
+2005-02-13  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (frenchspacing): new code.
+	* makeinfo/cmds.c (command_table): add frenchspacing.
+	(cm_frenchspacing): new fn.
+	* util/texinfo.dtd (frenchspacing): new element.
+	(option.cmds): new entity; use in Inline.phrase, I guess.
+	* makeinfo/xml.h (xml_element): add FRENCHSPACING.
+	* makeinfo/xml.c (docbook_element_list, texinfoml_element_list): same.
+	* doc/texinfo.tex (\frenchspacing): new macro for new command.
+	(\onword, \offword): args to that command.
+	(\plainfrenchspacing, \plainnonfrenchspacing): the commands which
+		really do the work; change calls.
+	(\endofsentencespacefactor): set in \plain...frenchspacing to 3000
+		or 1000 as appropriate.
+	(\., \!, \?): use here, instead of hardwiring 3000.
+
+2005-02-10  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (findprog): also check for foo.exe, for Cygwin.
+
+2005-02-10  Karl Berry  <karl@gnu.org>
+
+	* info/dir.c (dir_file_list_entry_type): use dev_t and ino_t
+	instead of unsigned long.  (Breaks on cygwin.)  David Hunter
+	bug-texinfo mail, 08 Feb 2005 23:05:37 -0500.  Paul Eggert says
+	these types should were present in 7th Edition and consequently
+	should be portable to any Unixish system.
+
+2005-02-09  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (report): New.  Use it.
+	(fatal): Take the exit status as argument.
+	Use report.
+	(run_tex): New function to factor the two tex invocations.
+	Move the handling of tex arguments in here to improve locallity.
+	Enforce the batch mode by branching /dev/null to its stdin.
+
+2005-02-05  Per Bothner  <per@bothner.com>
+
+	* makeinfo/xml.c (docbook_element_list): Add two missing entries.
+
+	* makeinfo/xml.c (xml_begin_document): Check for mismatch between
+	enum xml_element and texinfoml_element_list/docbook_element_list.
+
+	bug-texinfo-mail, 05 Feb 2005 00:13:44 -0800.
+
+2005-02-05  Per Bothner  <per@bothner.com>
+
+	* makeinfo/xref.c (cm_uref): Ulink urls in Docbook need to be
+		html-escaped.  bug-texinfo mail, 05 Feb 2005 00:57:55 -0800.
+
+2005-01-30  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.tex (\chapmacro) <Ynothingkeyword>: failed to
+	\gdef\thischapter inside the group, resulting in "Chapter 1:"
+	appearing in the headline of an @unnumbered.
+	help-texinfo bug report from: <tdovera@libero.it>,
+	27 Jan 2005 11:45:31 +0100.
+
+2005-01-28  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi <verbose>: rename variable to verb, since
+		functions and variables apparently cannot have the same
+		name on Digital UNIX 4.0E, AIX 3.2.5 (325102), ULTRIX V4.5.
+		(and related releases, presumably).
+	<pgm>: simplify sed expression to avoid \| operator, which does
+	        not work on above platforms (and also be more correct).
+	<RUNNING_KSH>: switch to ksh under Ultrix.
+	All of this stuff reported by Bernhard Simon <simon@zid.tuwien.ac.at>
+	and te.
+
+2005-01-25  Karl Berry  <karl@gnu.org>
+
+	* doc/Makefile (texmf_dvips, texmf_pdftex_misc): new paths to
+	match teTeX.  tex-k mail from peb, 25 Jan 2005 15:45:37 +0100.
+
+2005-01-23  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi (findprog): split $PATH at $path_sep, not spaces.
+	(path_sep): don't let ComSpec fool us under cygwin.
+	Report from: Eric Blake <ebb9@byu.net>, 19 Jan 2005 05:36:26 -0700.
+
+	* doc/texinfo.txi (euro): mention the font we use for the Euro
+	symbol and where to get it.  help-texinfo report from:
+	christoph.sobotka@utanet.at, 19 Jan 2005 21:29:20 +0100.
+
+	* doc/info-stnd.texi (Top): per rms, don't use @insertcopying here.
+	* doc/texinfo.txi (Top): Likewise.  Also, remove recommendations
+		to use it.
+
+2005-01-20  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi: Have a consistent function declaration style.
+	(verbose, absolute_filenames): New functions.
+	Use them.
+	Report TEXINPUTS and INDEXSTYLE when verbose.
+
+2005-01-20  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.5, doc/info.5: define and use .EX/.EE instead of
+		.RS/RE, to placate esr.
+
+	* util/texi2dvi (findprog): make sure test -x isn't returning true
+	for a directory.  From Stepan and others, 20 Jan 2005 12:35:08 +0100.
+
+2005-01-16  Torsten Bronger  <bronger@physik.rwth-aachen.de>  (tiny change)
+
+	* makeinfo/insertion.c (handle_verbatim_environment): do HTML
+		conversions, to make ]]> work.
+	* makeinfo/xml.c (xml_add_char): also escape >.
+
+2005-01-16  Torsten Bronger  <bronger@physik.rwth-aachen.de>  (tiny change)
+
+	* makeinfo/cmds.c (cm_tie): use &nbsp; for HTML, &#xa0; for
+		XML/Docbook.
+
+2005-01-15  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/xref.c (cm_xref): output *note for @ref, instead of
+		*Note.  @ref is always used in the middle of a sentence.
+	* doc/texinfo.txi (pxref): rewrite, since now it can be used at
+	the ends of sentences.
+	(ref): likewise rewrite.
+
+2005-01-11  Karl Berry  <karl@gnu.org>
+
+	* util/gendocs.sh: eval $cmd instead of just $cmd, so allow for
+		embedded quotes.
+	From: Sergey Poznyakoff <gray@Mirddin.farlep.net>,
+	11 Jan 2005 16:16:32 +0200.
 
 2004-12-31  Karl Berry  <karl@gnu.org>
 
@@ -112,7 +3042,7 @@
 	intptr_t is not defined with gcc 3.04 on Tru64 Unix V5.1
 	(This whole vararg stuff needs to be redone correctly.)
 	Report from: Svend Tollak Munkejord (via te)
-        8 Dec 2004 17:15:17 +0100.	
+	8 Dec 2004 17:15:17 +0100.
 
 	* doc/texinfo.txi (ref): rewrite last two redundant paragraphs.
 
@@ -127,7 +3057,7 @@
 	nodename begins with a nonletter.  Ugh.
 	* doc/texinfo.txi (HTML Xref Node Name Expansion): document this.
 	http://ff0.org/pipermail/texinfo-pretest/2004-December/000210.html
-	
+
 	* doc/texinfo.txi (HTML Xref 8-bit Character Expansion): define
 	behavior for Unicode code points above 0xfff.
 
@@ -152,7 +3082,7 @@
 
 	* doc/texinfo.txi (Quotations and Examples): @quotation does not
 	reduce interparagraph spacing.
-	
+
 	* makeinfo/node.c (cm_node) <html>: do not bother calling
 	add_html_nodes in the split case, the filename is wrong.
 
@@ -203,7 +3133,7 @@
 	(\textfonts .. \ssecfonts): define \curfontsize.
 	* makeinfo/cmds.c (command_table): add euro.
 	* makeinfo/lang.c (cm_special_char): handle euro.
-	(iso8859_15_map): new global.	
+	(iso8859_15_map): new global.
 
 2004-11-18  Stepan Kasal  <kasal@ucw.cz>
 
@@ -226,7 +3156,7 @@
 	* insertion.c (end_insertion): insert closing xml tag.
 
 	* makeinfo/makeinfo.c (insert_string): declare const char * arg.
-        * makeinfo/makeinfo.h: likewise.
+	* makeinfo/makeinfo.h: likewise.
 	Report from: Vincent Lefevre, 20 Oct 2004 15:40:39 +0200,
 	noting a spurious </para> after </dircategory>.
 
@@ -354,7 +3284,7 @@
 
 	* doc/*.texi: more consistent use of dashes.
 	From Stepan and Benno Schulenberg <benno@nietvergeten.nl>.
- 
+
 2004-10-04  Karl Berry  <karl@gnu.org>
 
 	* makeinfo/makeinfo.c (cm_value): increment and restore
@@ -422,7 +3352,7 @@
 	obsolete.  Reported by Stepan.
 
 	* doc/texinfo.txi (caption shortcaption): show an example for
-        @shortcaption, and remark that weird commands like @c and @verb
+	@shortcaption, and remark that weird commands like @c and @verb
 	are not allowed.  Suggested by Stepan.
 
 2004-08-27  Stepan Kasal  <kasal@ucw.cz>
@@ -473,7 +3403,7 @@
 2004-08-19  Stepan Kasal  <kasal@ucw.cz>
 
 	* doc/texinfo.tex (\scanmacro): Make backslash active, not other,
-	  as this is the default when processing texinfo files. 
+	  as this is the default when processing texinfo files.
 	  Otherwise, a \ inside @copying will eventually print as ``.
 
 2004-08-18  Stepan Kasal  <kasal@ucw.cz>
@@ -505,14 +3435,14 @@
 	* info/echo-area.c (inform_in_echo_area): avoid buffer overrun.
 	Report from: Roman Werpachowski <rwerp@gazeta.pl>,
 	7 Aug 2004 01:18:32 +0200.
-	
+
 	* info/echo-area.h (inform_in_echo_area): declare arg as const,
 	while we're at it.
 
 2004-08-02  Karl Berry  <karl@gnu.org>
 
 	* makeinfo/cmds.c (cm_acronym_or_abbr): use strchr, not index.
-	Report from: Prof Brian Ripley <ripley@stats.ox.ac.uk>, 
+	Report from: Prof Brian Ripley <ripley@stats.ox.ac.uk>,
 	2 Aug 2004 12:47:36 +0100 (BST)
 
 2004-07-31  Karl Berry  <karl@gnu.org>
@@ -530,7 +3460,7 @@
 
 2004-07-30  Maciej W. Rozycki  <macro@linux-mips.org>
 
-	* info/filesys.c (extract_colon_unit): Clean up handling of the 
+	* info/filesys.c (extract_colon_unit): Clean up handling of the
 	end of string.
 
 2004-07-27  Karl Berry  <karl@gnu.org>
@@ -557,13 +3487,13 @@
 
 2004-07-26  Karl Berry  <karl@gnu.org>
 
-        Avoid using the path for output files, since this led to problems
-        when incompatible files created by previous versions were found.
+	Avoid using the path for output files, since this led to problems
+	when incompatible files created by previous versions were found.
 	* makeinfo/files.c (find_and_load): introduce second parameter
 		use_path, set to 0 from the call in handle_delayed_writes,
 		1 in all cases.
-        * makeinfo/files.h: change decl.
-        * makeinfo/cmds.c, makeinfo.c, node.c: change calls.
+	* makeinfo/files.h: change decl.
+	* makeinfo/cmds.c, makeinfo.c, node.c: change calls.
 	From: Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>,
 	14 Jul 2004 00:31:54 +0200.
 
@@ -635,22 +3565,22 @@
 		end of input_text.  (Had erroneously put that in the block
 		only if an error was given.)  The result was a null byte
 		after macro expansions.  Report from Werner,
-		10 Jul 2004 15:36:40 +0200.		
+		10 Jul 2004 15:36:40 +0200.
 
 	* makeinfo/node.c (split_file): fwrite Local Variables trailer so
 		it actually gets into the output of the top-level info
-		file; don't just insert_string.  
+		file; don't just insert_string.
 	Report from: Werner LEMBERG, 11 Jul 2004 08:58:13 +0200.
 
 2004-07-10  Karl Berry  <karl@gnu.org>
 
-        * util/texi2pdf: new script.
-        * util/Makefile.am: install it.
-        * doc/texinfo.txi: document it.
+	* util/texi2pdf: new script.
+	* util/Makefile.am: install it.
+	* doc/texinfo.txi: document it.
 
 2004-07-05  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/xref.c (cm_email, cm_uref, et al.): 
+	* makeinfo/xref.c (cm_email, cm_uref, et al.):
 	* makeinfo/xml.c (xml_insert_indexentry, xml_insert_indexterm):
 	* makeinfo/sectioning.c (sectioning_underscore):
 	* makeinfo/makeinfo.c (cm_listoffloats): use %s, don't pass string to
@@ -711,7 +3641,7 @@
 	15 May 2004 21:50:52 +0200.
 
 	* util/gendocs.sh: force HTML output name, otherwise Emacs fails
-        with its "@setfilename ../...".
+	with its "@setfilename ../...".
 
 2004-05-04  Karl Berry  <karl@gnu.org>
 
@@ -770,7 +3700,7 @@
 	* makeinfo/cmds.c (cm_code): use <samp> for commands other than
 	@code, so we get typewriter output; and add `...'
 	for @samp.
-	Report from: John Blevin <blevin@lucent.com>, 
+	Report from: John Blevin <blevin@lucent.com>,
 	16 Apr 2004 11:40:01 -0400.
 
 	* makeinfo/html.c (html_output_head) [CSS_FONT_ROMAN,
@@ -828,10 +3758,10 @@
 2004-04-07  Karl Berry  <karl@gnu.org>
 
 	* pretest version 4.6.95.
-	
+
 	* doc/texinfo.tex (\dodonode): new macro to remove trailing comma.
 	(\donode): call it, after removing space-comma.
-	
+
 	* doc/texinfo.txi (indicateurl): new name for url.
 	(uref): url is now a synonym for uref.
 	* doc/texinfo.tex (\url, \indicateurl): implement.
@@ -946,9 +3876,9 @@
 
 	All these changes are because strncasecmp is only declared in
 	<strings.h> on IBM AIX 4.2.  (Report from Nelson Beebe.)
-	
+
 	* configure.ac (AC_CHECK_DECLS): add memchr; no need to check for
-	  	     strcasecmp.(gl_STRCASE): call this ... 
+	  	     strcasecmp.(gl_STRCASE): call this ...
 	(AC_REPLACE_FUNCS): ... replacing checks for
 	strcasecmp and strncasecmp here.
 	* lib/system.h (memchr) [!HAVE_DECL_MEMCHR]: add conditional
@@ -1308,7 +4238,7 @@
 	argument even if it's unknown.
 
 	* makeingo/html.c (html_output_head): call current_document_encoding
-	instead of checking document_encoding_code. 
+	instead of checking document_encoding_code.
 
 2004-02-28  Alper Ersoy  <dirt@gtk.org>
 
@@ -1591,7 +4521,7 @@
 	* makeinfo/xml.h:
 	* makeinfo/xml.c (xml_get_assoc_for_id, xml_associate_title_with_id):
 	removed these functions.
-	
+
 	* makeinfo/xref.c (cm_xref): do not call xml_get_assoc_for_id.
 
 	* makeinfo/sectioning.c (sectioning_underscore): added xreflabel
@@ -1893,7 +4823,7 @@
 2004-02-05  Alper Ersoy  <dirt@gtk.org>
 
 	* info/info-utils.c (info_parse_node): look for ``(line '' instead of
-	skipping any non-digit characters. 
+	skipping any non-digit characters.
 
 2004-02-05  Alper Ersoy  <dirt@gtk.org>
 
@@ -1994,7 +4924,7 @@
 	* makeinfo/makeinfo.c (convert_from_file): prepend the loaded file's
 	path to include_files_path in order to make relative include files to
 	be found, then remove afterwards.
-	(main): make use of new functions for -I and -P options. 
+	(main): make use of new functions for -I and -P options.
 
 2004-01-30  Alper Ersoy  <dirt@gtk.org>
 
@@ -2056,7 +4986,7 @@
 	* makeinfo/sectioning.c (sectioning_underscore): removed newline from
 	the end of titles.
 
-	* makeinfo/lang.c (cm_documentencoding): insert encoding attribute 
+	* makeinfo/lang.c (cm_documentencoding): insert encoding attribute
 	into XML and Docbook prologs when handling delayed writes.
 
 	* makeinfo/xml.c (xml_begin_document): register a delayed write for
@@ -2195,7 +5125,7 @@
 	(\tocindent): reduce to 15pt to match \defaultparindent.
 	(\setref): use XR as control sequence prefix
 	instead of just X; seems nicer.  Change calls.
-	
+
 	Finish implementing @listoffloats:
 	(\xrdef): keep lists of each float type.
 	(\dofloat): save the floattype in the aux file.
@@ -2209,7 +5139,7 @@
 	* doc/texinfo.tex (\doitemize): rename from \itemizey.
 	(\itemizeitem): do not set \parskip=0 if the last
 	thing was a \nobreak (e.g., from \sectionheading).
-	Report from: Jesper Harder <harder@ifa.au.dk>, 
+	Report from: Jesper Harder <harder@ifa.au.dk>,
 	17 Jan 2004 22:03:51 +0100.
 
 	* doc/texinfo.txi (email): no angle brackets in TeX output.
@@ -2219,7 +5149,7 @@
 2004-01-17  Alper Ersoy  <dirt@gtk.org>
 
 	* makeinfo/float.c (cm_listoffloats): Prefixed captions with
-	float_type.  For HTML, used an <ul> block.  
+	float_type.  For HTML, used an <ul> block.
 
 2004-01-17  Alper Ersoy  <dirt@gtk.org>
 
@@ -2308,7 +5238,7 @@
 
 2004-01-13  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/float.c (cm_listoffloats): 
+	* makeinfo/float.c (cm_listoffloats):
 	* makeinfo/index.c (cm_printindex): decrement line_number just after
 	get_rest_of_line to make messages refer to the correct line,
 	re-increment it just before returning.
@@ -2392,7 +5322,7 @@
 	* makeinfo/files.c (register_delayed_write): save line number in input
 	document that the calling command is in.
 	(handle_delayed_writes): adjust byte offsets in tag table and output
-	line numbers in all of the indices, 
+	line numbers in all of the indices,
 
 	* makeinfo/makeinfo.c (convert_from_loaded_file): when finished, write
 	the tag table after handling delayed writes.
@@ -2431,7 +5361,7 @@
 	* makeinfo/makeinfo.c (insert): use whitespace macro instead of
 	testing characters manually.
 	(convert_from_loaded_file): call handle_delayed_writes when finished.
-	
+
 	* makeinfo/toc.c (contents_update_html, contents_update_info)
 	(shortcontents_update_html, shortcontents_update_info): changed file
 	read/writes with insert and insert_string.
@@ -2953,7 +5883,7 @@
 	* doc/texinfo.txi (makeinfo options): document TEXINFO_OUTPUT.
 
 	* doc/texinfo.txi (tex): document @LaTeX.
-	
+
 	* doc/texinfo.tex (\loggingall): reduce \errorcontextlines for
 	sake of infinite loops.
 	(\setfontstyle): \def better than \edef?
@@ -3568,7 +6498,7 @@
 	* texinfo.tex (\putwordDeftypevar, \putwordDeftypefun): Remove.
 	* txi-cs.tex, txi-de.tex, txi-en.tex, txi-es.tex, txi-fr.tex,
 	  txi-it.tex. txi-nl.tex, txi-no.tex, txi-pl.tex, txi-pt.tex,
-	  txi-tr.tex: The same. 
+	  txi-tr.tex: The same.
 	[texinfo-20031120-deftype-del.patch]
 
 	* doc/texinfo.tex (\verbatim,\Everbatim): remove one extra level
@@ -3577,7 +6507,7 @@
 	(\doverbatiminclude): just call the new \setupverbatim.
 	(\setupverbatiminclude): remove.
 	[texinfo-20031121-verbatim2.patch]
-	
+
 	* doc/texinfo.tex (\math): no need for \mathcode, and we actually
 		can use $ not \implicitmath.
 	[texinfo-20031121-math.patch]
@@ -3586,46 +6516,46 @@
 	check for true zero skip.
 	(\dosubindsanitize): use it.
 	[texinfo-20031120-zeroskip.patch]
-	
+
 	* doc/texinfo.tex (\doignore): scan in verbatim mode.  Without this,
 	if the last line of ignored text ended with ``@'', the ``@end ifxxx''
 	tag was missed.
 	(\dodoignore): use \_STOP_ instead of \ST@P.
 	[texinfo-20031120-ignore-at.patch]
-	
+
 	* doc/texinfo.tex (\defparsearg): new macro, to simplify places
 	where the user macro just calls \parsearg.  Use it in many places.
 	[texinfo-20031121-defparsearg.patch]
-	
+
 	* doc/texinfo.tex (\begin): remove, this is undocumented
 	and unused.
 	[texinfo-20031121-begin.patch]
-	
+
 	* doc/texinfo.tex (\title,\subtitle,\author,...): move to outer
 	level (was inside \titlepage), it's more readable than nested
 	definitions.
 	[texinfo-20031116-titlepage1.patch]
-	
+
 	* doc/texinfo.tex (\evenheadingxxx,\oddfootingyyy): might as well
 		use \ and avoid changing catcode of @.
 	[texinfo-20031116-catofat.patch]
-	
+
 	* doc/texinfo.tex (\set): use new macros: \parseargusing and
 	\makecsname.
 	[texinfo-20031116-set.patch]
-	
+
 	* doc/texinfo.tex (\cartouche): avoid \par if we are already in
 	vertical mode, in case it has an effect, eg. in an @example;
 	avoid extra space from the @cartouche line itself.
 	(\Ecartouche): force vertical mode, so that the \kern has the desired
 	effect.
 	[texinfo-20031120-cart.patch]
-	
+
 	* doc/texinfo.tex (\ptexfootnote,\ptexinsert): save orig definitions.
 	(\startsavinginserts): new macro (with relatives), call from
 		\cartouche, \group, \table.
 	[texinfo-20031118-saveins.patch]
-	
+
 	* doc/texinfo.tex (\table, \ftable, \vtable, \tablex, \tabley,
 	\tablez): Cleaned up indentation, etc.
 	(\kitem, \kitemx, \xitem, \xtemx, \description): Removed; they
@@ -3637,11 +6567,11 @@
 	(\pushthisfilestack,etc.): implement our own stack of filenames
 	instead of reading the @include argument in a group.
 	[texinfo-20031109-include.patch]
-	
+
 	* doc/texinfo.tex (\indexbreaks): remove, and remove call.
 	(\entry): read arguments on the fly, to avoid fixing catcodes.
 	[texinfo-20031121-indexbreaks.patch]
-	
+
 	* doc/texinfo.tex (\makevalueexpandable): new macro.
 	Change occurrences of \let\value=\expandablevalue to use it,
 	to reduce code duplication.
@@ -3652,21 +6582,21 @@
 	(\parsedefunline): start them off.  This is to support continuations
 	lines for @defun headers.
 	[texinfo-20031108-defun-cont.patch]
-	
+
 	* doc/texinfo.tex (\defun and all related commands):
 	rewrite to use \parsearg and uniform command generation.
 	(\makecsname): New macro, to be used within \edef's only.
 	[texinfo-20031120-defun.patch]
-	
+
 	* doc/texinfo.tex (=, \equalChar): remove active definition of =
 	and hacks that printed = in \tt sometimes.  We want to print
 	everything in \tt anyway, ultimately.
 	[texinfo-20031120-defun-pres3.patch]
-	
+
 	* doc/texinfo.tex (\defopheader,\defcvarheader,defivarheader):
 	use \code for the class name.
 	[texinfo-defun-pres2.patch]
-	
+
 	* doc/texinfo.tex (\parsearg): Reset the catcode of space before
 		we scan the argument; so we don't have to worry about
 		obeyed spaces before and after the argument.
@@ -3943,7 +6873,7 @@
 	* makeinfo/multi.c (multitable_item, end_multitable):
 	* makeinfo/xml.c (xml_end_multitable_row, xml_end_multitable):
 	insert thead element if @headitem is used.
-	
+
 	* makeinfo/xml.h: new element THEAD.
 
 	* makeinfo/texinfo.dtd: updated multitable structure.
@@ -4167,7 +7097,7 @@
 	* makeinfo/node.c (cm_node): escape node names in HTML output.
 
 	* makeinfo/xml.c (xml_id): check to see if the character is allowed.
-	
+
 	* makeinfo/tests/accent-text.txi: new @dotless{j} lines.
 
 	* makeinfo/tests/accent: look for &acute;j instead of &acute;i.
@@ -4358,7 +7288,7 @@
 	* doc/Makefile.am (infokey.1): new target.
 	(man_MANS): include infokey.1.
 	Noticed this in Debian diff.
-	
+
 	* util/texi2dvi: check for tex up front; inspired by Debian diff.
 
 	* TODO: makeinfo -E should do simple macro expansion, not
@@ -4675,7 +7605,7 @@
 	(\doheading,\dosubheading,\dosubsubheading): call
 	\sectionheading directly instead of \plain*secheading.
 	(\chfplain, \sectionheading): take additional section type
-	argument; call \writetocentry and \donoderef.  
+	argument; call \writetocentry and \donoderef.
 	(\unnchfopen): mention this is deprecated.
 	(\writetocentry): handle "omit" case, and
 	\global\pdfmakepagedesttrue.
@@ -4719,7 +7649,7 @@
 
 	* makeinfo/tests/html-manuals: include -I../../doc for case when
 	version-stnd.texi is in build tree.
-	From: ezra peisach <epeisach@med-xtal.bu.edu>, 
+	From: ezra peisach <epeisach@med-xtal.bu.edu>,
 	12 Sep 2003 13:53:32 -0400.
 
 2003-09-11  Karl Berry  <karl@gnu.org>
@@ -4768,7 +7698,7 @@
 	* makeinfo/macro.c (define_macro): "end rmacro" is 10 chars long.
 
 2003-08-29 Reiner Steib <Reiner.Steib@gmx.de>
-	
+
 	* makeinfo/lang.c (encoding_table): Downcase coding system
 	names, since Emacs does not recognize the uppercase names.
 
@@ -4979,7 +7909,7 @@
 	From: Jesper Harder <harder@ifa.au.dk>.
 	(GNU Sample Texts): don't end the $Id index entries with a :.
 	Report from: Luc Teirlinck <teirllm@dms.auburn.edu>.
-	
+
 2003-06-20    <karl@gnu.org>
 
 	* makeinfo/defun.c (process_defun_args): only insert the HTML
@@ -5001,16 +7931,8 @@
 	* version 4.6.
 
 
-Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
-
-
-Local Variables:
-mode: indented-text
-left-margin: 8
-fill-column: 76
-version-control: never
-End:
diff --git a/Build/source/utils/texinfo/INSTALL b/Build/source/utils/texinfo/INSTALL
index 58346285203..d445e6de985 100644
--- a/Build/source/utils/texinfo/INSTALL
+++ b/Build/source/utils/texinfo/INSTALL
@@ -1,4 +1,8 @@
-$Id: INSTALL,v 1.5 2004/11/19 13:08:47 karl Exp $
+$Id: INSTALL,v 1.8 2007/07/12 23:18:34 karl Exp $
+
+     Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+     2001, 2002, 2003, 2004, 2005, 2006, 2007
+     Free Software Foundation, Inc.
 
      Copying and distribution of this file, with or without modification,
      are permitted in any medium without royalty provided the copyright
diff --git a/Build/source/utils/texinfo/INSTALL.generic b/Build/source/utils/texinfo/INSTALL.generic
index 095b1eb4063..5458714e1e2 100644
--- a/Build/source/utils/texinfo/INSTALL.generic
+++ b/Build/source/utils/texinfo/INSTALL.generic
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@ unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
 
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +26,9 @@ debugging `configure').
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -78,7 +78,7 @@ details on some of the pertinent environment variables.
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
@@ -87,31 +87,29 @@ Compiling For Multiple Architectures
 
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
 Installation Names
 ==================
 
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
@@ -159,7 +157,7 @@ where SYSTEM can have one of these forms:
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
@@ -189,9 +187,14 @@ them in the `configure' command line, using `VAR=value'.  For example:
 
      ./configure CC=/usr/local2/bin/gcc
 
-will cause the specified gcc to be used as the C compiler (unless it is
+causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
 `configure' Invocation
 ======================
 
diff --git a/Build/source/utils/texinfo/Makefile.am b/Build/source/utils/texinfo/Makefile.am
index 9e5ffc02f29..3bcb2b3b1bc 100644
--- a/Build/source/utils/texinfo/Makefile.am
+++ b/Build/source/utils/texinfo/Makefile.am
@@ -1,5 +1,5 @@
 # Makefile.am for texinfo.
-# $Id: Makefile.am,v 1.13 2004/12/15 16:53:59 kasal Exp $
+# $Id: Makefile.am,v 1.24 2008/03/05 09:05:04 gray Exp $
 # Process this file with automake to produce Makefile.in in all directories.
 #
 # This file is free software; as a special exception the author gives
@@ -10,12 +10,11 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# Be sure we're using the right version of Automake.
-AUTOMAKE_OPTIONS = 1.8 readme-alpha
+# Find our headers and gnulib headers.
+ACLOCAL_AMFLAGS = -I gnulib/m4
 
 # Additional files to distribute.
-EXTRA_DIST = ChangeLog.46 INSTALL.generic INTRODUCTION README.dev \
-  config.rpath \
+EXTRA_DIST = ChangeLog.46 INSTALL.generic INTRODUCTION README.dev system.h \
   djgpp/README djgpp/config.bat djgpp/config.sed djgpp/config.site
 
 # This is to prevent texinfo.tex from being included in the top-level
@@ -24,23 +23,16 @@ TEXINFO_TEX = doc/texinfo.tex
 
 if TOOLS_ONLY
   # Build native tools only.
-  SUBDIRS = lib info makeinfo util
+  SUBDIRS = lib info install-info makeinfo util
 else
   # All subdirectories.
-  # Do intl, m4, and lib first since the C programs depend on them.
+  # Do libs first since the C programs depend on it.
   # Do doc last so makeinfo will be built when we get there.
   # Others are alphabetical.
-  SUBDIRS = $(native_tools) intl m4 lib info makeinfo po util doc
+  SUBDIRS = $(native_tools) gnulib/lib lib \
+            install-info info makeinfo po util doc 
 endif
 
-# for gettext.
-ACLOCAL_AMFLAGS = -I m4
-
-# In case TEXINFO_MAINT is set during make distcheck; in this case, the
-# simple doc-related files generated in info/ make distcleancheck fail.
-distcleancheck_listfiles = \
-  find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'
-
 # One special target for installers to use by hand if desired.
 install-tex:
 	cd doc && $(MAKE) TEXMF=$(TEXMF) install-tex
@@ -53,3 +45,29 @@ if TOOLS_ONLY
 install:
 
 endif
+
+# From coreutils.
+# Verify that all source files using _() are listed in po/POTFILES.in.
+# Run this before making pretests, as well as official releases, so that
+# translators will see changed string.
+po-check:
+	if test -f po/POTFILES.in; then					\
+	  grep -E -v '^(#|$$)' po/POTFILES.in				\
+	    | grep -v '^src/false\.c$$' | sort > $@-1;			\
+	  files=;							\
+	  for file in $$($(CVS_LIST_EXCEPT)) `find [a-z]* -name '*.[ch]'`; do \
+	    case $$file in						\
+	    djgpp/* | man/*) continue;;					\
+	    esac;							\
+	    case $$file in						\
+	    *.[ch])							\
+	      base=`expr " $$file" : ' \(.*\)\..'`;			\
+	      { test -f $$base.l || test -f $$base.y; } && continue;;	\
+	    esac;							\
+	    files="$$files $$file";					\
+	  done;								\
+	  grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files		\
+	    | sort -u > $@-2;						\
+	  diff -u $@-1 $@-2 || exit 1;					\
+	  rm -f $@-1 $@-2;						\
+	fi
diff --git a/Build/source/utils/texinfo/Makefile.in b/Build/source/utils/texinfo/Makefile.in
index 6828177f170..814496f27d1 100644
--- a/Build/source/utils/texinfo/Makefile.in
+++ b/Build/source/utils/texinfo/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 # Makefile.am for texinfo.
-# $Id: Makefile.am,v 1.13 2004/12/15 16:53:59 kasal Exp $
+# $Id: Makefile.am,v 1.24 2008/03/05 09:05:04 gray Exp $
 # Process this file with automake to produce Makefile.in in all directories.
 #
 # This file is free software; as a special exception the author gives
@@ -25,15 +25,11 @@
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -47,49 +43,94 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.in \
-	$(top_srcdir)/configure $(top_srcdir)/intl/Makefile.in \
-	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS TODO \
-	config.guess config.rpath config.sub depcomp install-sh \
-	missing mkinstalldirs
-subdir = .
+	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
+	INSTALL NEWS TODO build-aux/compile build-aux/config.guess \
+	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
+	build-aux/install-sh build-aux/mdate-sh build-aux/missing \
+	build-aux/texinfo.tex
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
-	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \
-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mkstemp.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/onceonly_2_57.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
+	$(top_srcdir)/gnulib/m4/argz.m4 \
+	$(top_srcdir)/gnulib/m4/codeset.m4 \
+	$(top_srcdir)/gnulib/m4/eealloc.m4 \
+	$(top_srcdir)/gnulib/m4/environ.m4 \
+	$(top_srcdir)/gnulib/m4/error.m4 \
+	$(top_srcdir)/gnulib/m4/exitfail.m4 \
+	$(top_srcdir)/gnulib/m4/extensions.m4 \
+	$(top_srcdir)/gnulib/m4/getopt.m4 \
+	$(top_srcdir)/gnulib/m4/gettext.m4 \
+	$(top_srcdir)/gnulib/m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib/m4/glibc21.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib/m4/iconv.m4 \
+	$(top_srcdir)/gnulib/m4/include_next.m4 \
+	$(top_srcdir)/gnulib/m4/inline.m4 \
+	$(top_srcdir)/gnulib/m4/intlmacosx.m4 \
+	$(top_srcdir)/gnulib/m4/lib-ld.m4 \
+	$(top_srcdir)/gnulib/m4/lib-link.m4 \
+	$(top_srcdir)/gnulib/m4/lib-prefix.m4 \
+	$(top_srcdir)/gnulib/m4/localcharset.m4 \
+	$(top_srcdir)/gnulib/m4/longlong.m4 \
+	$(top_srcdir)/gnulib/m4/malloc.m4 \
+	$(top_srcdir)/gnulib/m4/malloca.m4 \
+	$(top_srcdir)/gnulib/m4/mbchar.m4 \
+	$(top_srcdir)/gnulib/m4/mbiter.m4 \
+	$(top_srcdir)/gnulib/m4/mbrtowc.m4 \
+	$(top_srcdir)/gnulib/m4/mbscasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbsncasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbstate_t.m4 \
+	$(top_srcdir)/gnulib/m4/mbswidth.m4 \
+	$(top_srcdir)/gnulib/m4/memchr.m4 \
+	$(top_srcdir)/gnulib/m4/memcpy.m4 \
+	$(top_srcdir)/gnulib/m4/memmove.m4 \
+	$(top_srcdir)/gnulib/m4/mkstemp.m4 \
+	$(top_srcdir)/gnulib/m4/nls.m4 \
+	$(top_srcdir)/gnulib/m4/onceonly.m4 \
+	$(top_srcdir)/gnulib/m4/po.m4 \
+	$(top_srcdir)/gnulib/m4/progtest.m4 \
+	$(top_srcdir)/gnulib/m4/setenv.m4 \
+	$(top_srcdir)/gnulib/m4/stdbool.m4 \
+	$(top_srcdir)/gnulib/m4/stdint.m4 \
+	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
+	$(top_srcdir)/gnulib/m4/strdup.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
+	$(top_srcdir)/gnulib/m4/string_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_time_h.m4 \
+	$(top_srcdir)/gnulib/m4/tempname.m4 \
+	$(top_srcdir)/gnulib/m4/unistd_h.m4 \
+	$(top_srcdir)/gnulib/m4/wchar.m4 \
+	$(top_srcdir)/gnulib/m4/wchar_t.m4 \
+	$(top_srcdir)/gnulib/m4/wctype.m4 \
+	$(top_srcdir)/gnulib/m4/wcwidth.m4 \
+	$(top_srcdir)/gnulib/m4/wint_t.m4 \
+	$(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = intl/Makefile
+CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = @native_tools@ intl m4 lib info makeinfo po util doc
+DIST_SUBDIRS = @native_tools@ gnulib/lib lib install-info info \
+	makeinfo po util doc
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -97,27 +138,30 @@ am__remove_distdir = \
   { test ! -d $(distdir) \
     || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
          && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.lzma
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+ARGZ_H = @ARGZ_H@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -125,41 +169,155 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
+GETOPT_H = @GETOPT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_IO_H = @HAVE_IO_H@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRNDUP = @HAVE_STRNDUP@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRSEP = @HAVE_STRSEP@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNSETENV = @HAVE_UNSETENV@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
+HEVEA = @HEVEA@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@
-INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -169,20 +327,50 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
 RANLIB = @RANLIB@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDINT_H = @STDINT_H@
 STRIP = @STRIP@
+SYS_STAT_H = @SYS_STAT_H@
+SYS_TIME_H = @SYS_TIME_H@
 TERMLIBS = @TERMLIBS@
-TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@
-TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+TEX = @TEX@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VOID_UNSETENV = @VOID_UNSETENV@
+WCHAR_H = @WCHAR_H@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WCTYPE_H = @WCTYPE_H@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -194,11 +382,16 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -222,32 +415,28 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
-# Be sure we're using the right version of Automake.
-AUTOMAKE_OPTIONS = 1.8 readme-alpha
+# Find our headers and gnulib headers.
+ACLOCAL_AMFLAGS = -I gnulib/m4
 
 # Additional files to distribute.
-EXTRA_DIST = ChangeLog.46 INSTALL.generic INTRODUCTION README.dev \
-  config.rpath \
+EXTRA_DIST = ChangeLog.46 INSTALL.generic INTRODUCTION README.dev system.h \
   djgpp/README djgpp/config.bat djgpp/config.sed djgpp/config.site
 
 
 # This is to prevent texinfo.tex from being included in the top-level
 # distribution directory.
 TEXINFO_TEX = doc/texinfo.tex
-@TOOLS_ONLY_FALSE@SUBDIRS = $(native_tools) intl m4 lib info makeinfo po util doc
-@TOOLS_ONLY_TRUE@SUBDIRS = lib info makeinfo util
-
-# for gettext.
-ACLOCAL_AMFLAGS = -I m4
-
-# In case TEXINFO_MAINT is set during make distcheck; in this case, the
-# simple doc-related files generated in info/ make distcleancheck fail.
-distcleancheck_listfiles = \
-  find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'
+@TOOLS_ONLY_FALSE@SUBDIRS = $(native_tools) gnulib/lib lib \
+@TOOLS_ONLY_FALSE@            install-info info makeinfo po util doc 
 
+@TOOLS_ONLY_TRUE@SUBDIRS = lib info install-info makeinfo util
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -289,7 +478,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.in $(top_builddir)/config.status
@@ -302,9 +491,6 @@ $(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -337,8 +523,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -382,8 +567,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -408,8 +593,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -419,13 +604,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -440,24 +624,22 @@ distclean-tags:
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/djgpp $(distdir)/intl $(distdir)/m4 $(distdir)/po
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -471,7 +653,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -479,6 +661,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -486,14 +670,18 @@ distdir: $(DISTFILES)
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
+
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
 
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
@@ -510,7 +698,7 @@ dist-zip: distdir
 
 dist dist-all: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -522,6 +710,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -537,7 +727,6 @@ distcheck: dist
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && cd $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    --with-included-gettext \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -562,7 +751,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -632,12 +821,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -658,29 +855,30 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
-	dist-tarZ dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-local distclean-recursive \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-local distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 @TOOLS_ONLY_TRUE@  # Build native tools only.
 @TOOLS_ONLY_FALSE@  # All subdirectories.
-@TOOLS_ONLY_FALSE@  # Do intl, m4, and lib first since the C programs depend on them.
+@TOOLS_ONLY_FALSE@  # Do libs first since the C programs depend on it.
 @TOOLS_ONLY_FALSE@  # Do doc last so makeinfo will be built when we get there.
 @TOOLS_ONLY_FALSE@  # Others are alphabetical.
 
@@ -693,6 +891,32 @@ distclean-local:
 
 # Don't install native tools for cross compile.
 @TOOLS_ONLY_TRUE@install:
+
+# From coreutils.
+# Verify that all source files using _() are listed in po/POTFILES.in.
+# Run this before making pretests, as well as official releases, so that
+# translators will see changed string.
+po-check:
+	if test -f po/POTFILES.in; then					\
+	  grep -E -v '^(#|$$)' po/POTFILES.in				\
+	    | grep -v '^src/false\.c$$' | sort > $@-1;			\
+	  files=;							\
+	  for file in $$($(CVS_LIST_EXCEPT)) `find [a-z]* -name '*.[ch]'`; do \
+	    case $$file in						\
+	    djgpp/* | man/*) continue;;					\
+	    esac;							\
+	    case $$file in						\
+	    *.[ch])							\
+	      base=`expr " $$file" : ' \(.*\)\..'`;			\
+	      { test -f $$base.l || test -f $$base.y; } && continue;;	\
+	    esac;							\
+	    files="$$files $$file";					\
+	  done;								\
+	  grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files		\
+	    | sort -u > $@-2;						\
+	  diff -u $@-1 $@-2 || exit 1;					\
+	  rm -f $@-1 $@-2;						\
+	fi
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/utils/texinfo/NEWS b/Build/source/utils/texinfo/NEWS
index 7d73e149744..e751aa205db 100644
--- a/Build/source/utils/texinfo/NEWS
+++ b/Build/source/utils/texinfo/NEWS
@@ -1,27 +1,162 @@
-$Id: NEWS,v 1.103 2004/12/24 16:43:58 karl Exp $
-This file records noteworthy changes, very tersely.
+$Id: NEWS,v 1.170 2008/04/20 13:30:00 karl Exp $
+This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-  2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
-
 *** IMPORTANT NEWS FOR ALL AUTHORS OF TEXINFO MANUALS ***
 
 As of version 4.2, Texinfo has a new command @copying to define the
-copyright and copying permissions for a manual.  It's important to
-switch to using it as soon as possible (as in your next release),
-because the historical method of doing copyright permissions using
-@ifinfo failed to output copyright information in the HTML (or XML)
-formats.  The manual has detailed explanations and examples.  For
-convenience, here's a url to one of the relevant sections:
+copyright and copying permissions for a manual.  If you haven't already,
+please switch to using it in your next release, because the historical
+method of doing copyright permissions using @ifinfo failed to output
+copyright information in the HTML (or XML) formats.  The manual has
+detailed explanations and examples.  For convenience, here's a url to
+one of the relevant sections:
   http://www.gnu.org/software/texinfo/manual/texinfo/html_node/Document-Permissions.html
 
 -------------------------------------------------------------------------------
+
+4.12 (20 April 2008)
+
+* Language:
+  . new commands @clicksequence, @click, and @clickstyle for documenting
+    GUI sequences, and @arrow for the default glyph used.
+  . new commands @geq{} and @leq{} for the normal >= and <= relations.
+
+* install-info:
+  . lzma compression supported.
+  . Much work towards compatibility with Debian's independent
+    implementation.  Changes in behavior:
+    - new entries are formatted to start at column 34 by default.
+    - existing entries are replaced by default.
+    - new sections are alphabetized among existing sections.
+    - if an entry being removed is the last one in a section, the
+      section is also removed.
+  . Also many new options:
+    --section REGEX TITLE.
+    --no-indent: disable formatting of new entries.
+    --menuentry, --name: specify left-hand side of an entry.
+    --dry-run: alias for --test.
+    --regex REGEX: renamed from --section regex, adds to all sections
+      matching REGEX by default.
+    --add-once: add only to first specified or matching section.
+    --align COL: start description at column COL.
+    --calign COL: start continuation lines in description at COL.
+    --max-width COL: wrap the description at COL.
+  . New section in the Texinfo manual describing all this.
+
+* Info:
+  Our goal with these changes to the default interface is to make Info
+  documents more easily and quickly readable, especially by non-experts.
+  . the PageUp and PageDown keys move through the whole document by
+    default, instead of just the current node.
+  . the h command shows the basic help, and H starts the Info tutorial.
+  . the newly-bound x command deletes the current window, e.g., within help.
+  . the scroll-step variable is set to 1 by default, for smooth scrolling.
+  . the cursor-movement-scrolls-p variable is set to 1 by default, so
+    link searches look through the whole document.
+  . regular expression searches are supported, and are the default for
+    both regular and incremental searches.
+  . the new R command toggles between regexp and literal-string searches.
+  . the new variable scroll-last-node controls scrolling at the end of
+    the last node; by default, it now simply reports there are no more
+    nodes.  To restore the old behavior, set scroll-last-node=Scroll.
+  . the precise line number specified in index entries is used if available.
+  . --usage=info shows usage for standalone Info.
+  . lzma compression supported.
+
+* Distribution:
+  . language support for no removed/renamed to nb, per Norwegian translators.
+  . new translation: es.
+  . bug fixes in make check (and elsewhere).
+  . gettext 0.17, automake 1.10.1, autoconf 2.62.
+
+
+4.11 (9 September 2007)
+
+* Language:
+  . @documentlanguage now supports an optional country code
+    specification after the language code, a la gettext.
+  . new command @allowcodebreaks controls breaks at _ and - within @code.
+  . new command @frenchspacing controls spacing after sentences.
+  . new command @fonttextsize allows changing body text font size to 10pt.
+  . new command @textdegree{} produces the normal degrees symbol.
+  . new command @thischapternum can be used in TeX headers/footers.
+  . new commands for quotes: @quotedblleft @quotedblright
+     @quoteleft @quoteright  @quotedblbase @quotesinglbase
+     @guillemetleft @guillemetright @guilsinglleft @guilsinglright.
+  . new option @set txicodequoteundirected produces an undirected quote
+    in code and example output, instead of the regular right quote.
+  . new option @set txicodequotebacktick produces a grave accent in
+    code and example output, instead of the regular left quote.
+* makeinfo:
+  . The @documentlanguage locale is used to translate various document strings.
+  . --enable-encoding is now the default, meaning Info and plain text
+    output use 8-bit characters given a supported @documentencoding.
+  . new option --css-ref=URL for creating a stylesheet <link> in HTML output.
+  . new option --transliterate-file-names to use a reduction-to-ASCII
+    algorithm for split HTML file names, useful for non-Latin-based languages.
+  . @enddots{} outputs three dots instead of four, for consistency with
+    texinfo.tex.
+  . the Local Variables coding: setting written by --enable-encoding now
+    comes at the very end, after the tags table, so that Emacs can find
+    it in more cases.
+  . @allow-recursion (never documented) is deprecated and produces a warning.
+  . @quote-args (never documented) is now the default behavior.
+  . centering and such take account of character widths.
+  . the --reference-limit option is now a no-op.
+  . improvements to XML and Docbook output and the DTD.
+* texinfo.tex:
+  . @thissection can now be used in custom headings, and @thischapter
+    works reliably even without @set chapternewpage.  Custom headings
+    have additional flexibility as well.
+* texi2dvi:
+  . pdftexi2dvi is a new wrapper to `texi2dvi --pdf', equal to texi2pdf,
+    for the sake of AUC-TeX which prepends `pdf' to the compilation
+    command when requested to produce PDF.
+* info:
+  . look for info files in the current directory first, by default.
+  . when calling man, use -a if no explicit section is found.
+  . avoid showing the top(1) man page for nonexistent info files.
+* install-info:
+  . new options --section-regex, --remove-exactly, --debug, --test.
+* Distribution:
+  . autoconf 2.60, automake 1.10, gettext 0.16.1.
+  . gettext support now [external].
+  . new translations: hu (Hungarian), rw (Kinyarwandan), vi (Vietnamese).
+  . most common sources imported from gnulib.
+
+4.10 (omitted)
+
+
+4.9 (29 June 2007)
+* GPLv3.
+* texi2dvi:
+  . new mode --build=tidy which supports compilation in a separate
+    directory, where intermediate files are preserved.
+  . new option --build-dir, to specify where the tidy build will take
+    place, either locally or globally.  This allows avoiding the clutter
+    while preserving auxiliary files.
+  . new support for AUC-TeX: texi2dvi (weakly) supports arguments a la
+    TeX such as `\nonstopmode\input{file.tex}'.
+  . new options --ps and --dvipdf, useful especially for pstricks documents.
+  . new option --src-specials, passed to TeX.
+* texinfo.tex:
+  . Latin1, Latin2, Latin9, and UTF-8 are supported -- only as well as
+    the Computer Modern fonts can manage, which means primarily English
+    and western European languages, to a limited extent.
+  . png and jpg images supported in pdf output.
+  . new Russian, Serbian, and Ukrainian translations for texinfo.tex:
+    txi-ru.tex, txi-sr.tex, txi-uk.tex.
+  . section names with \ characters work properly in pdf outlines.
+  . have .toc files use @ as the escape character, instead of \.
+
 
 4.8 (31 December 2004)
 * Language:
@@ -421,7 +556,7 @@ convenience, here's a url to one of the relevant sections:
 * info man page removed; use the Texinfo manual.
 * Automake used, other portability fixes.
 
-3.10 (nonexistent)
+3.10 (omitted)
 
 
 3.9 (4 October 1996)
diff --git a/Build/source/utils/texinfo/README.dev b/Build/source/utils/texinfo/README.dev
index cf0dc9de961..7706d33ab9c 100644
--- a/Build/source/utils/texinfo/README.dev
+++ b/Build/source/utils/texinfo/README.dev
@@ -1,44 +1,52 @@
-$Id: README.dev,v 1.7 2003/11/24 15:11:06 karl Exp $
-README.dev - Texinfo developer information.
+$Id: README.dev,v 1.15 2008/03/25 13:51:20 karl Exp $
+This README.dev file describes the development environment.
 
-  Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+  Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008
+  Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
-The development sources for Texinfo is available through anonymous cvs
-at Savannah, see
+The development sources for GNU Texinfo are available through anonymous
+CVS at Savannah:
   http://savannah.gnu.org/cvs/?group=texinfo
 
-This distribution uses whatever versions of automake, autoconf, and
-gettext are listed in NEWS; usually the latest ones released.  If you
-are getting the Texinfo sources from cvs, or change the Texinfo
-configure.ac, you'll need to have these tools installed to (re)build.
-You'll also need help2man.  (All of these are available from
-ftp://ftp.gnu.org/gnu.)
-
-Here's the order in which to run the tools for a fresh build:
-
-  autoheader    # creates config.in, not necessarily needed every time
-  aclocal -I m4 # for a new version of automake
-  automake
-  autoconf
-  configure CFLAGS=-g --enable-maintainer-mode
-  make
-
-(with arguments to taste, of course.)  Or you can run
-
-  ./bootstrap
-
-instead of the various auto* tools.
-
-
-One final note: If you would like to contribute to the GNU project by
-implementing additional documentation output formats for Texinfo, that
-would be great.  But please do not write a separate translator texi2foo
-for your favorite format foo!  That is the hard way to do the job, and
-makes extra work in subsequent maintenance, since the Texinfo language
-is continually being enhanced and updated.  Instead, the best approach
-is modify Makeinfo to generate the new format, as it does now for Info,
-HTML, XML, and DocBook.
+This distribution uses whatever versions of Automake, Autoconf, and
+Gettext are listed in NEWS; usually the latest ones released.  If you
+are getting the sources from CVS (or change configure.ac), you'll need
+to have these tools installed to (re)build.  You'll also need help2man.
+All of these programs are available from ftp://ftp.gnu.org/gnu.
+
+After getting the CVS sources, and installing the tools above, you can run
+ ./autogen.sh
+and then
+ ./configure CFLAGS='-g -Wdeclaration-after-statement' --enable-maintainer-mode
+and then
+ make
+
+After the initial autogen && configure, simply running make should suffice.
+
+The reason for that particular -W is that intermixing declarations with
+statementts is an easy thing to do accidentally, gcc won't warn about it
+by default, and other compilers that don't support it are still
+widespread.  Lots of other -W options can be useful too, and patches are
+welcome to resolve the diagnostics.  Or if you're not using gcc, of
+course you shouldn't include it at all.
+
+This distribution also uses Gnulib (http://www.gnu.org/software/gnulib)
+to share common files, with the files being checked in to CVS.  If you
+get automake/conf/etc. errors from ./autogen.sh, please try doing a CVS
+checkout of gnulib (in a separate directory to the texinfo checkout),
+and then run
+  ../gnulib/gnulib-tool --update
+in your top-level Texinfo directory.  (gnulib-tool is in the gnulib CVS tree.)
+
+For the record, a first time invocation would be
+  gnulib-tool --import --m4-base=gnulib/m4 --source-base=gnulib/lib \
+              --no-vc-files getopt
+
+Many more modules have been added since.  The currently-used gnulib
+modules and other gnulib information are recorded in
+gnulib/m4/gnulib-cache.m4.  Given a source checkout of gnulib, you can
+update the files with gnulib-tool --import.
diff --git a/Build/source/utils/texinfo/TODO b/Build/source/utils/texinfo/TODO
index 0fcaa5c5991..85ba2904e17 100644
--- a/Build/source/utils/texinfo/TODO
+++ b/Build/source/utils/texinfo/TODO
@@ -1,16 +1,15 @@
-$Id: TODO,v 1.26 2004/11/22 23:57:32 karl Exp $
+$Id: TODO,v 1.44 2008/02/25 00:21:29 karl Exp $
 This is the todo list for GNU Texinfo.
 If you are interested in working on any of these, email bug-texinfo@gnu.org.
 
   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003, 
-  2001, 2002, 2003, 2004 Free Software Foundation.
+  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
 * General:
-  - @euro{}.
   - Support installation of manuals in different languages, along these lines:
     . support a LINGUAS file or variable saying which subdirs LL in the
       source to descend into (under doc/).
@@ -26,6 +25,8 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
     For a test case, see texinfo cvs, with its one translated manual
     (info-fr.texi).
     From Wojciech Polak.
+  - Or even multibyte languages like Japanese, see msg:
+    http://lists.gnu.org/archive/html/bug-texinfo/2005-03/msg00000.html
   - Monitor and improve the dir categories in existing manuals,
     following the Free Software Directory categories.  Much mail to
     developers has already been sent, what's needed now is to check new
@@ -38,6 +39,7 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
     especially 
       http://mail.gnu.org/archive/html/emacs-devel/2002-10/msg00090.html
       http://mail.gnu.org/archive/html/emacs-devel/2002-10/msg00137.html
+  - Extend and improve the tests.
   - Get Info declared as a MIME Content-Type.
   - Likewise the `info:' URI scheme; a library consortium has proposed a
     completely different purpose for the URI scheme, but I don't know
@@ -48,9 +50,6 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
   - Support reference card creation, perhaps by only paying attention to
     sectioning and @def... commands.
   - Allow @end (and other?) commands to be indented in the source.
-  - Test for memory leaks, e.g., with valgrind:
-    http://developer.kde.org/~sewardj/
-  - Extend and improve the tests.
 
 * Language:
   - @else for the @if... conditionals.
@@ -65,7 +64,9 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
   - @exercise/@answer command for, e.g., gawk.
   - Allow @hsep/@vsep at @item, instead of just in template.
   - Support automatic line numbering of examples.
-  - Better macro syntax.
+  - Better macro syntax, including a separate @inlinemacro (or
+    something) to distinguish macros that swallow their final newline
+    and those that don't.
   - Better def... command syntax.
   - Allow : in node names for info files, for names like
     `class::method'.  Likewise index entries.  A quoting mechanism such
@@ -76,7 +77,9 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
 
 * Makeinfo:
   - Translation of "Appendix" etc. should depend on @doclang not $LANG.
-  - Try directory of main source file.
+  - Really support UTF-8 instead of just passing through the bytes.
+  - lang.c setup doesn't support @v{S} (S with caron) -- no named entity.
+  - Automatically do -I of directory of main source file.
   - Make makeinfo -E just do macro expansion, avoiding all error checks.
     That way, texi2dvi could run makeinfo --iftex -E.
   - A detexinfo program, like detex or delatex.  This command would
@@ -99,21 +102,26 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
 
 * TeX:
   - Use @ as the escape character, and Texinfo syntax generally, in the
-    table of contents and index files.  Eliminate all the crazy
-    multiple redefinitions of every Texinfo command in different contexts.
+    table of contents and index files.
   - Support input in any encoding and language, via ec or Latin Modern fonts.
+    Including Unicode, e.g., UTF-8.  (Some work has been done.)
   - Reasonable way to change fonts from the default (some work has been
     done), to allow for PostScript fonts, for example.
   - @multitable: handle @hsep and @vsep.
   - @multitable: repeat table headings if multiple pages long.
   - @multitable: support a heading line concept (<thead> in HTML).
   - Introduce new command to change \bindingoffset.
-  - How about using latex2html to produce HTML?
-  - Table of contents gets misaligned if there are 10 or more [sub]sections.
+  - Use marks to define a real @thissection.
+  - Table of contents is misaligned if there are 10 or more [sub]sections.
   - Use url.sty (or something) to allow linebreak of url's.
+  - Make accent commands implicitly use @dotless{i/j}.
   - Include hyperlink \special's in the DVI output for xdvi, etc.
   - PDF: make each letter of the index (A, B, ...) a section in the TOC.
-    From Carsten Dominik <dominik@astro.uva.nl>.
+    From Carsten Dominik.
+  - PDF: use the PageLabels dictionary to allow jumping to logical
+    pages, presumably after xpdf/gv support it.  Section 8.3.1 of the
+    PDF reference.  From Werner Lemberg, texinfo-pretest mail of
+    27 Feb 2006 22:55:13 +0100.
 
 * Doc:
   - Include a complete functional summary, as in a reference card, in
@@ -123,13 +131,34 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
     for an example of doing it in both the tex and info versions.
 
 * Info:
-  - Regular expression search.
+  - (By far the most important bug to fix.)
+    Support multibyte character sets, principally UTF-8; most
+    critically, do not break multibyte characters across lines, but lots
+    of other problems are present.  This implies major changes to Info,
+    since it currently assumes byte/character equivalence (having been
+    written long before multibyte character sets were common).
+
+    Here's a careful bug report on the subject (the sender can help test):
+    http://lists.gnu.org/archive/html/bug-texinfo/2007-11/msg00033.html
+    
+    Here's an initial bug report and "patch" that simply disables translation.
+    http://lists.gnu.org/archive/html/bug-texinfo/2006-08/msg00001.html
+    http://wiki.linuxfromscratch.org/patches/browser/trunk/texinfo/texinfo-4.8-multibyte-1.patch
+    
+  - The help message does not report Down/Up for next/prev-line.
+  - When scrolling through the help text, it should stop at the end, not
+    report "No more nodes" and go back to the beginning.
+  - It would be nice for h in the help window to quit help.
+  - It would be nice to be able to specify a preferred key to report in
+    the help message, instead of using the last one set; cf. q vs. C-x C-c.
   - Full-text search across all info files installed on the system.
-  - Support character sets other than ISO Latin 1.
   - Perhaps comply with LANGUAGE setting on a per-node basis, to allow
     incremental translation of Texinfo files.
+  - Display images when running under X, as Emacs 22+ can.
   - Search all nodes of dir file at startup, then can have
-    INFO-DIR-SEPARATE-GROUPS and other such.
+    INFO-DIR-SEPARATE-GROUPS and other such.  I.e., we could have
+    programs (what is now "Individual utilities") in one node, library
+    functions, in another, etc.  And how about supporting other languages?
   - Better dir file merging.
   - Global dir file (as in /etc/conf/dir) and texinfo config file
     specifying which info directories to search.  From Dale Mellor.
@@ -138,9 +167,9 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
     Perhaps code from the pinfo viewer can be reused:
     http://zeus.polsl.gliwice.pl/~pborys/.
   - More sample .infokey files, so people can choose without writing their own.
-  - q within help should quit help like C-x 0.
-  - Incorporate an X-based viewer, perhaps saxinfo or tkinfo
-      http://www.math.ucsb.edu/~boldt/tkinfo/
+  - Incorporate an X-based viewer, perhaps the old GNU xinfo widget
+     (http://www.gnu.org/software/xinfo) or saxinfo
+     or tkinfo (http://www.math.ucsb.edu/~boldt/tkinfo/).
   - Make "info foo bar" search for bar in foo's index(es) if no menu match.
   - Handle M-n, C-u m, and C-u g like Emacs Info (opening new windows).
   - Write technical definition of Info format.
@@ -152,7 +181,6 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
     @image (or other) files.  In subdirs.  Or something.
   - support info dir entries for other than the current info file name;
     see comments in menu_item_equal.
-  - merge features with Debian install-info, so we can have one program.
 
 * texindex:
   - read source file (specified by new option) for @documentlanguage
@@ -167,7 +195,7 @@ Ideas that will not be implemented:
 - Process Texinfo files directly instead of converting to Info:
   ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/tkman.tar.Z, which
   uses Tcl/Tk 8.0 from ftp.smli.com in the /pub/tcl directory.
-  From: phelps@ecstasy.CS.Berkeley.EDU (Tom Phelps)
+  From: Tom Phelps @ berkeley
   [This has the disadvantage of needing to be updated when the
   Texinfo language changes, so don't.]
 
@@ -178,4 +206,5 @@ Ideas that will not be implemented:
 - Change bars.  This is difficult or impossible in TeX,
   unfortunately.  To do it right requires device driver support.
   wdiff or ediff may be all we can do.  Merely specifying what should be
-  changed is not obvious.
+  changed is not obvious.  texdiff (http://www.robmar.net/TexDiff) does
+  something reasonable for LaTeX, maybe it can be adapted.
diff --git a/Build/source/utils/texinfo/aclocal.m4 b/Build/source/utils/texinfo/aclocal.m4
index 687093e462f..af405940f20 100644
--- a/Build/source/utils/texinfo/aclocal.m4
+++ b/Build/source/utils/texinfo/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,15 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.62],,
+[m4_warning([this file was generated for autoconf 2.62.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -21,14 +29,31 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -85,14 +110,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
+# serial 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -101,8 +126,10 @@ AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -116,15 +143,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 9
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -152,6 +178,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -217,6 +244,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -269,7 +297,8 @@ if test "x$enable_dependency_tracking" != xno; then
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -294,8 +323,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -342,14 +372,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -366,16 +396,20 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -395,6 +429,9 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -430,6 +467,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -443,16 +484,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -465,7 +507,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -570,16 +612,50 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
+
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -595,6 +671,7 @@ AC_SUBST($1)])
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -605,7 +682,7 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -613,60 +690,23 @@ fi
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
@@ -778,9 +818,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
@@ -877,35 +929,60 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/codeset.m4])
-m4_include([m4/gettext.m4])
-m4_include([m4/glibc21.m4])
-m4_include([m4/iconv.m4])
-m4_include([m4/intdiv0.m4])
-m4_include([m4/intmax.m4])
-m4_include([m4/inttypes-pri.m4])
-m4_include([m4/inttypes.m4])
-m4_include([m4/inttypes_h.m4])
-m4_include([m4/isc-posix.m4])
-m4_include([m4/lcmessage.m4])
-m4_include([m4/lib-ld.m4])
-m4_include([m4/lib-link.m4])
-m4_include([m4/lib-prefix.m4])
-m4_include([m4/longdouble.m4])
-m4_include([m4/longlong.m4])
-m4_include([m4/mkstemp.m4])
-m4_include([m4/nls.m4])
-m4_include([m4/onceonly_2_57.m4])
-m4_include([m4/po.m4])
-m4_include([m4/printf-posix.m4])
-m4_include([m4/progtest.m4])
-m4_include([m4/signed.m4])
-m4_include([m4/size_max.m4])
-m4_include([m4/stdint_h.m4])
-m4_include([m4/strcase.m4])
-m4_include([m4/uintmax_t.m4])
-m4_include([m4/ulonglong.m4])
-m4_include([m4/wchar_t.m4])
-m4_include([m4/wint_t.m4])
-m4_include([m4/xsize.m4])
-m4_include([acinclude.m4])
+m4_include([gnulib/m4/alloca.m4])
+m4_include([gnulib/m4/argz.m4])
+m4_include([gnulib/m4/codeset.m4])
+m4_include([gnulib/m4/eealloc.m4])
+m4_include([gnulib/m4/environ.m4])
+m4_include([gnulib/m4/error.m4])
+m4_include([gnulib/m4/exitfail.m4])
+m4_include([gnulib/m4/extensions.m4])
+m4_include([gnulib/m4/getopt.m4])
+m4_include([gnulib/m4/gettext.m4])
+m4_include([gnulib/m4/gettimeofday.m4])
+m4_include([gnulib/m4/glibc21.m4])
+m4_include([gnulib/m4/gnulib-common.m4])
+m4_include([gnulib/m4/gnulib-comp.m4])
+m4_include([gnulib/m4/iconv.m4])
+m4_include([gnulib/m4/include_next.m4])
+m4_include([gnulib/m4/inline.m4])
+m4_include([gnulib/m4/intlmacosx.m4])
+m4_include([gnulib/m4/lib-ld.m4])
+m4_include([gnulib/m4/lib-link.m4])
+m4_include([gnulib/m4/lib-prefix.m4])
+m4_include([gnulib/m4/localcharset.m4])
+m4_include([gnulib/m4/longlong.m4])
+m4_include([gnulib/m4/malloc.m4])
+m4_include([gnulib/m4/malloca.m4])
+m4_include([gnulib/m4/mbchar.m4])
+m4_include([gnulib/m4/mbiter.m4])
+m4_include([gnulib/m4/mbrtowc.m4])
+m4_include([gnulib/m4/mbscasecmp.m4])
+m4_include([gnulib/m4/mbsncasecmp.m4])
+m4_include([gnulib/m4/mbstate_t.m4])
+m4_include([gnulib/m4/mbswidth.m4])
+m4_include([gnulib/m4/memchr.m4])
+m4_include([gnulib/m4/memcpy.m4])
+m4_include([gnulib/m4/memmove.m4])
+m4_include([gnulib/m4/mkstemp.m4])
+m4_include([gnulib/m4/nls.m4])
+m4_include([gnulib/m4/onceonly.m4])
+m4_include([gnulib/m4/po.m4])
+m4_include([gnulib/m4/progtest.m4])
+m4_include([gnulib/m4/setenv.m4])
+m4_include([gnulib/m4/stdbool.m4])
+m4_include([gnulib/m4/stdint.m4])
+m4_include([gnulib/m4/stdlib_h.m4])
+m4_include([gnulib/m4/strdup.m4])
+m4_include([gnulib/m4/strerror.m4])
+m4_include([gnulib/m4/string_h.m4])
+m4_include([gnulib/m4/sys_stat_h.m4])
+m4_include([gnulib/m4/sys_time_h.m4])
+m4_include([gnulib/m4/tempname.m4])
+m4_include([gnulib/m4/unistd_h.m4])
+m4_include([gnulib/m4/wchar.m4])
+m4_include([gnulib/m4/wchar_t.m4])
+m4_include([gnulib/m4/wctype.m4])
+m4_include([gnulib/m4/wcwidth.m4])
+m4_include([gnulib/m4/wint_t.m4])
+m4_include([gnulib/m4/xalloc.m4])
diff --git a/Build/source/utils/texinfo/build-aux/compile b/Build/source/utils/texinfo/build-aux/compile
new file mode 100755
index 00000000000..da3925bd23d
--- /dev/null
+++ b/Build/source/utils/texinfo/build-aux/compile
@@ -0,0 +1,142 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/Build/source/utils/texinfo/build-aux/config.guess b/Build/source/utils/texinfo/build-aux/config.guess
new file mode 100755
index 00000000000..7924ac077df
--- /dev/null
+++ b/Build/source/utils/texinfo/build-aux/config.guess
@@ -0,0 +1,1500 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
+
+timestamp='2006-06-06'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep __ELF__ >/dev/null
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[45])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    x86:Interix*:[345]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[345]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
+	exit ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit ;;
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit ;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/Build/source/utils/texinfo/build-aux/config.rpath b/Build/source/utils/texinfo/build-aux/config.rpath
new file mode 100755
index 00000000000..35f959b87cf
--- /dev/null
+++ b/Build/source/utils/texinfo/build-aux/config.rpath
@@ -0,0 +1,666 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2008 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | cygwin* | pw32* | os2*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    rdos*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  case "$host_os" in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            :
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case $cc_basename in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct=no
+            ;;
+          *)
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    library_names_spec='$libname.a'
+    ;;
+  aix[4-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  amigaos*)
+    library_names_spec='$libname.a'
+    ;;
+  beos*)
+    library_names_spec='$libname$shrext'
+    ;;
+  bsdi[45]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  cygwin* | mingw* | pw32*)
+    shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    library_names_spec='$libname$shrext'
+    ;;
+  dgux*)
+    library_names_spec='$libname$shrext'
+    ;;
+  freebsd1*)
+    ;;
+  freebsd* | dragonfly*)
+    case "$host_os" in
+      freebsd[123]*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
+    ;;
+  gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    library_names_spec='$libname$shrext'
+    ;;
+  interix[3-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux* | k*bsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  netbsd*)
+    library_names_spec='$libname$shrext'
+    ;;
+  newsos6)
+    library_names_spec='$libname$shrext'
+    ;;
+  nto-qnx*)
+    library_names_spec='$libname$shrext'
+    ;;
+  openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    library_names_spec='$libname.a'
+    ;;
+  osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  rdos*)
+    ;;
+  solaris*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv4*MP*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  uts4*)
+    library_names_spec='$libname$shrext'
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
diff --git a/Build/source/utils/texinfo/build-aux/config.sub b/Build/source/utils/texinfo/build-aux/config.sub
new file mode 100755
index 00000000000..70584b007e2
--- /dev/null
+++ b/Build/source/utils/texinfo/build-aux/config.sub
@@ -0,0 +1,1608 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
+
+timestamp='2006-06-06'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray)
+		os=
+		basic_machine=$1
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| mt \
+	| msp430 \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k)
+		basic_machine=$basic_machine-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
+	| ymp-* \
+	| z8k-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+		;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+        -os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+        -tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+        spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+    	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/Build/source/utils/texinfo/build-aux/depcomp b/Build/source/utils/texinfo/build-aux/depcomp
new file mode 100755
index 00000000000..4e7b1bda7b2
--- /dev/null
+++ b/Build/source/utils/texinfo/build-aux/depcomp
@@ -0,0 +1,571 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+  stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mechanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
+
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/Build/source/utils/texinfo/build-aux/install-sh b/Build/source/utils/texinfo/build-aux/install-sh
new file mode 100755
index 00000000000..f746d0f80e4
--- /dev/null
+++ b/Build/source/utils/texinfo/build-aux/install-sh
@@ -0,0 +1,442 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2006-05-11.20
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+posix_glob=
+posix_mkdir=
+
+# Symbolic mode for testing mkdir with directories.
+# It is the same as 755, but also tests that "u+" works.
+test_mode=u=rwx,g=rx,o=rx,u+wx
+
+# Desired mode of installed file.
+mode=0755
+
+# Desired mode of newly created intermediate directories.
+# It is empty if not known yet.
+intermediate_mode=
+
+chmodcmd=$chmodprog
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dstarg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dstarg"
+      shift # fnord
+    fi
+    shift # arg
+    dstarg=$arg
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	posix_mkdir=false
+	if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
+	  posix_mkdir=true
+	else
+	  # Remove any dirs left behind by ancient mkdir implementations.
+	  rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
+	fi ;;
+    esac
+
+    if
+      $posix_mkdir && {
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, create it using the same intermediate mode that
+	# mkdir -p would use when creating intermediate directories.
+	# POSIX says that this mode is "$(umask -S),u+wx", so use that
+	# if umask -S works.
+
+	if test -n "$dir_arg"; then
+	  mkdir_mode=$mode
+	else
+	  case $intermediate_mode in
+	    '')
+	      if umask_S=`(umask -S) 2>/dev/null`; then
+		intermediate_mode=$umask_S,u+wx
+	      else
+		intermediate_mode=$test_mode
+	      fi ;;
+	  esac
+	  mkdir_mode=$intermediate_mode
+	fi
+
+	$mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
+      }
+    then :
+    else
+
+      # mkdir does not conform to POSIX, or it failed possibly due to
+      # a race condition.  Create the directory the slow way, step by
+      # step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix=/ ;;
+	-*) prefix=./ ;;
+	*)  prefix= ;;
+      esac
+
+      case $posix_glob in
+        '')
+	  if (set -f) 2>/dev/null; then
+	    posix_glob=true
+	  else
+	    posix_glob=false
+	  fi ;;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob && set -f
+      set fnord $dstdir
+      shift
+      $posix_glob && set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    $mkdirprog -m "$mkdir_mode" -p -- "$dstdir" && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	eval "\$mkdirprog $prefixes" || test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dst"; then
+	       $doit $rmcmd -f "$dst" 2>/dev/null \
+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+	       || {
+		 echo "$0: cannot unlink or rename $dst" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dst"
+	 }
+    } || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/Build/source/utils/texinfo/build-aux/link-warning.h b/Build/source/utils/texinfo/build-aux/link-warning.h
new file mode 100644
index 00000000000..fda01941af5
--- /dev/null
+++ b/Build/source/utils/texinfo/build-aux/link-warning.h
@@ -0,0 +1,28 @@
+/* GL_LINK_WARNING("literal string") arranges to emit the literal string as
+   a linker warning on most glibc systems.
+   We use a linker warning rather than a preprocessor warning, because
+   #warning cannot be used inside macros.  */
+#ifndef GL_LINK_WARNING
+  /* This works on platforms with GNU ld and ELF object format.
+     Testing __GLIBC__ is sufficient for asserting that GNU ld is in use.
+     Testing __ELF__ guarantees the ELF object format.
+     Testing __GNUC__ is necessary for the compound expression syntax.  */
+# if defined __GLIBC__ && defined __ELF__ && defined __GNUC__
+#  define GL_LINK_WARNING(message) \
+     GL_LINK_WARNING1 (__FILE__, __LINE__, message)
+#  define GL_LINK_WARNING1(file, line, message) \
+     GL_LINK_WARNING2 (file, line, message)  /* macroexpand file and line */
+#  define GL_LINK_WARNING2(file, line, message) \
+     GL_LINK_WARNING3 (file ":" #line ": warning: " message)
+#  define GL_LINK_WARNING3(message) \
+     ({ static const char warning[sizeof (message)]		\
+          __attribute__ ((__unused__,				\
+                          __section__ (".gnu.warning"),		\
+                          __aligned__ (1)))			\
+          = message "\n";					\
+        (void)0;						\
+     })
+# else
+#  define GL_LINK_WARNING(message) ((void) 0)
+# endif
+#endif
diff --git a/Build/source/utils/texinfo/build-aux/mdate-sh b/Build/source/utils/texinfo/build-aux/mdate-sh
new file mode 100755
index 00000000000..cd916c0a340
--- /dev/null
+++ b/Build/source/utils/texinfo/build-aux/mdate-sh
@@ -0,0 +1,201 @@
+#!/bin/sh
+# Get modification time of a file or directory and pretty-print it.
+
+scriptversion=2005-06-29.22
+
+# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005 Free Software
+# Foundation, Inc.
+# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No file.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: mdate-sh [--help] [--version] FILE
+
+Pretty-print the modification time of FILE.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "mdate-sh $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Prevent date giving response in another language.
+LANG=C
+export LANG
+LC_ALL=C
+export LC_ALL
+LC_TIME=C
+export LC_TIME
+
+# GNU ls changes its time format in response to the TIME_STYLE
+# variable.  Since we cannot assume `unset' works, revert this
+# variable to its documented default.
+if test "${TIME_STYLE+set}" = set; then
+  TIME_STYLE=posix-long-iso
+  export TIME_STYLE
+fi
+
+save_arg1=$1
+
+# Find out how to get the extended ls output of a file or directory.
+if ls -L /dev/null 1>/dev/null 2>&1; then
+  ls_command='ls -L -l -d'
+else
+  ls_command='ls -l -d'
+fi
+
+# A `ls -l' line looks as follows on OS/2.
+#  drwxrwx---        0 Aug 11  2001 foo
+# This differs from Unix, which adds ownership information.
+#  drwxrwx---   2 root  root      4096 Aug 11  2001 foo
+#
+# To find the date, we split the line on spaces and iterate on words
+# until we find a month.  This cannot work with files whose owner is a
+# user named `Jan', or `Feb', etc.  However, it's unlikely that `/'
+# will be owned by a user whose name is a month.  So we first look at
+# the extended ls output of the root directory to decide how many
+# words should be skipped to get the date.
+
+# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
+set x`ls -l -d /`
+
+# Find which argument is the month.
+month=
+command=
+until test $month
+do
+  shift
+  # Add another shift to the command.
+  command="$command shift;"
+  case $1 in
+    Jan) month=January; nummonth=1;;
+    Feb) month=February; nummonth=2;;
+    Mar) month=March; nummonth=3;;
+    Apr) month=April; nummonth=4;;
+    May) month=May; nummonth=5;;
+    Jun) month=June; nummonth=6;;
+    Jul) month=July; nummonth=7;;
+    Aug) month=August; nummonth=8;;
+    Sep) month=September; nummonth=9;;
+    Oct) month=October; nummonth=10;;
+    Nov) month=November; nummonth=11;;
+    Dec) month=December; nummonth=12;;
+  esac
+done
+
+# Get the extended ls output of the file or directory.
+set dummy x`eval "$ls_command \"\$save_arg1\""`
+
+# Remove all preceding arguments
+eval $command
+
+# Because of the dummy argument above, month is in $2.
+#
+# On a POSIX system, we should have
+#
+# $# = 5
+# $1 = file size
+# $2 = month
+# $3 = day
+# $4 = year or time
+# $5 = filename
+#
+# On Darwin 7.7.0 and 7.6.0, we have
+#
+# $# = 4
+# $1 = day
+# $2 = month
+# $3 = year or time
+# $4 = filename
+
+# Get the month.
+case $2 in
+  Jan) month=January; nummonth=1;;
+  Feb) month=February; nummonth=2;;
+  Mar) month=March; nummonth=3;;
+  Apr) month=April; nummonth=4;;
+  May) month=May; nummonth=5;;
+  Jun) month=June; nummonth=6;;
+  Jul) month=July; nummonth=7;;
+  Aug) month=August; nummonth=8;;
+  Sep) month=September; nummonth=9;;
+  Oct) month=October; nummonth=10;;
+  Nov) month=November; nummonth=11;;
+  Dec) month=December; nummonth=12;;
+esac
+
+case $3 in
+  ???*) day=$1;;
+  *) day=$3; shift;;
+esac
+
+# Here we have to deal with the problem that the ls output gives either
+# the time of day or the year.
+case $3 in
+  *:*) set `date`; eval year=\$$#
+       case $2 in
+	 Jan) nummonthtod=1;;
+	 Feb) nummonthtod=2;;
+	 Mar) nummonthtod=3;;
+	 Apr) nummonthtod=4;;
+	 May) nummonthtod=5;;
+	 Jun) nummonthtod=6;;
+	 Jul) nummonthtod=7;;
+	 Aug) nummonthtod=8;;
+	 Sep) nummonthtod=9;;
+	 Oct) nummonthtod=10;;
+	 Nov) nummonthtod=11;;
+	 Dec) nummonthtod=12;;
+       esac
+       # For the first six month of the year the time notation can also
+       # be used for files modified in the last year.
+       if (expr $nummonth \> $nummonthtod) > /dev/null;
+       then
+	 year=`expr $year - 1`
+       fi;;
+  *) year=$3;;
+esac
+
+# The result.
+echo $day $month $year
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/Build/source/utils/texinfo/build-aux/missing b/Build/source/utils/texinfo/build-aux/missing
new file mode 100755
index 00000000000..1c8ff7049d8
--- /dev/null
+++ b/Build/source/utils/texinfo/build-aux/missing
@@ -0,0 +1,367 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+#   Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case $f in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f y.tab.h; then
+	echo >y.tab.h
+    fi
+    if test ! -f y.tab.c; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f lex.yy.c; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  tar)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case $firstarg in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case $firstarg in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/Build/source/utils/texinfo/build-aux/texinfo.tex b/Build/source/utils/texinfo/build-aux/texinfo.tex
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Build/source/utils/texinfo/build-aux/texinfo.tex
diff --git a/Build/source/utils/texinfo/config.in b/Build/source/utils/texinfo/config.in
index 38ccfade334..d5e51e96ccf 100644
--- a/Build/source/utils/texinfo/config.in
+++ b/Build/source/utils/texinfo/config.in
@@ -1,5 +1,20 @@
 /* config.in.  Generated from configure.ac by autoheader.  */
 
+/* Define to the number of bits in type 'ptrdiff_t'. */
+#undef BITSIZEOF_PTRDIFF_T
+
+/* Define to the number of bits in type 'sig_atomic_t'. */
+#undef BITSIZEOF_SIG_ATOMIC_T
+
+/* Define to the number of bits in type 'size_t'. */
+#undef BITSIZEOF_SIZE_T
+
+/* Define to the number of bits in type 'wchar_t'. */
+#undef BITSIZEOF_WCHAR_T
+
+/* Define to the number of bits in type 'wint_t'. */
+#undef BITSIZEOF_WINT_T
+
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
@@ -12,37 +27,62 @@
    language is requested. */
 #undef ENABLE_NLS
 
+/* Define if gettimeofday clobbers the localtime buffer. */
+#undef GETTIMEOFDAY_CLOBBERS_LOCALTIME
+
 /* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
 #undef GWINSZ_IN_SYS_IOCTL
 
-/* Define to 1 if you have `alloca', as a function or macro. */
+/* Define to 1 if you have 'alloca' after including <alloca.h>, a header that
+   may be supplied by this distribution. */
 #undef HAVE_ALLOCA
 
 /* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
    */
 #undef HAVE_ALLOCA_H
 
+/* Define to 1 if you have the `argz_add' function. */
+#undef HAVE_ARGZ_ADD
+
+/* Define to 1 if you have the `argz_append' function. */
+#undef HAVE_ARGZ_APPEND
+
+/* Define to 1 if you have the `argz_count' function. */
+#undef HAVE_ARGZ_COUNT
+
+/* Define to 1 if you have the `argz_create_sep' function. */
+#undef HAVE_ARGZ_CREATE_SEP
+
 /* Define to 1 if you have the <argz.h> header file. */
 #undef HAVE_ARGZ_H
 
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
+/* Define to 1 if you have the `argz_insert' function. */
+#undef HAVE_ARGZ_INSERT
+
+/* Define to 1 if you have the `argz_next' function. */
+#undef HAVE_ARGZ_NEXT
+
+/* Define to 1 if you have the `argz_stringify' function. */
+#undef HAVE_ARGZ_STRINGIFY
+
+/* Define to 1 if you have the <bp-sym.h> header file. */
+#undef HAVE_BP_SYM_H
 
 /* Define to 1 if you have the `bzero' function. */
 #undef HAVE_BZERO
 
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT
 
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
-   don't. */
-#undef HAVE_DECL_FEOF_UNLOCKED
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
-   you don't. */
-#undef HAVE_DECL_FGETS_UNLOCKED
-
 /* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
    don't. */
 #undef HAVE_DECL_GETC_UNLOCKED
@@ -51,49 +91,58 @@
    */
 #undef HAVE_DECL_GETENV
 
+/* Define to 1 if you have a declaration of mbswidth() in <wchar.h>, and to 0
+   otherwise. */
+#undef HAVE_DECL_MBSWIDTH_IN_WCHAR_H
+
 /* Define to 1 if you have the declaration of `memchr', and to 0 if you don't.
    */
 #undef HAVE_DECL_MEMCHR
 
+/* Define to 1 if you have the declaration of `mkdir', and to 0 if you don't.
+   */
+#undef HAVE_DECL_MKDIR
+
 /* Define to 1 if you have the declaration of `strcoll', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRCOLL
 
+/* Define to 1 if you have the declaration of `strdup', and to 0 if you don't.
+   */
+#undef HAVE_DECL_STRDUP
+
 /* Define to 1 if you have the declaration of `strerror', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRERROR
 
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
    don't. */
-#undef HAVE_DECL__SNPRINTF
+#undef HAVE_DECL_STRERROR_R
 
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
+/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
    don't. */
-#undef HAVE_DECL__SNWPRINTF
+#undef HAVE_DECL_WCWIDTH
 
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
 
+/* Define if you have the declaration of environ. */
+#undef HAVE_ENVIRON_DECL
+
+/* Define to 1 if the system has the type `error_t'. */
+#undef HAVE_ERROR_T
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define to 1 if you have the `fwprintf' function. */
-#undef HAVE_FWPRINTF
-
 /* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
-/* Define to 1 if you have the `getegid' function. */
-#undef HAVE_GETEGID
-
-/* Define to 1 if you have the `geteuid' function. */
-#undef HAVE_GETEUID
-
-/* Define to 1 if you have the `getgid' function. */
-#undef HAVE_GETGID
+/* Define to 1 if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
 
-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
+/* Define to 1 if you have the `getopt_long_only' function. */
+#undef HAVE_GETOPT_LONG_ONLY
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
@@ -101,48 +150,58 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* Define to 1 if you have the `getuid' function. */
-#undef HAVE_GETUID
-
-/* Define if you have the iconv() function. */
+/* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_INTMAX_T
+/* Define if your compiler supports the #include_next directive. */
+#undef HAVE_INCLUDE_NEXT
 
-/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
-#undef HAVE_INTTYPES_H
+/* Define to 1 if the compiler supports one of the keywords 'inline',
+   '__inline__', '__inline' and effectively inlines functions marked as such.
+   */
+#undef HAVE_INLINE
 
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-   declares uintmax_t. */
-#undef HAVE_INTTYPES_H_WITH_UINTMAX
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
 
 /* Define to 1 if you have the <io.h> header file. */
 #undef HAVE_IO_H
 
+/* Define to 1 if you have the `isascii' function. */
+#undef HAVE_ISASCII
+
+/* Define to 1 if you have the `iswcntrl' function. */
+#undef HAVE_ISWCNTRL
+
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
 /* Define to 1 if you have the `bsd' library (-lbsd). */
 #undef HAVE_LIBBSD
 
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
+/* Define to 1 if the system has the type `long long int'. */
+#undef HAVE_LONG_LONG_INT
+
+/* Define to 1 if you have the `lstat' function. */
+#undef HAVE_LSTAT
 
-/* Define if you have the 'long double' type. */
-#undef HAVE_LONG_DOUBLE
+/* Define if the 'malloc' function is POSIX compliant. */
+#undef HAVE_MALLOC_POSIX
 
-/* Define if you have the 'long long' type. */
-#undef HAVE_LONG_LONG
+/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
+#undef HAVE_MBRTOWC
 
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
+/* Define to 1 if you have the `mbsinit' function. */
+#undef HAVE_MBSINIT
+
+/* Define to 1 if <wchar.h> declares mbstate_t. */
+#undef HAVE_MBSTATE_T
+
+/* Define to 1 if you have the `memchr' function. */
+#undef HAVE_MEMCHR
 
 /* Define to 1 if you have the `memcpy' function. */
 #undef HAVE_MEMCPY
@@ -153,36 +212,18 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the `mempcpy' function. */
-#undef HAVE_MEMPCPY
-
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
-/* Define to 1 if you have the `munmap' function. */
-#undef HAVE_MUNMAP
-
 /* Define to 1 if you have the <ncurses/termcap.h> header file. */
 #undef HAVE_NCURSES_TERMCAP_H
 
-/* Define to 1 if you have the <nl_types.h> header file. */
-#undef HAVE_NL_TYPES_H
-
-/* Define if your printf() function supports format strings with positions. */
-#undef HAVE_POSIX_PRINTF
-
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
 /* Define to 1 if you have the <pwd.h> header file. */
 #undef HAVE_PWD_H
 
+/* Define to 1 if you have the <search.h> header file. */
+#undef HAVE_SEARCH_H
+
 /* Define to 1 if you have the `setenv' function. */
 #undef HAVE_SETENV
 
@@ -195,34 +236,30 @@
 /* Define to 1 if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
 
+/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
+#undef HAVE_SIGNED_SIG_ATOMIC_T
+
+/* Define to 1 if 'wchar_t' is a signed integer type. */
+#undef HAVE_SIGNED_WCHAR_T
+
+/* Define to 1 if 'wint_t' is a signed integer type. */
+#undef HAVE_SIGNED_WINT_T
+
 /* Define to 1 if you have the `sigprocmask' function. */
 #undef HAVE_SIGPROCMASK
 
 /* Define to 1 if you have the `sigsetmask' function. */
 #undef HAVE_SIGSETMASK
 
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
+/* Define to 1 if stdbool.h conforms to C99. */
+#undef HAVE_STDBOOL_H
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-   uintmax_t. */
-#undef HAVE_STDINT_H_WITH_UINTMAX
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `stpcpy' function. */
-#undef HAVE_STPCPY
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
 /* Define to 1 if you have the `strchr' function. */
 #undef HAVE_STRCHR
 
@@ -236,17 +273,17 @@
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
+/* Define to 1 if you have the `strerror_r' function. */
+#undef HAVE_STRERROR_R
+
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strncasecmp' function. */
-#undef HAVE_STRNCASECMP
-
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
+/* Define to 1 if you have the <sys/bitypes.h> header file. */
+#undef HAVE_SYS_BITYPES_H
 
 /* Define to 1 if you have the <sys/fcntl.h> header file. */
 #undef HAVE_SYS_FCNTL_H
@@ -254,8 +291,8 @@
 /* Define to 1 if you have the <sys/file.h> header file. */
 #undef HAVE_SYS_FILE_H
 
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
+/* Define to 1 if you have the <sys/inttypes.h> header file. */
+#undef HAVE_SYS_INTTYPES_H
 
 /* Define to 1 if you have the <sys/ptem.h> header file. */
 #undef HAVE_SYS_PTEM_H
@@ -266,6 +303,9 @@
 /* Define to 1 if you have the <sys/stream.h> header file. */
 #undef HAVE_SYS_STREAM_H
 
+/* Define to 1 if you have the <sys/timeb.h> header file. */
+#undef HAVE_SYS_TIMEB_H
+
 /* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
@@ -290,47 +330,47 @@
 /* Define to 1 if you have the `tsearch' function. */
 #undef HAVE_TSEARCH
 
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define if you have the 'unsigned long long' type. */
-#undef HAVE_UNSIGNED_LONG_LONG
+/* Define to 1 if you have the `unsetenv' function. */
+#undef HAVE_UNSETENV
+
+/* Define to 1 if the system has the type `unsigned long long int'. */
+#undef HAVE_UNSIGNED_LONG_LONG_INT
 
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
 /* Define if you have the 'wchar_t' type. */
 #undef HAVE_WCHAR_T
 
-/* Define to 1 if you have the `wcslen' function. */
-#undef HAVE_WCSLEN
+/* Define to 1 if you have the <wctype.h> header file. */
+#undef HAVE_WCTYPE_H
+
+/* Define to 1 if you have the `wcwidth' function. */
+#undef HAVE_WCWIDTH
 
 /* Define if you have the 'wint_t' type. */
 #undef HAVE_WINT_T
 
-/* Define to 1 if you have the `__argz_count' function. */
-#undef HAVE___ARGZ_COUNT
-
-/* Define to 1 if you have the `__argz_next' function. */
-#undef HAVE___ARGZ_NEXT
+/* This value is set to 1 to indicate that the system argz facility works */
+#undef HAVE_WORKING_ARGZ
 
-/* Define to 1 if you have the `__argz_stringify' function. */
-#undef HAVE___ARGZ_STRINGIFY
+/* Define to 1 if the system has the type `_Bool'. */
+#undef HAVE__BOOL
 
-/* Define to 1 if you have the `__fsetlocking' function. */
-#undef HAVE___FSETLOCKING
+/* Define to 1 if you have the `_ftime' function. */
+#undef HAVE__FTIME
 
-/* Define to 1 if you have the `__secure_getenv' function. */
-#undef HAVE___SECURE_GETENV
+/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
+#undef MALLOC_0_IS_NONNULL
 
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Define if integer division by zero raises signal SIGFPE. */
-#undef INTDIV0_RAISES_SIGFPE
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
 
 /* Name of package */
 #undef PACKAGE
@@ -350,15 +390,23 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-#undef PRI_MACROS_BROKEN
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'ptrdiff_t'. */
+#undef PTRDIFF_T_SUFFIX
+
+/* Define this to 1 if strerror is broken. */
+#undef REPLACE_STRERROR
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE
 
-/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-#undef SIZE_MAX
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'sig_atomic_t'. */
+#undef SIG_ATOMIC_T_SUFFIX
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'size_t'. */
+#undef SIZE_T_SUFFIX
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
@@ -374,12 +422,29 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Define to 1 if strerror_r returns char *. */
+#undef STRERROR_R_CHAR_P
+
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
 /* Version number of package */
 #undef VERSION
 
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'wchar_t'. */
+#undef WCHAR_T_SUFFIX
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'wint_t'. */
+#undef WINT_T_SUFFIX
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
 /* Define to 1 if on MINIX. */
 #undef _MINIX
 
@@ -390,31 +455,78 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Define to rpl_ if the getopt replacement functions and variables should be
+   used. */
+#undef __GETOPT_PREFIX
+
+/* Define so that glibc/gnulib argp.h does not typedef error_t. */
+#undef __error_t_defined
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
+/* Define to a type to use for `error_t' if it is not otherwise available. */
+#undef error_t
+
+/* Define to rpl_gmtime if the replacement function should be used. */
+#undef gmtime
+
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
 #endif
 
-/* Define to rpl_mkstemp if the replacement function should be used. */
-#undef mkstemp
-
-/* Define to `long int' if <sys/types.h> does not define. */
-#undef off_t
+/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
+   __APPLE__ && __MACH__ test for MacOS X.
+   __APPLE_CC__ tests for the Apple compiler and its version.
+   __STDC_VERSION__ tests for the C99 mode.  */
+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
+# define __GNUC_STDC_INLINE__ 1
+#endif
 
-/* Define as the type of the result of subtracting two pointers, if the system
-   doesn't define it. */
-#undef ptrdiff_t
+/* Define to rpl_localtime if the replacement function should be used. */
+#undef localtime
 
-/* Define to empty if the C compiler doesn't support this keyword. */
-#undef signed
+/* Define to a type if <wchar.h> does not define. */
+#undef mbstate_t
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
+/* Define to `long int' if <sys/types.h> does not define. */
+#undef off_t
 
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-#undef uintmax_t
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#undef restrict
+/* Work around a bug in Sun C++: it does not support _Restrict, even
+   though the corresponding Sun C compiler does, which causes
+   "#define restrict _Restrict" in the previous line.  Perhaps some future
+   version of Sun C++ will work with _Restrict; if so, it'll probably
+   define __RESTRICT, just as Sun C does.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+#endif
diff --git a/Build/source/utils/texinfo/configure b/Build/source/utils/texinfo/configure
index 00eff6bb9e0..c624f73fa12 100755
--- a/Build/source/utils/texinfo/configure
+++ b/Build/source/utils/texinfo/configure
@@ -1,9 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for GNU Texinfo 4.8.
+# Generated by GNU Autoconf 2.62 for GNU Texinfo 4.12.
+#
+# Report bugs to <bug-texinfo@gnu.org>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +93,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +115,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +128,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +153,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +179,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +261,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +282,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +362,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -413,9 +434,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -451,7 +473,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +501,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -492,19 +513,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -529,10 +553,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -572,9 +596,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GNU Texinfo'
 PACKAGE_TARNAME='texinfo'
-PACKAGE_VERSION='4.8'
-PACKAGE_STRING='GNU Texinfo 4.8'
-PACKAGE_BUGREPORT=''
+PACKAGE_VERSION='4.12'
+PACKAGE_STRING='GNU Texinfo 4.12'
+PACKAGE_BUGREPORT='bug-texinfo@gnu.org'
 
 ac_unique_file="makeinfo/makeinfo.c"
 # Factoring default headers for most tests.
@@ -614,6 +638,8 @@ ac_includes_default="\
 #endif"
 
 gl_header_list=
+gl_func_list=
+gt_needs=
 ac_subst_vars='SHELL
 PATH_SEPARATOR
 PACKAGE_NAME
@@ -654,6 +680,7 @@ target_alias
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@@ -665,6 +692,7 @@ MAKEINFO
 install_sh
 STRIP
 INSTALL_STRIP_PROGRAM
+MKDIR_P
 mkdir_p
 AWK
 SET_MAKE
@@ -691,55 +719,224 @@ AMDEPBACKSLASH
 CCDEPMODE
 am__fastdepCC_TRUE
 am__fastdepCC_FALSE
+RANLIB
 CPP
 GREP
 EGREP
-RANLIB
-HELP2MAN
+GL_COND_LIBTOOL_TRUE
+GL_COND_LIBTOOL_FALSE
 ALLOCA
-LIBOBJS
+ALLOCA_H
+ARGZ_H
+GNULIB_CHOWN
+GNULIB_DUP2
+GNULIB_ENVIRON
+GNULIB_FCHDIR
+GNULIB_FTRUNCATE
+GNULIB_GETCWD
+GNULIB_GETLOGIN_R
+GNULIB_GETPAGESIZE
+GNULIB_LCHOWN
+GNULIB_LSEEK
+GNULIB_READLINK
+GNULIB_SLEEP
+HAVE_DUP2
+HAVE_FTRUNCATE
+HAVE_GETPAGESIZE
+HAVE_READLINK
+HAVE_SLEEP
+HAVE_DECL_ENVIRON
+HAVE_DECL_GETLOGIN_R
+HAVE_OS_H
+HAVE_SYS_PARAM_H
+REPLACE_CHOWN
+REPLACE_FCHDIR
+REPLACE_GETCWD
+REPLACE_GETPAGESIZE
+REPLACE_LCHOWN
+REPLACE_LSEEK
+GETOPT_H
+LIBINTL
+LTLIBINTL
+INCLUDE_NEXT
+NEXT_SYS_TIME_H
+HAVE_SYS_TIME_H
+HAVE_STRUCT_TIMEVAL
+REPLACE_GETTIMEOFDAY
+SYS_TIME_H
 build
 build_cpu
 build_vendor
 build_os
-native_tools
-TOOLS_ONLY_TRUE
-TOOLS_ONLY_FALSE
-TERMLIBS
 host
 host_cpu
 host_vendor
 host_os
+GLIBC21
+LOCALCHARSET_TESTS_ENVIRONMENT
+HAVE_MALLOC_POSIX
+GNULIB_MALLOC_POSIX
+GNULIB_REALLOC_POSIX
+GNULIB_CALLOC_POSIX
+GNULIB_GETSUBOPT
+GNULIB_MKDTEMP
+GNULIB_MKSTEMP
+GNULIB_PUTENV
+GNULIB_SETENV
+GNULIB_STRTOD
+GNULIB_UNSETENV
+HAVE_CALLOC_POSIX
+HAVE_GETSUBOPT
+HAVE_MKDTEMP
+HAVE_REALLOC_POSIX
+HAVE_SETENV
+HAVE_STRTOD
+HAVE_UNSETENV
+REPLACE_MKSTEMP
+REPLACE_PUTENV
+REPLACE_STRTOD
+VOID_UNSETENV
+GNULIB_MEMMEM
+GNULIB_MEMPCPY
+GNULIB_MEMRCHR
+GNULIB_STPCPY
+GNULIB_STPNCPY
+GNULIB_STRCHRNUL
+GNULIB_STRDUP
+GNULIB_STRNDUP
+GNULIB_STRNLEN
+GNULIB_STRPBRK
+GNULIB_STRSEP
+GNULIB_STRSTR
+GNULIB_STRCASESTR
+GNULIB_STRTOK_R
+GNULIB_MBSLEN
+GNULIB_MBSNLEN
+GNULIB_MBSCHR
+GNULIB_MBSRCHR
+GNULIB_MBSSTR
+GNULIB_MBSCASECMP
+GNULIB_MBSNCASECMP
+GNULIB_MBSPCASECMP
+GNULIB_MBSCASESTR
+GNULIB_MBSCSPN
+GNULIB_MBSPBRK
+GNULIB_MBSSPN
+GNULIB_MBSSEP
+GNULIB_MBSTOK_R
+GNULIB_STRERROR
+GNULIB_STRSIGNAL
+HAVE_DECL_MEMMEM
+HAVE_MEMPCPY
+HAVE_DECL_MEMRCHR
+HAVE_STPCPY
+HAVE_STPNCPY
+HAVE_STRCHRNUL
+HAVE_DECL_STRDUP
+HAVE_STRNDUP
+HAVE_DECL_STRNDUP
+HAVE_DECL_STRNLEN
+HAVE_STRPBRK
+HAVE_STRSEP
+HAVE_STRCASESTR
+HAVE_DECL_STRTOK_R
+HAVE_DECL_STRERROR
+HAVE_DECL_STRSIGNAL
+REPLACE_STRERROR
+REPLACE_STRSIGNAL
+REPLACE_MEMMEM
+REPLACE_STRCASESTR
+REPLACE_STRSTR
+STDBOOL_H
+HAVE__BOOL
+HAVE_LONG_LONG_INT
+HAVE_UNSIGNED_LONG_LONG_INT
+HAVE_INTTYPES_H
+HAVE_SYS_TYPES_H
+NEXT_STDINT_H
+HAVE_STDINT_H
+HAVE_SYS_INTTYPES_H
+HAVE_SYS_BITYPES_H
+BITSIZEOF_PTRDIFF_T
+BITSIZEOF_SIG_ATOMIC_T
+BITSIZEOF_SIZE_T
+BITSIZEOF_WCHAR_T
+BITSIZEOF_WINT_T
+HAVE_SIGNED_SIG_ATOMIC_T
+HAVE_SIGNED_WCHAR_T
+HAVE_SIGNED_WINT_T
+PTRDIFF_T_SUFFIX
+SIG_ATOMIC_T_SUFFIX
+SIZE_T_SUFFIX
+WCHAR_T_SUFFIX
+WINT_T_SUFFIX
+STDINT_H
+NEXT_STDLIB_H
+NEXT_STRING_H
+HAVE_LSTAT
+HAVE_DECL_MKDIR
+HAVE_IO_H
+NEXT_SYS_STAT_H
+SYS_STAT_H
+NEXT_UNISTD_H
+HAVE_UNISTD_H
+GNULIB_WCWIDTH
+HAVE_DECL_WCWIDTH
+REPLACE_WCWIDTH
+WCHAR_H
+HAVE_WCHAR_H
+NEXT_WCHAR_H
+HAVE_ISWCNTRL
+HAVE_WINT_T
+NEXT_WCTYPE_H
+HAVE_WCTYPE_H
+WCTYPE_H
+LIBGNU_LIBDEPS
+LIBGNU_LTLIBDEPS
+HELP2MAN
+LIBOBJS
+native_tools
+TOOLS_ONLY_TRUE
+TOOLS_ONLY_FALSE
+TERMLIBS
 INSTALL_WARNINGS_TRUE
 INSTALL_WARNINGS_FALSE
-MKINSTALLDIRS
 USE_NLS
+GETTEXT_MACRO_VERSION
 MSGFMT
 GMSGFMT
+MSGFMT_015
+GMSGFMT_015
 XGETTEXT
+XGETTEXT_015
 MSGMERGE
-GLIBC21
-HAVE_POSIX_PRINTF
-HAVE_ASPRINTF
-HAVE_SNPRINTF
-HAVE_WPRINTF
+XGETTEXT_EXTRA_OPTIONS
+INTL_MACOSX_LIBS
 LIBICONV
 LTLIBICONV
-INTLBISON
-BUILD_INCLUDED_LIBINTL
-USE_INCLUDED_LIBINTL
-CATOBJEXT
-DATADIRNAME
-INSTOBJEXT
-GENCAT
-INTLOBJS
-INTL_LIBTOOL_SUFFIX_PREFIX
 INTLLIBS
-LIBINTL
-LTLIBINTL
 POSUB
-LTLIBOBJS'
+HEVEA
+TEX
+LTLIBOBJS
+gl_LIBOBJS
+gl_LTLIBOBJS
+gltests_LIBOBJS
+gltests_LTLIBOBJS'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_maintainer_mode
+enable_dependency_tracking
+enable_largefile
+enable_multiplatform
+enable_install_warnings
+enable_nls
+with_gnu_ld
+enable_rpath
+with_libiconv_prefix
+with_libintl_prefix
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -754,6 +951,8 @@ CPP'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -852,13 +1051,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -871,13 +1078,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1068,22 +1283,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1103,7 +1334,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1112,16 +1343,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1130,22 +1361,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1160,7 +1407,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1176,10 +1423,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1187,12 +1434,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1219,12 +1466,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1251,7 +1498,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Texinfo 4.8 to adapt to many kinds of systems.
+\`configure' configures GNU Texinfo 4.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1273,9 +1520,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1285,25 +1532,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/texinfo]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/texinfo]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1321,17 +1568,19 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Texinfo 4.8:";;
+     short | recursive ) echo "Configuration of GNU Texinfo 4.12:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
+  --disable-largefile     omit support for large files
   --enable-multiplatform  put executables into bin/PLATFORM and libraries into
                           lib/PLATFORM
   --disable-install-warnings  omit make install warnings about TeX files
@@ -1344,7 +1593,6 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
-  --with-included-gettext use the GNU gettext library included here
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
 
@@ -1361,6 +1609,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to <bug-texinfo@gnu.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -1368,15 +1617,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1412,7 +1663,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1421,11 +1672,11 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Texinfo configure 4.8
-generated by GNU Autoconf 2.61
+GNU Texinfo configure 4.12
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1435,8 +1686,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Texinfo $as_me 4.8, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+It was created by GNU Texinfo $as_me 4.12, which was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
 
@@ -1472,7 +1723,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1507,7 +1758,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1559,11 +1810,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1593,9 +1845,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1610,9 +1862,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1628,8 +1880,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1671,21 +1923,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1695,22 +1950,35 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-gl_header_list="$gl_header_list fcntl.h"
 gl_header_list="$gl_header_list sys/time.h"
+gl_func_list="$gl_func_list gettimeofday"
+gl_header_list="$gl_header_list wchar.h"
+gl_func_list="$gl_func_list isascii"
+gl_func_list="$gl_func_list mbsinit"
+gl_func_list="$gl_func_list setenv"
 gl_header_list="$gl_header_list unistd.h"
+gl_header_list="$gl_header_list stdint.h"
+gl_header_list="$gl_header_list stdlib.h"
+gl_header_list="$gl_header_list string.h"
+gl_func_list="$gl_func_list lstat"
+gl_header_list="$gl_header_list sys/stat.h"
+gl_func_list="$gl_func_list iswcntrl"
+gl_header_list="$gl_header_list wctype.h"
+gl_func_list="$gl_func_list wcwidth"
+gt_needs="$gt_needs "
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -1721,29 +1989,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1753,10 +2030,10 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1791,12 +2068,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-ac_config_headers="$ac_config_headers config.h:config.in"
-# Keep filename to 8.3 for MS-DOS.
 
-am__api_version="1.9"
 ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+for ac_dir in build-aux "$srcdir"/build-aux; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1812,8 +2086,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build-aux \"$srcdir\"/build-aux" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in build-aux \"$srcdir\"/build-aux" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1826,6 +2100,8 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
+am__api_version='1.10'
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1839,11 +2115,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -1872,17 +2149,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -1895,8 +2184,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -1906,8 +2195,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -1930,9 +2219,9 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
    { (exit 1); exit 1; }; }
    fi
@@ -1943,26 +2232,23 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
 Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
+$as_echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
+# Double any \ or $.
 # By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1973,51 +2259,66 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2030,7 +2331,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2041,22 +2342,23 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -2073,12 +2375,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2091,12 +2393,16 @@ else
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -2111,7 +2417,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='texinfo'
- VERSION='4.8'
+ VERSION='4.12'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2139,7 +2445,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2149,10 +2455,10 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2165,7 +2471,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2176,11 +2482,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2189,10 +2495,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2205,7 +2511,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2216,11 +2522,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -2228,10 +2534,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2243,7 +2549,7 @@ else
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -2258,11 +2564,18 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
+# Minimum Autoconf version required.
+
+
+# Where to generate output; srcdir location.
+ac_config_headers="$ac_config_headers config.h:config.in"
+
+
 # When the Texinfo source is imported into other repositories
 # (NetBSD and TeX Live), timestamps are generally not preserved.  This
 # causes lots of annoyance, so --enable-maintainer-mode.  Sorry.
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -2270,11 +2583,9 @@ else
   USE_MAINTAINER_MODE=no
 fi
 
-  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
-if test $USE_MAINTAINER_MODE = yes; then
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
   MAINTAINER_MODE_FALSE='#'
 else
@@ -2295,10 +2606,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2311,7 +2622,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2322,11 +2633,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2335,10 +2646,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2351,7 +2662,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2362,11 +2673,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2374,10 +2685,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2392,10 +2703,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2408,7 +2719,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2419,11 +2730,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2432,10 +2743,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2453,7 +2764,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2476,11 +2787,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2491,10 +2802,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2507,7 +2818,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2518,11 +2829,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2535,10 +2846,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2551,7 +2862,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2562,11 +2873,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2578,10 +2889,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2593,44 +2904,48 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2649,27 +2964,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2680,10 +2990,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2694,7 +3005,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2721,15 +3032,15 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
@@ -2738,8 +3049,8 @@ ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2748,49 +3059,51 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2799,31 +3112,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2846,40 +3159,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2905,20 +3219,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2928,15 +3243,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2963,20 +3282,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -3001,20 +3321,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3040,20 +3361,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3068,8 +3390,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3085,10 +3407,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3159,20 +3481,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3188,15 +3511,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3217,8 +3540,8 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -3245,8 +3568,8 @@ if test "$am__include" = "#"; then
 fi
 
 
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
@@ -3258,9 +3581,7 @@ if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -3270,13 +3591,12 @@ fi
 
 
 
-
 depcc="$CC"   am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -3338,6 +3658,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3363,13 +3684,11 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -3381,20 +3700,251 @@ fi
 
 
 
+# Since we use gnulib: gl_EARLY must be called as soon as possible after
+# the C compiler is checked.  The others could be later, but we just
+# keep everything together.
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+if test "x$CC" != xcc; then
+  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+else
+  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+fi
+set dummy $CC; ac_cc=`$as_echo "$2" |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+   test -f conftest2.$ac_objext && { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+      rm -f conftest2.*
+      if { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+      then
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3426,20 +3976,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3463,13 +4014,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3477,7 +4029,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3502,8 +4054,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3531,20 +4083,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3568,13 +4121,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3582,7 +4136,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3598,9 +4152,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3612,42 +4166,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3662,74 +4211,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3744,368 +4279,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-if test $ac_cv_c_compiler_gnu = yes; then
-    { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
-echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6; }
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-    ac_pattern="Autoconf.*'x'"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sgtty.h>
-Autoconf TIOCGETP
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
-  ac_cv_prog_gcc_traditional=yes
-else
-  ac_cv_prog_gcc_traditional=no
-fi
-rm -f conftest*
-
-
-  if test $ac_cv_prog_gcc_traditional = no; then
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <termio.h>
-Autoconf TCGETA
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
-  ac_cv_prog_gcc_traditional=yes
-fi
-rm -f conftest*
-
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; }
-  if test $ac_cv_prog_gcc_traditional = yes; then
-    CC="$CC -traditional"
-  fi
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-HELP2MAN=${HELP2MAN-"${am_missing_run}help2man"}
-
-
-
-        { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
-if test "${ac_cv_lib_cposix_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcposix  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_cposix_strerror=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_cposix_strerror=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
-if test $ac_cv_lib_cposix_strerror = yes; then
-  LIBS="$LIBS -lcposix"
-fi
-
-
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4132,20 +4330,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4237,37 +4436,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4289,11 +4491,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4311,20 +4513,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -4332,12 +4535,14 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4345,18 +4550,19 @@ fi
 done
 
 
+
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
 if test "${ac_cv_header_minix_config_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4372,32 +4578,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
-echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4411,63 +4618,69 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
-
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
 if test "${ac_cv_header_minix_config_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_minix_config_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
 
 fi
 if test $ac_cv_header_minix_config_h = yes; then
@@ -4477,7 +4690,7 @@ else
 fi
 
 
-if test "$MINIX" = yes; then
+  if test "$MINIX" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _POSIX_SOURCE 1
@@ -4493,14 +4706,102 @@ cat >>confdefs.h <<\_ACEOF
 #define _MINIX 1
 _ACEOF
 
+  fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
 
+  cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
 
-# Needed on sysV68 for sigblock, sigsetmask.  But check for it in libc first.
-{ echo "$as_me:$LINENO: checking for sigblock" >&5
-echo $ECHO_N "checking for sigblock... $ECHO_C" >&6; }
-if test "${ac_cv_func_sigblock+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4508,12 +4809,208 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define sigblock to an innocuous variant, in case <limits.h> declares sigblock.
+#include <alloca.h>
+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+			  if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_working_alloca_h=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_working_alloca_h=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA_H 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+int
+main ()
+{
+char *p = (char *) alloca (1);
+				    if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_alloca_works=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_alloca_works=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
+
+if test $ac_cv_func_alloca_works = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA 1
+_ACEOF
+
+else
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble.  Some versions do not even contain alloca or
+# contain a buggy version.  If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+
+
+
+
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+cat >>confdefs.h <<\_ACEOF
+#define C_ALLOCA 1
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define sigblock innocuous_sigblock
+#define $ac_func innocuous_$ac_func
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sigblock (); below.
+    which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
 
@@ -4523,7 +5020,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 # include <assert.h>
 #endif
 
-#undef sigblock
+#undef $ac_func
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -4531,18 +5028,18 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char sigblock ();
+char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined __stub_sigblock || defined __stub___sigblock
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
 #endif
 
 int
 main ()
 {
-return sigblock ();
+return $ac_func ();
   ;
   return 0;
 }
@@ -4553,48 +5050,261 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_sigblock=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_func_sigblock=no
+	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_sigblock" >&5
-echo "${ECHO_T}$ac_cv_func_sigblock" >&6; }
-if test $ac_cv_func_sigblock = yes; then
-  :
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+    break
+fi
+
+  done
+fi
+
+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
+  if test "$cross_compiling" = yes; then
+  ac_cv_c_stack_direction=0
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
 
-{ echo "$as_me:$LINENO: checking for sigblock in -lbsd" >&5
-echo $ECHO_N "checking for sigblock in -lbsd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bsd_sigblock+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+int
+main ()
+{
+  return find_stack_direction () < 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_stack_direction=1
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_stack_direction=-1
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
+
+
+fi
+
+
+  GNULIB_CHOWN=0;
+  GNULIB_DUP2=0;
+  GNULIB_ENVIRON=0;
+  GNULIB_FCHDIR=0;
+  GNULIB_FTRUNCATE=0;
+  GNULIB_GETCWD=0;
+  GNULIB_GETLOGIN_R=0;
+  GNULIB_GETPAGESIZE=0;
+  GNULIB_LCHOWN=0;
+  GNULIB_LSEEK=0;
+  GNULIB_READLINK=0;
+  GNULIB_SLEEP=0;
+    HAVE_DUP2=1;
+  HAVE_FTRUNCATE=1;
+  HAVE_GETPAGESIZE=1;
+  HAVE_READLINK=1;
+  HAVE_SLEEP=1;
+  HAVE_DECL_ENVIRON=1;
+  HAVE_DECL_GETLOGIN_R=1;
+  HAVE_OS_H=0;
+  HAVE_SYS_PARAM_H=0;
+  REPLACE_CHOWN=0;
+  REPLACE_FCHDIR=0;
+  REPLACE_GETCWD=0;
+  REPLACE_GETPAGESIZE=0;
+  REPLACE_LCHOWN=0;
+  REPLACE_LSEEK=0;
+
+{ $as_echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5
+$as_echo_n "checking whether strerror_r is declared... " >&6; }
+if test "${ac_cv_have_decl_strerror_r+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef strerror_r
+  (void) strerror_r;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_strerror_r=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_strerror_r=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5
+$as_echo "$ac_cv_have_decl_strerror_r" >&6; }
+if test $ac_cv_have_decl_strerror_r = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR_R 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR_R 0
+_ACEOF
+
+
+fi
+
+
+
+for ac_func in strerror_r
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -4602,11 +5312,18 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char sigblock ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
 int
 main ()
 {
-return sigblock ();
+return $ac_func ();
   ;
   return 0;
 }
@@ -4617,49 +5334,110 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_bsd_sigblock=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_bsd_sigblock=no
+	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_sigblock" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_sigblock" >&6; }
-if test $ac_cv_lib_bsd_sigblock = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBBSD 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
-  LIBS="-lbsd $LIBS"
-
 fi
+done
 
-fi
+{ $as_echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5
+$as_echo_n "checking whether strerror_r returns char *... " >&6; }
+if test "${ac_cv_func_strerror_r_char_p+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
 
+    ac_cv_func_strerror_r_char_p=no
+    if test $ac_cv_have_decl_strerror_r = yes; then
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
 
-# Checks for header files.
-{ echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
-echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6; }
-if test "${ac_cv_header_stat_broken+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	  char buf[100];
+	  char x = *strerror_r (0, buf, sizeof buf);
+	  char *p = strerror_r (0, buf, sizeof buf);
+	  return !p || x;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_func_strerror_r_char_p=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    else
+      # strerror_r is not declared.  Choose between
+      # systems that have relatively inaccessible declarations for the
+      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
+      # former has a strerror_r that returns char*, while the latter
+      # has a strerror_r that returns `int'.
+      # This test should segfault on the DEC system.
+      if test "$cross_compiling" = yes; then
+  :
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4667,25 +5445,96 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
+	extern char *strerror_r ();
+int
+main ()
+{
+char buf[100];
+	  char x = *strerror_r (0, buf, sizeof buf);
+	  return ! isalpha (x);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_strerror_r_char_p=yes
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-#if defined S_ISBLK && defined S_IFDIR
-extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
-#endif
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
 
-#if defined S_ISBLK && defined S_IFCHR
-extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
-#endif
 
-#if defined S_ISLNK && defined S_IFREG
-extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
-#endif
+    fi
 
-#if defined S_ISSOCK && defined S_IFREG
-extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
-#endif
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5
+$as_echo "$ac_cv_func_strerror_r_char_p" >&6; }
+if test $ac_cv_func_strerror_r_char_p = yes; then
 
+cat >>confdefs.h <<\_ACEOF
+#define STRERROR_R_CHAR_P 1
+_ACEOF
+
+fi
+
+
+  XGETTEXT_EXTRA_OPTIONS=
+
+
+  if test -z "$GETOPT_H"; then
+
+for ac_header in getopt.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -4693,41 +5542,136 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_stat_broken=no
+  ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_header_stat_broken=yes
+	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
-echo "${ECHO_T}$ac_cv_header_stat_broken" >&6; }
-if test $ac_cv_header_stat_broken = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STAT_MACROS_BROKEN 1
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
+else
+  GETOPT_H=getopt.h
 fi
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+done
+
+  fi
+
+  if test -z "$GETOPT_H"; then
+
+for ac_func in getopt_long_only
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4735,92 +5679,223 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
 
 int
 main ()
 {
-
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_header_stdc=no
+	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+else
+  GETOPT_H=getopt.h
+fi
+done
+
+  fi
+
+      if test -z "$GETOPT_H"; then
+    { $as_echo "$as_me:$LINENO: checking whether optreset is declared" >&5
+$as_echo_n "checking whether optreset is declared... " >&6; }
+if test "${ac_cv_have_decl_optreset+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <string.h>
+#include <getopt.h>
+
+int
+main ()
+{
+#ifndef optreset
+  (void) optreset;
+#endif
 
+  ;
+  return 0;
+}
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_optreset=yes
 else
-  ac_cv_header_stdc=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_optreset=no
 fi
-rm -f conftest*
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5
+$as_echo "$ac_cv_have_decl_optreset" >&6; }
+if test $ac_cv_have_decl_optreset = yes; then
+  GETOPT_H=getopt.h
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  fi
+
+      if test -z "$GETOPT_H"; then
+    { $as_echo "$as_me:$LINENO: checking for working GNU getopt function" >&5
+$as_echo_n "checking for working GNU getopt function... " >&6; }
+if test "${gl_cv_func_gnu_getopt+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  	 	 	 { $as_echo "$as_me:$LINENO: checking whether getopt_clip is declared" >&5
+$as_echo_n "checking whether getopt_clip is declared... " >&6; }
+if test "${ac_cv_have_decl_getopt_clip+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
+#include <getopt.h>
+
+int
+main ()
+{
+#ifndef getopt_clip
+  (void) getopt_clip;
+#endif
 
+  ;
+  return 0;
+}
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_getopt_clip=yes
 else
-  ac_cv_header_stdc=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_getopt_clip=no
 fi
-rm -f conftest*
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getopt_clip" >&5
+$as_echo "$ac_cv_have_decl_getopt_clip" >&6; }
+if test $ac_cv_have_decl_getopt_clip = yes; then
+  gl_cv_func_gnu_getopt=no
+else
+  gl_cv_func_gnu_getopt=yes
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4828,28 +5903,18 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+#include <getopt.h>
 int
 main ()
 {
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
+
+	     char *myargv[3];
+	     myargv[0] = "conftest";
+	     myargv[1] = "-+";
+	     myargv[2] = 0;
+	     return getopt (2, myargv, "+a") != '?';
+
+  ;
   return 0;
 }
 _ACEOF
@@ -4859,79 +5924,289 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  :
+  gl_cv_func_gnu_getopt=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-ac_cv_header_stdc=no
+gl_cv_func_gnu_getopt=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_gnu_getopt" >&5
+$as_echo "$gl_cv_func_gnu_getopt" >&6; }
+    if test "$gl_cv_func_gnu_getopt" = "no"; then
+      GETOPT_H=getopt.h
+    fi
+  fi
+
+
+      { $as_echo "$as_me:$LINENO: checking whether getenv is declared" >&5
+$as_echo_n "checking whether getenv is declared... " >&6; }
+if test "${ac_cv_have_decl_getenv+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef getenv
+  (void) getenv;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_getenv=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_getenv=no
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5
+$as_echo "$ac_cv_have_decl_getenv" >&6; }
+if test $ac_cv_have_decl_getenv = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETENV 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETENV 0
 _ACEOF
 
+
 fi
 
 
 
+{ $as_echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
+$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
+if test "${ac_cv_c_restrict+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_restrict=no
+   # The order here caters to the fact that C++ does not require restrict.
+   for ac_kw in __restrict __restrict__ _Restrict restrict; do
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+typedef int * int_ptr;
+	int foo (int_ptr $ac_kw ip) {
+	return ip[0];
+       }
+int
+main ()
+{
+int s[1];
+	int * $ac_kw t = s;
+	t[0] = 0;
+	return foo(t)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_restrict=$ac_kw
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     test "$ac_cv_c_restrict" != no && break
+   done
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5
+$as_echo "$ac_cv_c_restrict" >&6; }
 
 
+ case $ac_cv_c_restrict in
+   restrict) ;;
+   no) cat >>confdefs.h <<\_ACEOF
+#define restrict /**/
+_ACEOF
+ ;;
+   *)  cat >>confdefs.h <<_ACEOF
+#define restrict $ac_cv_c_restrict
+_ACEOF
+ ;;
+ esac
 
 
 
+  { $as_echo "$as_me:$LINENO: checking whether the preprocessor supports include_next" >&5
+$as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
+if test "${gl_cv_have_include_next+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  rm -rf conftestd1 conftestd2
+     mkdir conftestd1 conftestd2
+     cat <<EOF > conftestd1/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd2/conftest.h
+#ifndef DEFINED_IN_CONFTESTD1
+#error "include_next test doesn't work"
+#endif
+#define DEFINED_IN_CONFTESTD2
+EOF
+     save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2"
+     cat >conftest.$ac_ext <<_ACEOF
+#include <conftest.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  gl_cv_have_include_next=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	gl_cv_have_include_next=no
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CPPFLAGS="$save_CPPFLAGS"
+     rm -rf conftestd1 conftestd2
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_have_include_next" >&5
+$as_echo "$gl_cv_have_include_next" >&6; }
+  if test $gl_cv_have_include_next = yes; then
 
 
-for ac_header in fcntl.h io.h limits.h pwd.h string.h strings.h \
-  termcap.h termio.h termios.h unistd.h \
-  sys/fcntl.h sys/file.h sys/stream.h sys/time.h sys/ttold.h sys/wait.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_INCLUDE_NEXT 1
+_ACEOF
+
+
+    INCLUDE_NEXT=include_next
+  else
+    INCLUDE_NEXT=include
+  fi
+
+
+
+
+
+
+
+for ac_header in $gl_header_list
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4947,32 +6222,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4986,69 +6262,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -5056,28 +6340,92 @@ fi
 done
 
 
-# sys/ptem.h requires sys/stream.h for mblk_t on Solaris.
 
-for ac_header in sys/ptem.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_sys_time_h='<'sys/time.h'>'
+     else
+       { $as_echo "$as_me:$LINENO: checking absolute name of <sys/time.h>" >&5
+$as_echo_n "checking absolute name of <sys/time.h>... " >&6; }
+if test "${gl_cv_next_sys_time_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+
+	  if test $ac_cv_header_sys_time_h = yes; then
+	    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#if HAVE_SYS_STREAM_H
-#include <sys/stream.h>
-#endif
+#include <sys/time.h>
 
+_ACEOF
+	    	    	    	    gl_cv_next_sys_time_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+	       sed -n '\#/sys/time.h#{
+		 s#.*"\(.*/sys/time.h\)".*#\1#
+		 s#^/[^/]#//&#
+		 p
+		 q
+	       }'`'"'
+	  else
+	    gl_cv_next_sys_time_h='<'sys/time.h'>'
+	  fi
 
-#include <$ac_header>
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_sys_time_h" >&5
+$as_echo "$gl_cv_next_sys_time_h" >&6; }
+     fi
+     NEXT_SYS_TIME_H=$gl_cv_next_sys_time_h
+
+
+
+
+  if test $ac_cv_header_sys_time_h = yes; then
+    HAVE_SYS_TIME_H=1
+  else
+    HAVE_SYS_TIME_H=0
+  fi
+
+
+  { $as_echo "$as_me:$LINENO: checking for struct timeval" >&5
+$as_echo_n "checking for struct timeval... " >&6; }
+if test "${gl_cv_sys_struct_timeval+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if HAVE_SYS_TIME_H
+	     #include <sys/time.h>
+	    #endif
+	    #include <time.h>
+
+int
+main ()
+{
+static struct timeval x; x.tv_sec = x.tv_usec;
+  ;
+  return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -5085,44 +6433,61 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
+  gl_cv_sys_struct_timeval=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_Header=no"
+	gl_cv_sys_struct_timeval=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_sys_struct_timeval" >&5
+$as_echo "$gl_cv_sys_struct_timeval" >&6; }
+  if test $gl_cv_sys_struct_timeval = yes; then
+    HAVE_STRUCT_TIMEVAL=1
+  else
+    HAVE_STRUCT_TIMEVAL=0
+  fi
 
-fi
 
-done
+    REPLACE_GETTIMEOFDAY=0
+
+  if test $HAVE_SYS_TIME_H = 0 || test $HAVE_STRUCT_TIMEVAL = 0; then
+    SYS_TIME_H=sys/time.h
+  else
+    SYS_TIME_H=
+  fi
 
 
-{ echo "$as_me:$LINENO: checking POSIX termios" >&5
-echo $ECHO_N "checking POSIX termios... $ECHO_C" >&6; }
-if test "${ac_cv_sys_posix_termios+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+
+
+
+for ac_func in $gl_func_list
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5130,15 +6495,41 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <unistd.h>
-#include <termios.h>
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
 
 int
 main ()
 {
-/* SunOS 4.0.3 has termios.h but not the library calls.  */
-   tcgetattr(0, 0);
+return $ac_func ();
   ;
   return 0;
 }
@@ -5149,67 +6540,126 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_sys_posix_termios=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_sys_posix_termios=no
+	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_posix_termios" >&5
-echo "${ECHO_T}$ac_cv_sys_posix_termios" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
-{ echo "$as_me:$LINENO: checking whether termios.h defines TIOCGWINSZ" >&5
-echo $ECHO_N "checking whether termios.h defines TIOCGWINSZ... $ECHO_C" >&6; }
-if test "${ac_cv_sys_tiocgwinsz_in_termios_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+done
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if test "${ac_cv_c_inline+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <termios.h>
-#ifdef TIOCGWINSZ
-  yes
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-  ac_cv_sys_tiocgwinsz_in_termios_h=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_inline=$ac_kw
 else
-  ac_cv_sys_tiocgwinsz_in_termios_h=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f conftest*
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
+done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5
-echo "${ECHO_T}$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
-if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then
-  { echo "$as_me:$LINENO: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
-echo $ECHO_N "checking whether sys/ioctl.h defines TIOCGWINSZ... $ECHO_C" >&6; }
-if test "${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+case $ac_cv_c_inline in
+  inline | yes) ;;
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
+esac
+
+
+  { $as_echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
+$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+if test "${am_cv_langinfo_codeset+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5217,40 +6667,64 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#ifdef TIOCGWINSZ
-  yes
-#endif
-
+#include <langinfo.h>
+int
+main ()
+{
+char* cs = nl_langinfo(CODESET); return !cs;
+  ;
+  return 0;
+}
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-  ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  am_cv_langinfo_codeset=yes
 else
-  ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no
-fi
-rm -f conftest*
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	am_cv_langinfo_codeset=no
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5
-echo "${ECHO_T}$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6; }
 
-  if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
+$as_echo "$am_cv_langinfo_codeset" >&6; }
+  if test $am_cv_langinfo_codeset = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define GWINSZ_IN_SYS_IOCTL 1
+#define HAVE_LANGINFO_CODESET 1
 _ACEOF
 
   fi
-fi
 
 
-# Checks for typedefs, structures, and compiler characteristics.
-{ echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      { $as_echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
+$as_echo_n "checking whether getc_unlocked is declared... " >&6; }
+if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5259,14 +6733,13 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef off_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+#ifndef getc_unlocked
+  (void) getc_unlocked;
+#endif
+
   ;
   return 0;
 }
@@ -5277,43 +6750,135 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_off_t=yes
+  ac_cv_have_decl_getc_unlocked=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_off_t=no
+	ac_cv_have_decl_getc_unlocked=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-if test $ac_cv_type_off_t = yes; then
-  :
-else
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
+$as_echo "$ac_cv_have_decl_getc_unlocked" >&6; }
+if test $ac_cv_have_decl_getc_unlocked = yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define off_t long int
+#define HAVE_DECL_GETC_UNLOCKED 1
 _ACEOF
 
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED 0
+_ACEOF
+
+
 fi
 
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+    { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
+$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
+if test "${ac_cv_gnu_library_2_1+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5321,13 +6886,53 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
+
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Lucky GNU user" >/dev/null 2>&1; then
+  ac_cv_gnu_library_2_1=yes
+else
+  ac_cv_gnu_library_2_1=no
+fi
+rm -f conftest*
+
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
+$as_echo "$ac_cv_gnu_library_2_1" >&6; }
+
+    GLIBC21="$ac_cv_gnu_library_2_1"
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether malloc, realloc, calloc are POSIX compliant" >&5
+$as_echo_n "checking whether malloc, realloc, calloc are POSIX compliant... " >&6; }
+if test "${gl_cv_func_malloc_posix+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+                        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
 int
 main ()
 {
-return *(signal (0, 0)) (0) == 1;
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+         choke me
+         #endif
+
   ;
   return 0;
 }
@@ -5338,39 +6943,214 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_signal=int
+  gl_cv_func_malloc_posix=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_signal=void
+	gl_cv_func_malloc_posix=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_malloc_posix" >&5
+$as_echo "$gl_cv_func_malloc_posix" >&6; }
+
+
+  GNULIB_MALLOC_POSIX=0;
+  GNULIB_REALLOC_POSIX=0;
+  GNULIB_CALLOC_POSIX=0;
+  GNULIB_GETSUBOPT=0;
+  GNULIB_MKDTEMP=0;
+  GNULIB_MKSTEMP=0;
+  GNULIB_PUTENV=0;
+  GNULIB_SETENV=0;
+  GNULIB_STRTOD=0;
+  GNULIB_UNSETENV=0;
+    HAVE_CALLOC_POSIX=1;
+  HAVE_GETSUBOPT=1;
+  HAVE_MALLOC_POSIX=1;
+  HAVE_MKDTEMP=1;
+  HAVE_REALLOC_POSIX=1;
+  HAVE_SETENV=1;
+  HAVE_STRTOD=1;
+  HAVE_UNSETENV=1;
+  REPLACE_MKSTEMP=0;
+  REPLACE_PUTENV=0;
+  REPLACE_STRTOD=0;
+  VOID_UNSETENV=0;
+
+
+
+for ac_header in stdlib.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
 _ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_func_malloc_0_nonnull=no
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5378,105 +7158,230 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *malloc ();
+#endif
 
 int
 main ()
 {
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset cs;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
+return ! malloc (0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_malloc_0_nonnull=yes
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
+( exit $ac_status )
+ac_cv_func_malloc_0_nonnull=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+if test $ac_cv_func_malloc_0_nonnull = yes; then
+  gl_cv_func_malloc_0_nonnull=1
+else
+  gl_cv_func_malloc_0_nonnull=0
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull
+_ACEOF
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for long long int" >&5
+$as_echo_n "checking for long long int... " >&6; }
+if test "${ac_cv_type_long_long_int+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 
+  /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* For now, do not test the preprocessor; as of 2007 there are too many
+	 implementations with broken preprocessors.  Perhaps this can
+	 be revisited in 2012.  In the meantime, code should not expect
+	 #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+		     ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+		     ? 1 : -1)];
+      int i = 63;
+int
+main ()
+{
+/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+	      | (llmax / ll) | (llmax % ll)
+	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+	      | (ullmax / ull) | (ullmax % ull));
   ;
   return 0;
 }
+
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_const=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  			if test "$cross_compiling" = yes; then
+  ac_cv_type_long_long_int=yes
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
+	       #ifndef LLONG_MAX
+	       # define HALF \
+			(1LL << (sizeof (long long int) * CHAR_BIT - 2))
+	       # define LLONG_MAX (HALF - 1 + HALF)
+	       #endif
+int
+main ()
+{
+long long int n = 1;
+	       int i;
+	       for (i = 0; ; i++)
+		 {
+		   long long int m = n << i;
+		   if (m >> i != n)
+		     return 1;
+		   if (LLONG_MAX / 2 < m)
+		     break;
+		 }
+	       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_long_long_int=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_c_const=no
+( exit $ac_status )
+ac_cv_type_long_long_int=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_long_long_int=no
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
+$as_echo "$ac_cv_type_long_long_int" >&6; }
+  if test $ac_cv_type_long_long_int = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define HAVE_LONG_LONG_INT 1
 _ACEOF
 
-fi
+  fi
 
-{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+    { $as_echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
+$as_echo_n "checking whether mbrtowc and mbstate_t are properly declared... " >&6; }
+if test "${gl_cv_func_mbrtowc+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5484,142 +7389,316 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <time.h>
-
+#include <wchar.h>
 int
 main ()
 {
-struct tm tm;
-				     int *p = &tm.tm_sec;
- 				     return !p;
+wchar_t wc;
+              char const s[] = "";
+              size_t n = 1;
+              mbstate_t state;
+              return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_struct_tm=time.h
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  gl_cv_func_mbrtowc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_struct_tm=sys/time.h
+	gl_cv_func_mbrtowc=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc" >&5
+$as_echo "$gl_cv_func_mbrtowc" >&6; }
+  if test $gl_cv_func_mbrtowc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
+#define HAVE_MBRTOWC 1
 _ACEOF
 
+  fi
+
+
+  GNULIB_MEMMEM=0;
+  GNULIB_MEMPCPY=0;
+  GNULIB_MEMRCHR=0;
+  GNULIB_STPCPY=0;
+  GNULIB_STPNCPY=0;
+  GNULIB_STRCHRNUL=0;
+  GNULIB_STRDUP=0;
+  GNULIB_STRNDUP=0;
+  GNULIB_STRNLEN=0;
+  GNULIB_STRPBRK=0;
+  GNULIB_STRSEP=0;
+  GNULIB_STRSTR=0;
+  GNULIB_STRCASESTR=0;
+  GNULIB_STRTOK_R=0;
+  GNULIB_MBSLEN=0;
+  GNULIB_MBSNLEN=0;
+  GNULIB_MBSCHR=0;
+  GNULIB_MBSRCHR=0;
+  GNULIB_MBSSTR=0;
+  GNULIB_MBSCASECMP=0;
+  GNULIB_MBSNCASECMP=0;
+  GNULIB_MBSPCASECMP=0;
+  GNULIB_MBSCASESTR=0;
+  GNULIB_MBSCSPN=0;
+  GNULIB_MBSPBRK=0;
+  GNULIB_MBSSPN=0;
+  GNULIB_MBSSEP=0;
+  GNULIB_MBSTOK_R=0;
+  GNULIB_STRERROR=0;
+  GNULIB_STRSIGNAL=0;
+    HAVE_DECL_MEMMEM=1;
+  HAVE_MEMPCPY=1;
+  HAVE_DECL_MEMRCHR=1;
+  HAVE_STPCPY=1;
+  HAVE_STPNCPY=1;
+  HAVE_STRCHRNUL=1;
+  HAVE_DECL_STRDUP=1;
+  HAVE_STRNDUP=1;
+  HAVE_DECL_STRNDUP=1;
+  HAVE_DECL_STRNLEN=1;
+  HAVE_STRPBRK=1;
+  HAVE_STRSEP=1;
+  HAVE_STRCASESTR=1;
+  HAVE_DECL_STRTOK_R=1;
+  HAVE_DECL_STRERROR=1;
+  HAVE_DECL_STRSIGNAL=1;
+  REPLACE_STRERROR=0;
+  REPLACE_STRSIGNAL=0;
+  REPLACE_MEMMEM=0;
+  REPLACE_STRCASESTR=0;
+  REPLACE_STRSTR=0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then
+  enableval=$enable_largefile;
 fi
 
+if test "$enable_largefile" != no; then
 
-# Checks for function declarations.
-{ echo "$as_me:$LINENO: checking whether memchr is declared" >&5
-echo $ECHO_N "checking whether memchr is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_memchr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if test "${ac_cv_sys_largefile_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
 int
 main ()
 {
-#ifndef memchr
-  (void) memchr;
-#endif
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
+	 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_memchr=yes
+  break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_have_decl_memchr=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_memchr" >&5
-echo "${ECHO_T}$ac_cv_have_decl_memchr" >&6; }
-if test $ac_cv_have_decl_memchr = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MEMCHR 1
-_ACEOF
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_largefile_CC=' -n32'; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 
+fi
 
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MEMCHR 0
+  while :; do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_file_offset_bits=no; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
-{ echo "$as_me:$LINENO: checking whether strcoll is declared" >&5
-echo $ECHO_N "checking whether strcoll is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_strcoll+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
 int
 main ()
 {
-#ifndef strcoll
-  (void) strcoll;
-#endif
 
   ;
   return 0;
@@ -5631,61 +7710,118 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_strcoll=yes
+  ac_cv_sys_file_offset_bits=64; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_have_decl_strcoll=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strcoll" >&5
-echo "${ECHO_T}$ac_cv_have_decl_strcoll" >&6; }
-if test $ac_cv_have_decl_strcoll = yes; then
-
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRCOLL 1
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 _ACEOF
-
-
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test "${ac_cv_sys_large_files+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRCOLL 0
+  while :; do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_large_files=no; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
-{ echo "$as_me:$LINENO: checking whether strerror is declared" >&5
-echo $ECHO_N "checking whether strerror is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
 int
 main ()
 {
-#ifndef strerror
-  (void) strerror;
-#endif
 
   ;
   return 0;
@@ -5697,53 +7833,61 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_strerror=yes
+  ac_cv_sys_large_files=1; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_have_decl_strerror=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror" >&5
-echo "${ECHO_T}$ac_cv_have_decl_strerror" >&6; }
-if test $ac_cv_have_decl_strerror = yes; then
-
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRERROR 1
+#define _LARGE_FILES $ac_cv_sys_large_files
 _ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+fi
 
 
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRERROR 0
-_ACEOF
 
 
-fi
 
 
 
-# Checks for library functions.
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+if test "${ac_cv_header_stdbool_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5751,183 +7895,324 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <alloca.h>
+
+	  #include <stdbool.h>
+	  #ifndef bool
+	   "error: bool is not defined"
+	  #endif
+	  #ifndef false
+	   "error: false is not defined"
+	  #endif
+	  #if false
+	   "error: false is not 0"
+	  #endif
+	  #ifndef true
+	   "error: true is not defined"
+	  #endif
+	  #if true != 1
+	   "error: true is not 1"
+	  #endif
+	  #ifndef __bool_true_false_are_defined
+	   "error: __bool_true_false_are_defined is not defined"
+	  #endif
+
+	  struct s { _Bool s: 1; _Bool t; } s;
+
+	  char a[true == 1 ? 1 : -1];
+	  char b[false == 0 ? 1 : -1];
+	  char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+	  char d[(bool) 0.5 == true ? 1 : -1];
+	  bool e = &s;
+	  char f[(_Bool) 0.0 == false ? 1 : -1];
+	  char g[true];
+	  char h[sizeof (_Bool)];
+	  char i[sizeof s.t];
+	  enum { j = false, k = true, l = false * true, m = true * 256 };
+	  _Bool n[m];
+	  char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+	  char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+	  #if defined __xlc__ || defined __GNUC__
+	   /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+	      reported by James Lemley on 2005-10-05; see
+	      http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+	      This test is not quite right, since xlc is allowed to
+	      reject this program, as the initializer for xlcbug is
+	      not one of the forms that C requires support for.
+	      However, doing the test right would require a run-time
+	      test, and that would make cross-compilation harder.
+	      Let us hope that IBM fixes the xlc bug, and also adds
+	      support for this kind of constant expression.  In the
+	      meantime, this test will reject xlc, which is OK, since
+	      our stdbool.h substitute should suffice.  We also test
+	      this with GCC, where it should work, to detect more
+	      quickly whether someone messes up the test in the
+	      future.  */
+	   char digs[] = "0123456789";
+	   int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+	  #endif
+	  /* Catch a bug in an HP-UX C compiler.  See
+	     http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+	     http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+	   */
+	  _Bool q = true;
+	  _Bool *pq = &q;
+
 int
 main ()
 {
-char *p = (char *) alloca (2 * sizeof (int));
-			  if (p) return 0;
+
+	  *pq |= q;
+	  *pq |= ! q;
+	  /* Refer to every declared value, to avoid compiler optimizations.  */
+	  return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+		  + !m + !n + !o + !p + !q + !pq);
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_working_alloca_h=yes
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_stdbool_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_working_alloca_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+	ac_cv_header_stdbool_h=no
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
-{ echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
+$as_echo "$ac_cv_header_stdbool_h" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for _Bool" >&5
+$as_echo_n "checking for _Bool... " >&6; }
+if test "${ac_cv_type__Bool+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
+  ac_cv_type__Bool=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (_Bool))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
+$ac_includes_default
 int
 main ()
 {
-char *p = (char *) alloca (1);
-				    if (p) return 0;
+if (sizeof ((_Bool)))
+	  return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_alloca_works=yes
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_func_alloca_works=no
+	ac_cv_type__Bool=yes
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
 
-if test $ac_cv_func_alloca_works = yes; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
+$as_echo "$ac_cv_type__Bool" >&6; }
+if test $ac_cv_type__Bool = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
+cat >>confdefs.h <<_ACEOF
+#define HAVE__BOOL 1
 _ACEOF
 
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
 
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+fi
+
+   if test $ac_cv_header_stdbool_h = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
+#define HAVE_STDBOOL_H 1
 _ACEOF
 
+   fi
 
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:$LINENO: checking for unsigned long long int" >&5
+$as_echo_n "checking for unsigned long long int... " >&6; }
+if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+
+  /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
+/* For now, do not test the preprocessor; as of 2007 there are too many
+	 implementations with broken preprocessors.  Perhaps this can
+	 be revisited in 2012.  In the meantime, code should not expect
+	 #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+		     ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+		     ? 1 : -1)];
+      int i = 63;
+int
+main ()
+{
+/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+	      | (llmax / ll) | (llmax % ll)
+	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+	      | (ullmax / ull) | (ullmax % ull));
+  ;
+  return 0;
+}
 
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
-  ac_cv_os_cray=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_type_unsigned_long_long_int=yes
 else
-  ac_cv_os_cray=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_unsigned_long_long_int=no
 fi
-rm -f conftest*
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
+$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UNSIGNED_LONG_LONG_INT 1
+_ACEOF
+
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      { $as_echo "$as_me:$LINENO: checking whether strdup is declared" >&5
+$as_echo_n "checking whether strdup is declared... " >&6; }
+if test "${ac_cv_have_decl_strdup+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5935,122 +8220,131 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
+$ac_includes_default
 int
 main ()
 {
-return $ac_func ();
+#ifndef strdup
+  (void) strdup;
+#endif
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_strdup=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_var=no"
+	ac_cv_have_decl_strdup=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_strdup" >&5
+$as_echo "$ac_cv_have_decl_strdup" >&6; }
+if test $ac_cv_have_decl_strdup = yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
+#define HAVE_DECL_STRDUP 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRDUP 0
 _ACEOF
 
-    break
-fi
 
-  done
 fi
 
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for working strerror function" >&5
+$as_echo_n "checking for working strerror function... " >&6; }
+if test "${gl_cv_func_working_strerror+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat >conftest.$ac_ext <<_ACEOF
+         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#include <string.h>
+
 int
-find_stack_direction ()
+main ()
 {
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
+return !*strerror (-2);
+  ;
+  return 0;
 }
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  gl_cv_func_working_strerror=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_func_working_strerror=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
 
 int
 main ()
 {
-  return find_stack_direction () < 0;
+return !*strerror (-2);
+  ;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -6059,51 +8353,46 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_c_stack_direction=1
+  gl_cv_func_working_strerror=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-ac_cv_c_stack_direction=-1
+gl_cv_func_working_strerror=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_working_strerror" >&5
+$as_echo "$gl_cv_func_working_strerror" >&6; }
+  if test $gl_cv_func_working_strerror = no ; then
+    REPLACE_STRERROR=1
 
-{ echo "$as_me:$LINENO: checking for working strcoll" >&5
-echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6; }
-if test "${ac_cv_func_strcoll_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_strcoll_works=no
+  { $as_echo "$as_me:$LINENO: checking whether strerror is declared" >&5
+$as_echo_n "checking whether strerror is declared... " >&6; }
+if test "${ac_cv_have_decl_strerror+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6115,65 +8404,132 @@ $ac_includes_default
 int
 main ()
 {
-return (strcoll ("abc", "def") >= 0 ||
-	 strcoll ("ABC", "DEF") >= 0 ||
-	 strcoll ("123", "456") >= 0)
+#ifndef strerror
+  (void) strerror;
+#endif
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_strcoll_works=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_strerror=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-ac_cv_func_strcoll_works=no
+	ac_cv_have_decl_strerror=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror" >&5
+$as_echo "$ac_cv_have_decl_strerror" >&6; }
+if test $ac_cv_have_decl_strerror = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR 0
+_ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
-echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6; }
-if test $ac_cv_func_strcoll_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRCOLL 1
+
+
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_string_h='<'string.h'>'
+     else
+       { $as_echo "$as_me:$LINENO: checking absolute name of <string.h>" >&5
+$as_echo_n "checking absolute name of <string.h>... " >&6; }
+if test "${gl_cv_next_string_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+	  if test $ac_cv_header_string_h = yes; then
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
 _ACEOF
+	    	    	    	    gl_cv_next_string_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+	       sed -n '\#/string.h#{
+		 s#.*"\(.*/string.h\)".*#\1#
+		 s#^/[^/]#//&#
+		 p
+		 q
+	       }'`'"'
+	  else
+	    gl_cv_next_string_h='<'string.h'>'
+	  fi
 
 fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_string_h" >&5
+$as_echo "$gl_cv_next_string_h" >&6; }
+     fi
+     NEXT_STRING_H=$gl_cv_next_string_h
 
 
-for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
+$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+if test "${ac_cv_header_stat_broken+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6181,86 +8537,162 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+#include <sys/types.h>
+#include <sys/stat.h>
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
+#if defined S_ISBLK && defined S_IFDIR
+extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
 #endif
 
-#undef $ac_func
+#if defined S_ISBLK && defined S_IFCHR
+extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
+#endif
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
+#if defined S_ISLNK && defined S_IFREG
+extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
 #endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
+
+#if defined S_ISSOCK && defined S_IFREG
+extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
 #endif
 
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_stat_broken=no
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_stat_broken=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
+$as_echo "$ac_cv_header_stat_broken" >&6; }
+if test $ac_cv_header_stat_broken = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STAT_MACROS_BROKEN 1
+_ACEOF
+
+fi
+
+
+
+
+
+
+
+
+  GNULIB_WCWIDTH=0;
+    HAVE_DECL_WCWIDTH=1;
+  REPLACE_WCWIDTH=0;
+  WCHAR_H=
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for wint_t" >&5
+$as_echo_n "checking for wint_t... " >&6; }
+if test "${gt_cv_c_wint_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+       wint_t foo = (wchar_t)'\0';
 int
 main ()
 {
-return $ac_func ();
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
+       } && test -s conftest.$ac_objext; then
+  gt_cv_c_wint_t=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_var=no"
+	gt_cv_c_wint_t=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
+$as_echo "$gt_cv_c_wint_t" >&6; }
+  if test $gt_cv_c_wint_t = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WINT_T 1
 _ACEOF
 
-{ echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
-if test "${ac_cv_func__doprnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  fi
+
+
+  { $as_echo "$as_me:$LINENO: checking for wchar_t" >&5
+$as_echo_n "checking for wchar_t... " >&6; }
+if test "${gt_cv_c_wchar_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6268,107 +8700,145 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _doprnt innocuous__doprnt
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _doprnt
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _doprnt ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub__doprnt || defined __stub____doprnt
-choke me
-#endif
-
+#include <stddef.h>
+       wchar_t foo = (wchar_t)'\0';
 int
 main ()
 {
-return _doprnt ();
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func__doprnt=yes
+       } && test -s conftest.$ac_objext; then
+  gt_cv_c_wchar_t=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_func__doprnt=no
+	gt_cv_c_wchar_t=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
-if test $ac_cv_func__doprnt = yes; then
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
+$as_echo "$gt_cv_c_wchar_t" >&6; }
+  if test $gt_cv_c_wchar_t = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
+#define HAVE_WCHAR_T 1
 _ACEOF
 
-fi
+  fi
+
+
+
+
+
 
+
+
+   if false; then
+  GL_COND_LIBTOOL_TRUE=
+  GL_COND_LIBTOOL_FALSE='#'
+else
+  GL_COND_LIBTOOL_TRUE='#'
+  GL_COND_LIBTOOL_FALSE=
 fi
-done
 
+  gl_cond_libtool=false
+  gl_libdeps=
+  gl_ltlibdeps=
 
-# in theory only pre-sysvr3 systems needed this and it's not likely
-# that anyone compiling new texinfo still has such a thing? we'll see.
-# AC_FUNC_SETVBUF_REVERSED
 
 
 
 
 
+  gl_source_base='gnulib/lib'
 
 
 
-for ac_func in bzero getcwd memset setvbuf sigaction sigprocmask \
-               sigsetmask strchr
+
+
+  if test $ac_cv_func_alloca_works = no; then
+    :
+  fi
+
+  # Define an additional variable used in the Makefile substitution.
+  if test $ac_cv_working_alloca_h = yes; then
+    { $as_echo "$as_me:$LINENO: checking for alloca as a compiler built-in" >&5
+$as_echo_n "checking for alloca as a compiler built-in... " >&6; }
+if test "${gl_cv_rpl_alloca+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#if defined __GNUC__ || defined _AIX || defined _MSC_VER
+        Need own alloca
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Need own alloca" >/dev/null 2>&1; then
+  gl_cv_rpl_alloca=yes
+else
+  gl_cv_rpl_alloca=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_rpl_alloca" >&5
+$as_echo "$gl_cv_rpl_alloca" >&6; }
+    if test $gl_cv_rpl_alloca = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA 1
+_ACEOF
+
+      ALLOCA_H=alloca.h
+    else
+                  ALLOCA_H=
+    fi
+  else
+    ALLOCA_H=alloca.h
+  fi
+
+
+  :
+
+
+for ac_header in argz.h
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6376,96 +8846,190 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
+$ac_includes_default
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+	eval "$as_ac_Header=no"
+fi
 
-#undef $ac_func
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
+fi
+
+done
+
+
+{ $as_echo "$as_me:$LINENO: checking for error_t" >&5
+$as_echo_n "checking for error_t... " >&6; }
+if test "${ac_cv_type_error_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_error_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if defined(HAVE_ARGZ_H)
+#  include <argz.h>
 #endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
+
+int
+main ()
+{
+if (sizeof (error_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if defined(HAVE_ARGZ_H)
+#  include <argz.h>
 #endif
 
 int
 main ()
 {
-return $ac_func ();
+if (sizeof ((error_t)))
+	  return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_var=no"
+	ac_cv_type_error_t=yes
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5
+$as_echo "$ac_cv_type_error_t" >&6; }
+if test $ac_cv_type_error_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ERROR_T 1
+_ACEOF
+
+
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define error_t int
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define __error_t_defined 1
 _ACEOF
 
 fi
-done
 
 
+ARGZ_H=
 
 
 
-for ac_func in memcpy memmove strdup strerror
+
+
+
+
+for ac_func in argz_add argz_append argz_count argz_create_sep argz_insert \
+	argz_next argz_stringify
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6518,169 +9082,205 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  case " $LIBOBJS " in
-  *" $ac_func.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
- ;;
-esac
+  ARGZ_H=argz.h;
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS argz.$ac_objext"
 
 fi
 done
 
 
+if test -z "$ARGZ_H"; then
+  { $as_echo "$as_me:$LINENO: checking if argz actually works" >&5
+$as_echo_n "checking if argz actually works... " >&6; }
+if test "${lt_cv_sys_argz_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $host_os in #(
+	 *cygwin*)
+	   lt_cv_sys_argz_works=no
+	   if test "$cross_compiling" != no; then
+	     lt_cv_sys_argz_works="guessing no"
+	   else
+	     lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
+	     save_IFS=$IFS
+	     IFS=-.
+	     set x `uname -r | sed -e "$lt_sed_extract_leading_digits"`
+	     IFS=$save_IFS
+	     lt_os_major=${2-0}
+	     lt_os_minor=${3-0}
+	     lt_os_micro=${4-0}
+	     if test "$lt_os_major" -gt 1 \
+		|| { test "$lt_os_major" -eq 1 \
+		  && { test "$lt_os_minor" -gt 5 \
+		    || { test "$lt_os_minor" -eq 5 \
+		      && test "$lt_os_micro" -gt 24; }; }; }; then
+	       lt_cv_sys_argz_works=yes
+	     fi
+	   fi
+	   ;; #(
+	 *) lt_cv_sys_argz_works=yes ;;
+	 esac
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_sys_argz_works" >&5
+$as_echo "$lt_cv_sys_argz_works" >&6; }
+     if test $lt_cv_sys_argz_works = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WORKING_ARGZ 1
+_ACEOF
+
+else
+  ARGZ_H=argz.h
+
 
-# strcasecmp and strncasecmp, gnulib-style.
 
 
 
-for ac_func in strcasecmp
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+  gl_LIBOBJS="$gl_LIBOBJS argz.$ac_objext"
+
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking if environ is properly declared" >&5
+$as_echo_n "checking if environ is properly declared... " >&6; }
+  if test "${gt_cv_var_environ_declaration+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
+#include <unistd.h>
+      extern struct { int foo; } environ;
 int
 main ()
 {
-return $ac_func ();
+environ.foo = 1;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
+       } && test -s conftest.$ac_objext; then
+  gt_cv_var_environ_declaration=no
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_var=no"
+	gt_cv_var_environ_declaration=yes
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+
+  { $as_echo "$as_me:$LINENO: result: $gt_cv_var_environ_declaration" >&5
+$as_echo "$gt_cv_var_environ_declaration" >&6; }
+  if test $gt_cv_var_environ_declaration = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ENVIRON_DECL 1
 _ACEOF
 
-else
-  case " $LIBOBJS " in
-  *" $ac_func.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
- ;;
-esac
+  fi
 
-fi
-done
 
+  if test $gt_cv_var_environ_declaration != yes; then
+    HAVE_DECL_ENVIRON=0
+  fi
 
-  if test $ac_cv_func_strcasecmp = no; then
 
-  :
 
-  fi
+  GNULIB_ENVIRON=1
 
 
 
-for ac_func in strncasecmp
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for error_at_line" >&5
+$as_echo_n "checking for error_at_line... " >&6; }
+if test "${ac_cv_lib_error_at_line+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6688,41 +9288,11 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
+#include <error.h>
 int
 main ()
 {
-return $ac_func ();
+error_at_line (0, 0, "", 0, "an error occurred");
   ;
   return 0;
 }
@@ -6733,343 +9303,299 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_error_at_line=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_var=no"
+	ac_cv_lib_error_at_line=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_error_at_line" >&5
+$as_echo "$ac_cv_lib_error_at_line" >&6; }
+if test $ac_cv_lib_error_at_line = no; then
 
-else
-  case " $LIBOBJS " in
-  *" $ac_func.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
- ;;
-esac
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS error.$ac_objext"
 
 fi
-done
 
 
-  if test $ac_cv_func_strncasecmp = no; then
 
   :
 
-  fi
 
 
 
-# We want to recognize djgpp to avoid the useless warning about no
-# term library.
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error:3:c-format"
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
 
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error_at_line:5:c-format"
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS exitfail.$ac_objext"
+
+
+    :
+
+
+
+  if test -n "$GETOPT_H"; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext"
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
+
+
+  GETOPT_H=getopt.h
+
+cat >>confdefs.h <<\_ACEOF
+#define __GETOPT_PREFIX rpl_
+_ACEOF
+
+
+
+
+
+  :
+
 
 
 
-# We need to run some of our own binaries, most notably makedoc, but as
-# long as we have this process, we also use our own makeinfo and
-# install-info.
-#
-# This means that if we are cross compiling, we have to configure the
-# package twice: once with the native compiler (this is done in a
-# subdirectory $native_tools), and once with the cross compiler.
-# The former is invoked automatically here, with --host=$build.
-# $native_tools is also added to SUBDIRS in the main Makefile.am,
-# so that make compiles the native tools first.
-#
-if test "$cross_compiling" = no; then
-  native_tools=
-else
-  native_tools=tools
-  test -d "$native_tools" || mkdir "$native_tools"
-  confdir=`(cd "$srcdir";pwd)`
-  # Make sure the secondary configure won't fail with
-  # "error: source directory already configured".
-  rm -f config.status
-  { echo "$as_me:$LINENO: Doing configure of native tools (${build})." >&5
-echo "$as_me: Doing configure of native tools (${build})." >&6;}
-  cd "$native_tools" || exit 1
-  # Run secondary configure in alternate environment or
-  # it gets the wrong CC etc.  env -i gives this build host configure
-  # a clean environment.
-  env -i CC="${BUILD_CC}" AR="${BUILD_AR}" RANLIB="${BUILD_RANLIB}" \
-      PATH="${PATH}" \
-      tools_only=1 \
-    ${confdir}/configure --build=${build} --host=${build} \
-                         --disable-rpath --disable-nls
-  cd .. || exit 1
-  { echo "$as_me:$LINENO: Continuing with main configure (${host})." >&5
-echo "$as_me: Continuing with main configure (${host})." >&6;}
-fi
 
 
 
-if test "x$tools_only" = x1; then
-  TOOLS_ONLY_TRUE=
-  TOOLS_ONLY_FALSE='#'
-else
-  TOOLS_ONLY_TRUE='#'
-  TOOLS_ONLY_FALSE=
 fi
 
 
-# Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but
-# rather ncurses.  So we check for it.
-TERMLIBS=
-# Check for termlib before termcap because Solaris termcap needs libucb.
-TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo"
-for termlib in ${TERMLIB_VARIANTS}; do
-  as_ac_Lib=`echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
-echo $ECHO_N "checking for tgetent in -l${termlib}... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for gettimeofday with POSIX signature" >&5
+$as_echo_n "checking for gettimeofday with POSIX signature... " >&6; }
+if test "${gl_cv_func_gettimeofday_posix_signature+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l${termlib}  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <sys/time.h>
+	    struct timeval c;
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char tgetent ();
 int
 main ()
 {
-return tgetent ();
+
+	    int (*f) (struct timeval *restrict, void *restrict) = gettimeofday;
+	    int x = f (&c, 0);
+	    return !(x | c.tv_sec | c.tv_usec);
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_Lib=yes"
+       } && test -s conftest.$ac_objext; then
+  gl_cv_func_gettimeofday_posix_signature=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_Lib=no"
+	gl_cv_func_gettimeofday_posix_signature=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-  TERMLIBS="${TERMLIBS} -l${termlib}"; break
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_gettimeofday_posix_signature" >&5
+$as_echo "$gl_cv_func_gettimeofday_posix_signature" >&6; }
 
-done
-# don't bother warning on djgpp, it doesn't have a term library, it
-# ports each termcap-needing program separately according to its needs.
-if test -z "$TERMLIBS" && echo "$build" | grep -v djgpp >/dev/null; then
-  { echo "$as_me:$LINENO: WARNING: probably need a terminal library, one of: ${TERMLIB_VARIANTS}" >&5
-echo "$as_me: WARNING: probably need a terminal library, one of: ${TERMLIB_VARIANTS}" >&2;}
-fi
 
-# Checks for variables.
-# HP-UX 9 (at least) needs -lncurses which defines termcap variables PC etc.
-{ echo "$as_me:$LINENO: checking for library with termcap variables" >&5
-echo $ECHO_N "checking for library with termcap variables... $ECHO_C" >&6; }
-if test "${ac_cv_var_ospeed+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+ { $as_echo "$as_me:$LINENO: checking whether gettimeofday clobbers localtime buffer" >&5
+$as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; }
+if test "${gl_cv_func_gettimeofday_clobber+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  oldLIBS=$LIBS
-for trylib in $termlib ${TERMLIB_VARIANTS}; do
-   if test "x$trylib" != "x$termlib"; then
-     LIBS="$oldLIBS -l$termlib -l$trylib"
-   else
-     LIBS="$oldLIBS -l$termlib"
-   fi
-   cat >conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then
+       gl_cv_func_gettimeofday_clobber=yes
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <string.h>
+	  #include <sys/time.h>
+	  #include <time.h>
+	  #include <stdlib.h>
 
 int
 main ()
 {
-#ifdef HAVE_NCURSES_TERMCAP_H
-#include <ncurses/termcap.h>
-#else
-#ifdef HAVE_TERMCAP_H
-#include <termcap.h>
-#else
-#undef PC
-char *BC;
-char **UP;
-char PC;
-short ospeed;
-#endif
-#endif
-/* Make sure all variables actually exist.  AIX 4.3 has ospeed but no BC.
-   --Andreas Ley <andy@rz.uni-karlsruhe.de> 24 Aug 2000.  */
-BC++;
-UP++;
-PC++;
-return ospeed != 0;
+
+	  time_t t = 0;
+	  struct tm *lt;
+	  struct tm saved_lt;
+	  struct timeval tv;
+	  lt = localtime (&t);
+	  saved_lt = *lt;
+	  gettimeofday (&tv, NULL);
+	  return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0;
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_var_ospeed=$trylib; break
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gl_cv_func_gettimeofday_clobber=no
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
+( exit $ac_status )
+gl_cv_func_gettimeofday_clobber=yes
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-done
-LIBS=$oldLIBS
 
 fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_gettimeofday_clobber" >&5
+$as_echo "$gl_cv_func_gettimeofday_clobber" >&6; }
 
-{ echo "$as_me:$LINENO: result: $ac_cv_var_ospeed" >&5
-echo "${ECHO_T}$ac_cv_var_ospeed" >&6; }
-if test -n "$ac_cv_var_ospeed" \
-   && test "x$termlib" != "x$ac_cv_var_ospeed"; then
-  TERMLIBS="${TERMLIBS} -l${ac_cv_var_ospeed}"
-fi
-#
+ if test $gl_cv_func_gettimeofday_clobber = yes; then
+   REPLACE_GETTIMEOFDAY=1
+   SYS_TIME_H=sys/time.h
 
-# Do not use <ncurses/termcap.h> unless we're linking with ncurses.
-# Must come after the termlib tests.
-if test "x$termlib" = xncurses; then
-  # Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined.
 
-for ac_header in ncurses/termcap.h
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext"
+
+
+
+for ac_header in sys/timeb.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7085,32 +9611,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7124,99 +9651,235 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
+
+for ac_func in _ftime
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
 fi
 
-# gnulib.
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
+fi
+done
 
 
 
+cat >>confdefs.h <<\_ACEOF
+#define gmtime rpl_gmtime
+_ACEOF
 
-for ac_header in $gl_header_list
+
+cat >>confdefs.h <<\_ACEOF
+#define localtime rpl_localtime
+_ACEOF
+
+
+
+cat >>confdefs.h <<\_ACEOF
+#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1
+_ACEOF
+
+ fi
+
+
+  if test $gl_cv_func_gettimeofday_posix_signature != yes; then
+    REPLACE_GETTIMEOFDAY=1
+    SYS_TIME_H=sys/time.h
+    if test $gl_cv_func_gettimeofday_clobber != yes; then
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext"
+
+
+
+for ac_header in sys/timeb.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7232,32 +9895,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7271,69 +9935,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -7341,42 +10013,132 @@ fi
 done
 
 
+for ac_func in _ftime
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
 
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
 
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
+#undef $ac_func
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
 
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	eval "$as_ac_var=no"
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
+fi
+done
 
 
+    fi
+  fi
 
 
 
-
-
-
-
-      { echo "$as_me:$LINENO: checking whether getenv is declared" >&5
-echo $ECHO_N "checking whether getenv is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_getenv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:$LINENO: checking whether the compiler generally respects inline" >&5
+$as_echo_n "checking whether the compiler generally respects inline... " >&6; }
+if test "${gl_cv_c_inline_effective+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  if test $ac_cv_c_inline = no; then
+       gl_cv_c_inline_effective=no
+     else
+                                          cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+
 int
 main ()
 {
-#ifndef getenv
-  (void) getenv;
-#endif
-
+#ifdef __NO_INLINE__
+               #error "inline is not effective"
+             #endif
   ;
   return 0;
 }
@@ -7387,51 +10149,200 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_getenv=yes
+  gl_cv_c_inline_effective=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_have_decl_getenv=no
+	gl_cv_c_inline_effective=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     fi
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5
-echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6; }
-if test $ac_cv_have_decl_getenv = yes; then
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_c_inline_effective" >&5
+$as_echo "$gl_cv_c_inline_effective" >&6; }
+  if test $gl_cv_c_inline_effective = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETENV 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_INLINE 1
 _ACEOF
 
+  fi
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+
+
+
+  if test $gl_cv_func_malloc_posix = yes; then
+    HAVE_MALLOC_POSIX=1
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MALLOC_POSIX 1
+_ACEOF
+
+  else
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS malloc.$ac_objext"
+
+    HAVE_MALLOC_POSIX=0
+  fi
+
+
+
+
+  GNULIB_MALLOC_POSIX=1
+
+
+
+
+
+
+
+
 
+
+
+  :
+
+
+
+
+  GNULIB_MBSCASECMP=1
+
+
+
+
+  :
+
+
+
+
+  GNULIB_MBSNCASECMP=1
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
+$as_echo_n "checking whether mbrtowc and mbstate_t are properly declared... " >&6; }
+if test "${gl_cv_func_mbrtowc+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETENV 0
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <wchar.h>
+int
+main ()
+{
+wchar_t wc;
+              char const s[] = "";
+              size_t n = 1;
+              mbstate_t state;
+              return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  gl_cv_func_mbrtowc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	gl_cv_func_mbrtowc=no
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc" >&5
+$as_echo "$gl_cv_func_mbrtowc" >&6; }
+  if test $gl_cv_func_mbrtowc = yes; then
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MBRTOWC 1
+_ACEOF
 
+  fi
 
 
-  { echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
-if test "${gl_cv_header_inttypes_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      { $as_echo "$as_me:$LINENO: checking whether mbswidth is declared in <wchar.h>" >&5
+$as_echo_n "checking whether mbswidth is declared in <wchar.h>... " >&6; }
+if test "${ac_cv_have_decl_mbswidth+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7439,12 +10350,23 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <inttypes.h>
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+
 int
 main ()
 {
-uintmax_t i = (uintmax_t) -1;
+
+  char *p = (char *) mbswidth;
+  return !p;
+
   ;
   return 0;
 }
@@ -7455,42 +10377,45 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  gl_cv_header_inttypes_h=yes
+  ac_cv_have_decl_mbswidth=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	gl_cv_header_inttypes_h=no
+	ac_cv_have_decl_mbswidth=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6; }
-  if test $gl_cv_header_inttypes_h = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_mbswidth" >&5
+$as_echo "$ac_cv_have_decl_mbswidth" >&6; }
+  if test $ac_cv_have_decl_mbswidth = yes; then
+    ac_val=1
+  else
+    ac_val=0
+  fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
+#define HAVE_DECL_MBSWIDTH_IN_WCHAR_H $ac_val
 _ACEOF
 
-  fi
-
 
-  { echo "$as_me:$LINENO: checking for stdint.h" >&5
-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
-if test "${gl_cv_header_stdint_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:$LINENO: checking for mbstate_t" >&5
+$as_echo_n "checking for mbstate_t... " >&6; }
+if test "${ac_cv_type_mbstate_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7498,12 +10423,12 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <stdint.h>
+$ac_includes_default
+#	    include <wchar.h>
 int
 main ()
 {
-uintmax_t i = (uintmax_t) -1;
+mbstate_t x; return sizeof x;
   ;
   return 0;
 }
@@ -7514,42 +10439,65 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  gl_cv_header_stdint_h=yes
+  ac_cv_type_mbstate_t=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	gl_cv_header_stdint_h=no
+	ac_cv_type_mbstate_t=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
-echo "${ECHO_T}$gl_cv_header_stdint_h" >&6; }
-  if test $gl_cv_header_stdint_h = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
+$as_echo "$ac_cv_type_mbstate_t" >&6; }
+   if test $ac_cv_type_mbstate_t = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STDINT_H_WITH_UINTMAX 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MBSTATE_T 1
 _ACEOF
 
-  fi
+   else
 
+cat >>confdefs.h <<\_ACEOF
+#define mbstate_t int
+_ACEOF
+
+   fi
 
-  { echo "$as_me:$LINENO: checking for unsigned long long" >&5
-echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6; }
-if test "${ac_cv_type_unsigned_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+
+for ac_func in memchr
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7557,12 +10505,41 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-unsigned long long ull = 1ULL; int i = 63;
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
 int
 main ()
 {
-unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;
+return $ac_func ();
   ;
   return 0;
 }
@@ -7573,68 +10550,341 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_type_unsigned_long_long=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_unsigned_long_long=no
+	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6; }
-  if test $ac_cv_type_unsigned_long_long = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNSIGNED_LONG_LONG 1
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
+fi
+done
+
+
+  if test $ac_cv_func_memchr = no; then
+
+
+for ac_header in bp-sym.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
 _ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
 
   fi
 
 
 
 
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
 
-    test $ac_cv_type_unsigned_long_long = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
 
-cat >>confdefs.h <<_ACEOF
-#define uintmax_t $ac_type
+
+
+
+
+for ac_func in memcpy
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
 
-  else
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UINTMAX_T 1
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
+fi
+done
+
+
+  if test $ac_cv_func_memcpy = no; then
+
+  :
+
   fi
 
 
-for ac_func in mkstemp
+
+
+
+
+
+
+
+
+for ac_func in memmove
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7687,60 +10937,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  case " $LIBOBJS " in
-  *" $ac_func.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
- ;;
-esac
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
 
 fi
 done
 
 
-  if test $ac_cv_func_mkstemp = no; then
-    gl_cv_func_mkstemp_limitations=yes
-  else
-    { echo "$as_me:$LINENO: checking for mkstemp limitations" >&5
-echo $ECHO_N "checking for mkstemp limitations... $ECHO_C" >&6; }
-if test "${gl_cv_func_mkstemp_limitations+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+  if test $ac_cv_func_memmove = no; then
+
+  :
+
+  fi
+
+
 
-	if test "$cross_compiling" = yes; then
-  gl_cv_func_mkstemp_limitations=yes
 
+
+  { $as_echo "$as_me:$LINENO: checking for working mkstemp" >&5
+$as_echo_n "checking for working mkstemp... " >&6; }
+if test "${gl_cv_func_working_mkstemp+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+      mkdir conftest.mkstemp
+      if test "$cross_compiling" = yes; then
+  gl_cv_func_working_mkstemp=no
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7748,22 +11008,27 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-#         include <stdlib.h>
-	  int main ()
-	  {
-	    int i;
+$ac_includes_default
+int
+main ()
+{
+int i;
+	    off_t large = (off_t) 4294967295u;
+	    if (large < 0)
+	      large = 2147483647;
 	    for (i = 0; i < 70; i++)
 	      {
-		char template[] = "conftestXXXXXX";
-		int fd = mkstemp (template);
-		if (fd == -1)
-		  exit (1);
+		char templ[] = "conftest.mkstemp/coXXXXXX";
+		int (*mkstemp_function) (char *) = mkstemp;
+		int fd = mkstemp_function (templ);
+		if (fd < 0 || lseek (fd, large, SEEK_SET) != large)
+		  return 1;
 		close (fd);
 	      }
-	    exit (0);
-	  }
-
+	    return 0;
+  ;
+  return 0;
+}
 _ACEOF
 rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"
@@ -7771,61 +11036,62 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  gl_cv_func_mkstemp_limitations=no
+  gl_cv_func_working_mkstemp=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-gl_cv_func_mkstemp_limitations=yes
+gl_cv_func_working_mkstemp=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
-
+      rm -rf conftest.mkstemp
 
 fi
-{ echo "$as_me:$LINENO: result: $gl_cv_func_mkstemp_limitations" >&5
-echo "${ECHO_T}$gl_cv_func_mkstemp_limitations" >&6; }
-  fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_working_mkstemp" >&5
+$as_echo "$gl_cv_func_working_mkstemp" >&6; }
 
-  if test $gl_cv_func_mkstemp_limitations = yes; then
-    case " $LIBOBJS " in
-  *" mkstemp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
- ;;
-esac
+  if test $gl_cv_func_working_mkstemp != yes; then
+    REPLACE_MKSTEMP=1
 
-    case " $LIBOBJS " in
-  *" tempname.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS tempname.$ac_objext"
- ;;
-esac
 
 
-cat >>confdefs.h <<\_ACEOF
-#define mkstemp rpl_mkstemp
-_ACEOF
 
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS mkstemp.$ac_objext"
+
+
+
+  fi
+
+
+
+  GNULIB_MKSTEMP=1
+
+
 
 
   :
@@ -7834,29 +11100,45 @@ _ACEOF
 
 
 
+  if test $ac_cv_func_setenv = no; then
+    HAVE_SETENV=0
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS setenv.$ac_objext"
+
+
 
 
 
+  :
+
 
 
 
 
-for ac_header in stdint.h
+
+for ac_header in search.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7872,32 +11154,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7911,69 +11194,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -7981,14 +11272,13 @@ fi
 done
 
 
-
-for ac_func in __secure_getenv gettimeofday
+for ac_func in tsearch
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8041,454 +11331,329 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-  :
-
+  fi
 
 
 
+  GNULIB_SETENV=1
 
 
 
-  fi
 
+  # Define two additional variables used in the Makefile substitution.
 
-# For teTeX and TeX Live.
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
+  if test "$ac_cv_header_stdbool_h" = yes; then
+    STDBOOL_H=''
+  else
+    STDBOOL_H='stdbool.h'
+  fi
 
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
+  if test "$ac_cv_type__Bool" = yes; then
+    HAVE__BOOL=1
+  else
+    HAVE__BOOL=0
+  fi
 
-# Check whether --enable-multiplatform was given.
-if test "${enable_multiplatform+set}" = set; then
-  enableval=$enable_multiplatform;
-fi
-# if enable_multiplatform is set in the environment, use that.
-if test "x$enable_multiplatform" = xyes; then
-  test "x$bindir" = 'x${exec_prefix}/bin' && bindir="$bindir/$host"
-  test "x$libdir" = 'x${exec_prefix}/lib' && libdir="$libdir/$host"
-fi
 
-# Taken from the example in
-# http://www.gnu.org/software/automake/manual/html_node/Conditionals.html.
-# Check whether --enable-install-warnings was given.
-if test "${enable_install_warnings+set}" = set; then
-  enableval=$enable_install_warnings; case "${enableval}" in
-     yes) install_warnings=true ;;
-      no) install_warnings=false ;;
-       *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-install-warnings" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-install-warnings" >&2;}
-   { (exit 1); exit 1; }; } ;;
-   esac
-else
-  install_warnings=true
-fi
 
 
 
-if test x"$install_warnings" = xtrue || test x"$install_warnings" = xyes; then
-  INSTALL_WARNINGS_TRUE=
-  INSTALL_WARNINGS_FALSE='#'
-else
-  INSTALL_WARNINGS_TRUE='#'
-  INSTALL_WARNINGS_FALSE=
-fi
+  if test $ac_cv_type_long_long_int = yes; then
+    HAVE_LONG_LONG_INT=1
+  else
+    HAVE_LONG_LONG_INT=0
+  fi
 
 
-# i18n support.  To update to a new version of gettext, run:
-# gettextize -f -c --intl
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    HAVE_UNSIGNED_LONG_LONG_INT=1
+  else
+    HAVE_UNSIGNED_LONG_LONG_INT=0
+  fi
 
 
-        MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+      if test $ac_cv_header_inttypes_h = yes; then
+    HAVE_INTTYPES_H=1
+  else
+    HAVE_INTTYPES_H=0
   fi
 
 
+      if test $ac_cv_header_sys_types_h = yes; then
+    HAVE_SYS_TYPES_H=1
+  else
+    HAVE_SYS_TYPES_H=0
+  fi
 
-  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
-  enableval=$enable_nls; USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
 
-  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
 
 
 
+  :
 
 
 
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
 
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
 
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case "$MSGFMT" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-    ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != ":"; then
-  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
 
-  # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6; }
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stdint_h='<'stdint.h'>'
+     else
+       { $as_echo "$as_me:$LINENO: checking absolute name of <stdint.h>" >&5
+$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
+if test "${gl_cv_next_stdint_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
 
+	  if test $ac_cv_header_stdint_h = yes; then
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdint.h>
 
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
+_ACEOF
+	    	    	    	    gl_cv_next_stdint_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+	       sed -n '\#/stdint.h#{
+		 s#.*"\(.*/stdint.h\)".*#\1#
+		 s#^/[^/]#//&#
+		 p
+		 q
+	       }'`'"'
+	  else
+	    gl_cv_next_stdint_h='<'stdint.h'>'
+	  fi
 
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case "$XGETTEXT" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-    ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
-  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
 fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_stdint_h" >&5
+$as_echo "$gl_cv_next_stdint_h" >&6; }
+     fi
+     NEXT_STDINT_H=$gl_cv_next_stdint_h
 
-    rm -f messages.po
 
 
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+  if test $ac_cv_header_stdint_h = yes; then
+    HAVE_STDINT_H=1
   else
-    PATH_SEPARATOR=:
+    HAVE_STDINT_H=0
   fi
-  rm -f conf$$.sh
-fi
 
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
 
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case "$MSGMERGE" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
-            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-    ;;
-esac
-fi
-MSGMERGE="$ac_cv_path_MSGMERGE"
-if test "$MSGMERGE" != ":"; then
-  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6; }
+    if test $ac_cv_header_stdint_h = yes; then
+    { $as_echo "$as_me:$LINENO: checking whether stdint.h conforms to C99" >&5
+$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
+if test "${gl_cv_header_working_stdint_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
+  gl_cv_header_working_stdint_h=no
+       cat >conftest.$ac_ext <<_ACEOF
 
-      if test "$GMSGFMT" != ":"; then
-            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
-      GMSGFMT=":"
-    fi
-  fi
+         /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-      if test "$XGETTEXT" != ":"; then
-            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
-      XGETTEXT=":"
-    fi
-        rm -f messages.po
-  fi
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#endif
 
-  ac_config_commands="$ac_config_commands default-1"
 
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
 
 
-  { echo "$as_me:$LINENO: checking for signed" >&5
-echo $ECHO_N "checking for signed... $ECHO_C" >&6; }
-if test "${bh_cv_c_signed+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#ifdef INT8_MAX
+int8_t a1 = INT8_MAX;
+int8_t a1min = INT8_MIN;
+#endif
+#ifdef INT16_MAX
+int16_t a2 = INT16_MAX;
+int16_t a2min = INT16_MIN;
+#endif
+#ifdef INT32_MAX
+int32_t a3 = INT32_MAX;
+int32_t a3min = INT32_MIN;
+#endif
+#ifdef INT64_MAX
+int64_t a4 = INT64_MAX;
+int64_t a4min = INT64_MIN;
+#endif
+#ifdef UINT8_MAX
+uint8_t b1 = UINT8_MAX;
+#else
+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
+#endif
+#ifdef UINT16_MAX
+uint16_t b2 = UINT16_MAX;
+#endif
+#ifdef UINT32_MAX
+uint32_t b3 = UINT32_MAX;
+#endif
+#ifdef UINT64_MAX
+uint64_t b4 = UINT64_MAX;
+#endif
+int_least8_t c1 = INT8_C (0x7f);
+int_least8_t c1max = INT_LEAST8_MAX;
+int_least8_t c1min = INT_LEAST8_MIN;
+int_least16_t c2 = INT16_C (0x7fff);
+int_least16_t c2max = INT_LEAST16_MAX;
+int_least16_t c2min = INT_LEAST16_MIN;
+int_least32_t c3 = INT32_C (0x7fffffff);
+int_least32_t c3max = INT_LEAST32_MAX;
+int_least32_t c3min = INT_LEAST32_MIN;
+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
+int_least64_t c4max = INT_LEAST64_MAX;
+int_least64_t c4min = INT_LEAST64_MIN;
+uint_least8_t d1 = UINT8_C (0xff);
+uint_least8_t d1max = UINT_LEAST8_MAX;
+uint_least16_t d2 = UINT16_C (0xffff);
+uint_least16_t d2max = UINT_LEAST16_MAX;
+uint_least32_t d3 = UINT32_C (0xffffffff);
+uint_least32_t d3max = UINT_LEAST32_MAX;
+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
+uint_least64_t d4max = UINT_LEAST64_MAX;
+int_fast8_t e1 = INT_FAST8_MAX;
+int_fast8_t e1min = INT_FAST8_MIN;
+int_fast16_t e2 = INT_FAST16_MAX;
+int_fast16_t e2min = INT_FAST16_MIN;
+int_fast32_t e3 = INT_FAST32_MAX;
+int_fast32_t e3min = INT_FAST32_MIN;
+int_fast64_t e4 = INT_FAST64_MAX;
+int_fast64_t e4min = INT_FAST64_MIN;
+uint_fast8_t f1 = UINT_FAST8_MAX;
+uint_fast16_t f2 = UINT_FAST16_MAX;
+uint_fast32_t f3 = UINT_FAST32_MAX;
+uint_fast64_t f4 = UINT_FAST64_MAX;
+#ifdef INTPTR_MAX
+intptr_t g = INTPTR_MAX;
+intptr_t gmin = INTPTR_MIN;
+#endif
+#ifdef UINTPTR_MAX
+uintptr_t h = UINTPTR_MAX;
+#endif
+intmax_t i = INTMAX_MAX;
+uintmax_t j = UINTMAX_MAX;
+
+#include <limits.h> /* for CHAR_BIT */
+#define TYPE_MINIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+#define TYPE_MAXIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+struct s {
+  int check_PTRDIFF:
+      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
+      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
+      ? 1 : -1;
+  /* Detect bug in FreeBSD 6.0 / ia64.  */
+  int check_SIG_ATOMIC:
+      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
+      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
+      ? 1 : -1;
+  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
+  int check_WCHAR:
+      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
+      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
+      ? 1 : -1;
+  /* Detect bug in mingw.  */
+  int check_WINT:
+      WINT_MIN == TYPE_MINIMUM (wint_t)
+      && WINT_MAX == TYPE_MAXIMUM (wint_t)
+      ? 1 : -1;
+
+  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
+  int check_UINT8_C:
+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+  int check_UINT16_C:
+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
+
+  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
+#ifdef UINT8_MAX
+  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#endif
+#ifdef UINT16_MAX
+  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#endif
+#ifdef UINT32_MAX
+  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+#endif
+#ifdef UINT64_MAX
+  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
+#endif
+  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
+  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
+  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
+  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
+  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
+  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
+  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
+  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
+  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
+  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
+  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
+};
 
 int
 main ()
 {
-signed char x;
+
   ;
   return 0;
 }
@@ -8499,56 +11664,61 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  bh_cv_c_signed=yes
+  gl_cv_header_working_stdint_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	bh_cv_c_signed=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
-echo "${ECHO_T}$bh_cv_c_signed" >&6; }
-  if test $bh_cv_c_signed = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define signed
-_ACEOF
-
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_working_stdint_h" >&5
+$as_echo "$gl_cv_header_working_stdint_h" >&6; }
   fi
+  if test "$gl_cv_header_working_stdint_h" = yes; then
+    STDINT_H=
+  else
 
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+for ac_header in sys/inttypes.h sys/bitypes.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
+$ac_includes_default
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -8556,69 +11726,232 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_c_inline=$ac_kw
+  ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
+	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+    if test $ac_cv_header_sys_inttypes_h = yes; then
+      HAVE_SYS_INTTYPES_H=1
+    else
+      HAVE_SYS_INTTYPES_H=0
+    fi
+
+    if test $ac_cv_header_sys_bitypes_h = yes; then
+      HAVE_SYS_BITYPES_H=1
+    else
+      HAVE_SYS_BITYPES_H=0
+    fi
+
+
+
+  :
+
+
+
+
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+
+
+
+
+  for gltype in ptrdiff_t sig_atomic_t size_t wchar_t wint_t ; do
+    { $as_echo "$as_me:$LINENO: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+#include <limits.h>
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= 0)];
+test_array [0] = 0
+
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+#include <limits.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -8629,124 +11962,183 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
+  ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
-  :
+  done
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-fi
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
 
+#include <limits.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) < 0)];
+test_array [0] = 0
 
-  { echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-long long ll = 1LL; int i = 63;
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+#include <limits.h>
 int
 main ()
 {
-long long llmax = (long long) -1;
-     return ll << i | ll >> i | llmax / ll | llmax % ll;
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_type_long_long=yes
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_long_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
-  if test $ac_cv_type_long_long = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_LONG 1
-_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  fi
+	ac_lo= ac_hi=
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
-  { echo "$as_me:$LINENO: checking for long double" >&5
-echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
-if test "${gt_cv_c_long_double+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$GCC" = yes; then
-       gt_cv_c_long_double=yes
-     else
-       cat >conftest.$ac_ext <<_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
-         long double foo = 0.0;
-         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
-         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
 
+#include <limits.h>
 int
 main ()
 {
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)];
+test_array [0] = 0
 
   ;
   return 0;
@@ -8758,43 +12150,149 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  gt_cv_c_long_double=yes
+  ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	gt_cv_c_long_double=no
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     fi
+done
+case $ac_lo in
+?*) result=$ac_lo;;
+'') result=unknown ;;
+esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+#include <limits.h>
+static long int longval () { return sizeof ($gltype) * CHAR_BIT; }
+static unsigned long int ulongval () { return sizeof ($gltype) * CHAR_BIT; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if ((sizeof ($gltype) * CHAR_BIT) < 0)
+    {
+      long int i = longval ();
+      if (i != (sizeof ($gltype) * CHAR_BIT))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != (sizeof ($gltype) * CHAR_BIT))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  result=`cat conftest.val`
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+result=unknown
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
-echo "${ECHO_T}$gt_cv_c_long_double" >&6; }
-  if test $gt_cv_c_long_double = yes; then
+rm -f conftest.val
+       eval gl_cv_bitsizeof_${gltype}=\$result
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_DOUBLE 1
+fi
+ac_res=`eval 'as_val=${'gl_cv_bitsizeof_${gltype}'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+                                                result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
 _ACEOF
 
-  fi
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
 
 
-  { echo "$as_me:$LINENO: checking for wchar_t" >&5
-echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6; }
-if test "${gt_cv_c_wchar_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:$LINENO: checking whether $gltype is signed" >&5
+$as_echo_n "checking whether $gltype is signed... " >&6; }
+if { as_var=gl_cv_type_${gltype}_signed; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8802,8 +12300,18 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
-       wchar_t foo = (wchar_t)'\0';
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];
 int
 main ()
 {
@@ -8818,51 +12326,100 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  gt_cv_c_wchar_t=yes
+  result=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	gt_cv_c_wchar_t=no
+	result=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
-echo "${ECHO_T}$gt_cv_c_wchar_t" >&6; }
-  if test $gt_cv_c_wchar_t = yes; then
+       eval gl_cv_type_${gltype}_signed=\$result
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WCHAR_T 1
+fi
+ac_res=`eval 'as_val=${'gl_cv_type_${gltype}_signed'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_type_${gltype}_signed
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    if test "$result" = yes; then
+      cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGNED_${GLTYPE} 1
 _ACEOF
 
-  fi
+      eval HAVE_SIGNED_${GLTYPE}=1
+    else
+      eval HAVE_SIGNED_${GLTYPE}=0
+    fi
+  done
 
 
-  { echo "$as_me:$LINENO: checking for wint_t" >&5
-echo $ECHO_N "checking for wint_t... $ECHO_C" >&6; }
-if test "${gt_cv_c_wint_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  gl_cv_type_ptrdiff_t_signed=yes
+  gl_cv_type_size_t_signed=no
+
+
+
+
+
+
+
+  for gltype in ptrdiff_t sig_atomic_t size_t wchar_t wint_t ; do
+    { $as_echo "$as_me:$LINENO: checking for $gltype integer literal suffix" >&5
+$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
+if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)	gltype1='long int';;
+           ll)	gltype1='long long int';;
+           i64)	gltype1='__int64';;
+           u)	gltype1='unsigned int';;
+           ul)	gltype1='unsigned long int';;
+           ull)	gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <wchar.h>
-       wint_t foo = (wchar_t)'\0';
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+              extern $gltype foo;
+              extern $gltype1 foo;
 int
 main ()
 {
@@ -8877,44 +12434,120 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  gt_cv_c_wint_t=yes
+  eval gl_cv_type_${gltype}_suffix=\$glsuf
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	gt_cv_c_wint_t=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
-echo "${ECHO_T}$gt_cv_c_wint_t" >&6; }
-  if test $gt_cv_c_wint_t = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WINT_T 1
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done
+fi
+ac_res=`eval 'as_val=${'gl_cv_type_${gltype}_suffix'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
 _ACEOF
 
+  done
+
+
+
+    STDINT_H=stdint.h
   fi
 
 
 
 
-  { echo "$as_me:$LINENO: checking for intmax_t" >&5
-echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; }
-if test "${gt_cv_c_intmax_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stdlib_h='<'stdlib.h'>'
+     else
+       { $as_echo "$as_me:$LINENO: checking absolute name of <stdlib.h>" >&5
+$as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
+if test "${gl_cv_next_stdlib_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+	  if test $ac_cv_header_stdlib_h = yes; then
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+	    	    	    	    gl_cv_next_stdlib_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+	       sed -n '\#/stdlib.h#{
+		 s#.*"\(.*/stdlib.h\)".*#\1#
+		 s#^/[^/]#//&#
+		 p
+		 q
+	       }'`'"'
+	  else
+	    gl_cv_next_stdlib_h='<'stdlib.h'>'
+	  fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_stdlib_h" >&5
+$as_echo "$gl_cv_next_stdlib_h" >&6; }
+     fi
+     NEXT_STDLIB_H=$gl_cv_next_stdlib_h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+for ac_func in strdup
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8922,92 +12555,157 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
 
-#include <stddef.h>
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
 #endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
 #endif
 
 int
 main ()
 {
-intmax_t x = -1;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  gt_cv_c_intmax_t=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	gt_cv_c_intmax_t=no
+	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
-echo "${ECHO_T}$gt_cv_c_intmax_t" >&6; }
-  if test $gt_cv_c_intmax_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INTMAX_T 1
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
+fi
+done
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_have_decl_strdup = no; then
+    HAVE_DECL_STRDUP=0
   fi
+  :
+
+
+
+  GNULIB_STRDUP=1
+
+
+
+  if test $gl_cv_func_working_strerror = no; then
 
 
 
-  { echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
-echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6; }
-if test "${gt_cv_func_printf_posix+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
-      if test "$cross_compiling" = yes; then
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
-  notposix
-#endif
 
+  gl_LIBOBJS="$gl_LIBOBJS strerror.$ac_objext"
+
+
+cat >>confdefs.h <<_ACEOF
+#define REPLACE_STRERROR $REPLACE_STRERROR
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "notposix" >/dev/null 2>&1; then
-  gt_cv_func_printf_posix="guessing no"
-else
-  gt_cv_func_printf_posix="guessing yes"
-fi
-rm -f conftest*
 
+  fi
+
+
+
+  GNULIB_STRERROR=1
+
+
+
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_func_lstat = yes; then
+    HAVE_LSTAT=1
+  else
+    HAVE_LSTAT=0
+  fi
 
+
+      { $as_echo "$as_me:$LINENO: checking whether mkdir is declared" >&5
+$as_echo_n "checking whether mkdir is declared... " >&6; }
+if test "${ac_cv_have_decl_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9015,84 +12713,79 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <sys/stat.h>
 
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
-   dollar expansion (possibly an autoconf bug).  */
-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf[100];
-int main ()
+int
+main ()
 {
-  sprintf (buf, format, 33, 55);
-  return (strcmp (buf, "55 33") != 0);
+#ifndef mkdir
+  (void) mkdir;
+#endif
+
+  ;
+  return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_printf_posix=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_mkdir=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-gt_cv_func_printf_posix=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+	ac_cv_have_decl_mkdir=no
 fi
 
-
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
-echo "${ECHO_T}$gt_cv_func_printf_posix" >&6; }
-  case $gt_cv_func_printf_posix in
-    *yes)
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_mkdir" >&5
+$as_echo "$ac_cv_have_decl_mkdir" >&6; }
+if test $ac_cv_have_decl_mkdir = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_PRINTF 1
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MKDIR 1
 _ACEOF
 
-      ;;
-  esac
 
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MKDIR 0
+_ACEOF
 
 
-for ac_header in stdlib.h unistd.h
+for ac_header in io.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9108,32 +12801,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9147,83 +12841,334 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+fi
+
+
+  if test $ac_cv_have_decl_mkdir = yes; then
+    HAVE_DECL_MKDIR=1
+  else
+    HAVE_DECL_MKDIR=0
+  fi
+
+  if test "$ac_cv_header_io_h" = yes; then
+    HAVE_IO_H=1
+  else
+    HAVE_IO_H=0
+  fi
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_sys_stat_h='<'sys/stat.h'>'
+     else
+       { $as_echo "$as_me:$LINENO: checking absolute name of <sys/stat.h>" >&5
+$as_echo_n "checking absolute name of <sys/stat.h>... " >&6; }
+if test "${gl_cv_next_sys_stat_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+	  if test $ac_cv_header_sys_stat_h = yes; then
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/stat.h>
+
+_ACEOF
+	    	    	    	    gl_cv_next_sys_stat_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+	       sed -n '\#/sys/stat.h#{
+		 s#.*"\(.*/sys/stat.h\)".*#\1#
+		 s#^/[^/]#//&#
+		 p
+		 q
+	       }'`'"'
+	  else
+	    gl_cv_next_sys_stat_h='<'sys/stat.h'>'
+	  fi
 
 fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_sys_stat_h" >&5
+$as_echo "$gl_cv_next_sys_stat_h" >&6; }
+     fi
+     NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h
+
+
+
+  SYS_STAT_H='sys/stat.h'
 
+
+  { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
 done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
 
 
-for ac_func in getpagesize
+
+
+  { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS tempname.$ac_objext"
+
+
+  :
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_unistd_h='<'unistd.h'>'
+     else
+       { $as_echo "$as_me:$LINENO: checking absolute name of <unistd.h>" >&5
+$as_echo_n "checking absolute name of <unistd.h>... " >&6; }
+if test "${gl_cv_next_unistd_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+	  if test $ac_cv_header_unistd_h = yes; then
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <unistd.h>
+
+_ACEOF
+	    	    	    	    gl_cv_next_unistd_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+	       sed -n '\#/unistd.h#{
+		 s#.*"\(.*/unistd.h\)".*#\1#
+		 s#^/[^/]#//&#
+		 p
+		 q
+	       }'`'"'
+	  else
+	    gl_cv_next_unistd_h='<'unistd.h'>'
+	  fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_unistd_h" >&5
+$as_echo "$gl_cv_next_unistd_h" >&6; }
+     fi
+     NEXT_UNISTD_H=$gl_cv_next_unistd_h
+
+
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_header_unistd_h = yes; then
+    HAVE_UNISTD_H=1
+  else
+    HAVE_UNISTD_H=0
+  fi
+
+
+
+
+
+for ac_func in unsetenv
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9276,47 +13221,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-{ echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_fixed_mapped=no
+  if test $ac_cv_func_unsetenv = no; then
+    HAVE_UNSETENV=0
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS unsetenv.$ac_objext"
+
+
+
+
+  :
+
+
+
+
+
+
+  else
+    { $as_echo "$as_me:$LINENO: checking for unsetenv() return type" >&5
+$as_echo_n "checking for unsetenv() return type... " >&6; }
+if test "${gt_cv_func_unsetenv_ret+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9324,234 +13294,291 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the file system buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propagated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
-char *malloc ();
+#include <stdlib.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+int unsetenv (const char *name);
+#else
+int unsetenv();
 #endif
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h.  */
-# ifndef HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
 
 int
 main ()
 {
-  char *data, *data2, *data3;
-  int i, pagesize;
-  int fd;
-
-  pagesize = getpagesize ();
 
-  /* First, make a file with some known garbage in it. */
-  data = (char *) malloc (pagesize);
-  if (!data)
-    return 1;
-  for (i = 0; i < pagesize; ++i)
-    *(data + i) = rand ();
-  umask (0);
-  fd = creat ("conftest.mmap", 0600);
-  if (fd < 0)
-    return 1;
-  if (write (fd, data, pagesize) != pagesize)
-    return 1;
-  close (fd);
-
-  /* Next, try to mmap the file at a fixed address which already has
-     something else allocated at it.  If we can, also make sure that
-     we see the same garbage.  */
-  fd = open ("conftest.mmap", O_RDWR);
-  if (fd < 0)
-    return 1;
-  data2 = (char *) malloc (2 * pagesize);
-  if (!data2)
-    return 1;
-  data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
-  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
-    return 1;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data2 + i))
-      return 1;
-
-  /* Finally, make sure that changes to the mapped area do not
-     percolate back to the file as seen by read().  (This is a bug on
-     some variants of i386 svr4.0.)  */
-  for (i = 0; i < pagesize; ++i)
-    *(data2 + i) = *(data2 + i) + 1;
-  data3 = (char *) malloc (pagesize);
-  if (!data3)
-    return 1;
-  if (read (fd, data3, pagesize) != pagesize)
-    return 1;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data3 + i))
-      return 1;
-  close (fd);
+  ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  gt_cv_func_unsetenv_ret='int'
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gt_cv_func_unsetenv_ret='void'
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_unsetenv_ret" >&5
+$as_echo "$gt_cv_func_unsetenv_ret" >&6; }
+    if test $gt_cv_func_unsetenv_ret = 'void'; then
+      VOID_UNSETENV=1
+    fi
+  fi
+
+
+
+  GNULIB_UNSETENV=1
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether <wchar.h> is standalone" >&5
+$as_echo_n "checking whether <wchar.h> is standalone... " >&6; }
+if test "${gl_cv_header_wchar_h_standalone+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#include <wchar.h>
+wchar_t w;
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_mmap_fixed_mapped=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  gl_cv_header_wchar_h_standalone=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
+	gl_cv_header_wchar_h_standalone=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_wchar_h_standalone" >&5
+$as_echo "$gl_cv_header_wchar_h_standalone" >&6; }
+  if test $gl_cv_header_wchar_h_standalone != yes; then
+    WCHAR_H=wchar.h
+  fi
 
 
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
+  :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
+
+
+
+
+  if test $ac_cv_header_wchar_h = yes; then
+    HAVE_WCHAR_H=1
+  else
+    HAVE_WCHAR_H=0
+  fi
+
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_wchar_h='<'wchar.h'>'
+     else
+       { $as_echo "$as_me:$LINENO: checking absolute name of <wchar.h>" >&5
+$as_echo_n "checking absolute name of <wchar.h>... " >&6; }
+if test "${gl_cv_next_wchar_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+	  if test $ac_cv_header_wchar_h = yes; then
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <wchar.h>
+
+_ACEOF
+	    	    	    	    gl_cv_next_wchar_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+	       sed -n '\#/wchar.h#{
+		 s#.*"\(.*/wchar.h\)".*#\1#
+		 s#^/[^/]#//&#
+		 p
+		 q
+	       }'`'"'
+	  else
+	    gl_cv_next_wchar_h='<'wchar.h'>'
+	  fi
 
 fi
-rm -f conftest.mmap
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_wchar_h" >&5
+$as_echo "$gl_cv_next_wchar_h" >&6; }
+     fi
+     NEXT_WCHAR_H=$gl_cv_next_wchar_h
 
 
-    { echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
-echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6; }
-if test "${ac_cv_gnu_library_2_1+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_func_iswcntrl = yes; then
+    HAVE_ISWCNTRL=1
+  else
+    HAVE_ISWCNTRL=0
+  fi
+
+
+  :
+
+
+
+
+
+
+
+
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+
+
+  WCTYPE_H=wctype.h
+  if test $ac_cv_header_wctype_h = yes; then
+    if test $ac_cv_func_iswcntrl = yes; then
+      WCTYPE_H=
+    fi
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_wctype_h='<'wctype.h'>'
+     else
+       { $as_echo "$as_me:$LINENO: checking absolute name of <wctype.h>" >&5
+$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
+if test "${gl_cv_next_wctype_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+
+	  if test $ac_cv_header_wctype_h = yes; then
+	    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
+#include <wctype.h>
 
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky GNU user" >/dev/null 2>&1; then
-  ac_cv_gnu_library_2_1=yes
-else
-  ac_cv_gnu_library_2_1=no
+	    	    	    	    gl_cv_next_wctype_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+	       sed -n '\#/wctype.h#{
+		 s#.*"\(.*/wctype.h\)".*#\1#
+		 s#^/[^/]#//&#
+		 p
+		 q
+	       }'`'"'
+	  else
+	    gl_cv_next_wctype_h='<'wctype.h'>'
+	  fi
+
 fi
-rm -f conftest*
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_wctype_h" >&5
+$as_echo "$gl_cv_next_wctype_h" >&6; }
+     fi
+     NEXT_WCTYPE_H=$gl_cv_next_wctype_h
+
+
+
+    HAVE_WCTYPE_H=1
+  else
+    HAVE_WCTYPE_H=0
+  fi
+
 
 
 
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
-echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6; }
 
-    GLIBC21="$ac_cv_gnu_library_2_1"
 
 
 
 
-  { echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
-echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6; }
-if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
-      if test "$cross_compiling" = yes; then
 
-          # Guess based on the CPU.
-          case "$host_cpu" in
-            alpha* | i3456786 | m68k | s390*)
-              gt_cv_int_divbyzero_sigfpe="guessing yes";;
-            *)
-              gt_cv_int_divbyzero_sigfpe="guessing no";;
-          esac
 
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether wcwidth is declared" >&5
+$as_echo_n "checking whether wcwidth is declared... " >&6; }
+if test "${ac_cv_have_decl_wcwidth+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9560,42 +13587,123 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-#include <stdlib.h>
-#include <signal.h>
+/* AIX 3.2.5 declares wcwidth in <string.h>. */
+#include <string.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
 
-static void
-#ifdef __cplusplus
-sigfpe_handler (int sig)
-#else
-sigfpe_handler (sig) int sig;
-#endif
+
+int
+main ()
 {
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
+#ifndef wcwidth
+  (void) wcwidth;
+#endif
+
+  ;
+  return 0;
 }
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_wcwidth=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_wcwidth=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_wcwidth" >&5
+$as_echo "$ac_cv_have_decl_wcwidth" >&6; }
+if test $ac_cv_have_decl_wcwidth = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_WCWIDTH 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_WCWIDTH 0
+_ACEOF
+
+
+fi
+
+
+  if test $ac_cv_have_decl_wcwidth != yes; then
+    HAVE_DECL_WCWIDTH=0
+  fi
 
-int x = 1;
-int y = 0;
-int z;
-int nan;
+  if test $ac_cv_func_wcwidth = no; then
+    REPLACE_WCWIDTH=1
+  else
+                { $as_echo "$as_me:$LINENO: checking whether wcwidth works reasonably in UTF-8 locales" >&5
+$as_echo_n "checking whether wcwidth works reasonably in UTF-8 locales... " >&6; }
+if test "${gl_cv_func_wcwidth_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+        if test "$cross_compiling" = yes; then
+  gl_cv_func_wcwidth_works="guessing no"
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+#include <locale.h>
+/* AIX 3.2.5 declares wcwidth in <string.h>. */
+#include <string.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+#if !HAVE_DECL_WCWIDTH
+extern
+# ifdef __cplusplus
+"C"
+# endif
+int wcwidth (int);
+#endif
 int main ()
 {
-  signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-  signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL.  */
-#if defined (__sparc__) && defined (__linux__)
-  signal (SIGILL, sigfpe_handler);
-#endif
-
-  z = x / y;
-  nan = y / y;
-  exit (1);
+  if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
+    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
+      return 1;
+  return 0;
 }
-
 _ACEOF
 rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"
@@ -9603,127 +13711,586 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  gt_cv_int_divbyzero_sigfpe=yes
+  gl_cv_func_wcwidth_works=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-gt_cv_int_divbyzero_sigfpe=no
+gl_cv_func_wcwidth_works=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
-echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6; }
-  case "$gt_cv_int_divbyzero_sigfpe" in
-    *yes) value=1;;
-    *) value=0;;
-  esac
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_wcwidth_works" >&5
+$as_echo "$gl_cv_func_wcwidth_works" >&6; }
+    case "$gl_cv_func_wcwidth_works" in
+      *yes) ;;
+      *no) REPLACE_WCWIDTH=1 ;;
+    esac
+  fi
+  if test $REPLACE_WCWIDTH = 1; then
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext"
+
+  fi
+
+  if test $REPLACE_WCWIDTH = 1 || test $HAVE_DECL_WCWIDTH = 0; then
+    WCHAR_H=wchar.h
+  fi
+
+
+
+  GNULIB_WCWIDTH=1
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS xmalloc.$ac_objext"
+
+
+
+
+  :
+
+
+  :
+
+
+
+
+
+
+  gltests_libdeps=
+  gltests_ltlibdeps=
+
 
-cat >>confdefs.h <<_ACEOF
-#define INTDIV0_RAISES_SIGFPE $value
-_ACEOF
 
 
 
-  { echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
-if test "${gt_cv_header_inttypes_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+  gl_source_base='tests'
+
+
+
+
+  LIBGNU_LIBDEPS="$gl_libdeps"
+
+  LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
+
+
+
+
+# Since we make a helper library.
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-    cat >conftest.$ac_ext <<_ACEOF
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+
+HELP2MAN=${HELP2MAN-"${am_missing_run}help2man"}
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+# Needed on sysV68 for sigblock, sigsetmask.  But check for it in libc first.
+{ $as_echo "$as_me:$LINENO: checking for sigblock" >&5
+$as_echo_n "checking for sigblock... " >&6; }
+if test "${ac_cv_func_sigblock+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <inttypes.h>
+/* Define sigblock to an innocuous variant, in case <limits.h> declares sigblock.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define sigblock innocuous_sigblock
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char sigblock (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef sigblock
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sigblock ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_sigblock || defined __stub___sigblock
+choke me
+#endif
+
 int
 main ()
 {
+return sigblock ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_sigblock=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_sigblock=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_sigblock" >&5
+$as_echo "$ac_cv_func_sigblock" >&6; }
+if test $ac_cv_func_sigblock = yes; then
+  :
+else
 
+{ $as_echo "$as_me:$LINENO: checking for sigblock in -lbsd" >&5
+$as_echo_n "checking for sigblock in -lbsd... " >&6; }
+if test "${ac_cv_lib_bsd_sigblock+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sigblock ();
+int
+main ()
+{
+return sigblock ();
   ;
   return 0;
 }
 _ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_bsd_sigblock=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_bsd_sigblock=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_sigblock" >&5
+$as_echo "$ac_cv_lib_bsd_sigblock" >&6; }
+if test $ac_cv_lib_bsd_sigblock = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBBSD 1
+_ACEOF
+
+  LIBS="-lbsd $LIBS"
+
+fi
+
+fi
+
+
+# Checks for header files.
+{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
+$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+if test "${ac_cv_header_stat_broken+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#if defined S_ISBLK && defined S_IFDIR
+extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
+#endif
+
+#if defined S_ISBLK && defined S_IFCHR
+extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
+#endif
+
+#if defined S_ISLNK && defined S_IFREG
+extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
+#endif
+
+#if defined S_ISSOCK && defined S_IFREG
+extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
+#endif
+
+_ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  gt_cv_header_inttypes_h=yes
+  ac_cv_header_stat_broken=no
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	gt_cv_header_inttypes_h=no
+	ac_cv_header_stat_broken=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6; }
-  if test $gt_cv_header_inttypes_h = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
+$as_echo "$ac_cv_header_stat_broken" >&6; }
+if test $ac_cv_header_stat_broken = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INTTYPES_H 1
+cat >>confdefs.h <<\_ACEOF
+#define STAT_MACROS_BROKEN 1
 _ACEOF
 
-  fi
-
-
+fi
 
-  if test $gt_cv_header_inttypes_h = yes; then
-    { echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
-echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6; }
-if test "${gt_cv_inttypes_pri_broken+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-
-        cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 
 int
 main ()
@@ -9739,57 +14306,189 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  gt_cv_inttypes_pri_broken=no
+  ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	gt_cv_inttypes_pri_broken=yes
+	ac_cv_header_stdc=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
-echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6; }
-  fi
-  if test "$gt_cv_inttypes_pri_broken" = yes; then
+rm -f conftest*
 
-cat >>confdefs.h <<_ACEOF
-#define PRI_MACROS_BROKEN 1
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+
+
+
 
-  fi
 
 
 
-for ac_header in stdint.h
+
+
+
+
+
+
+
+
+
+for ac_header in fcntl.h io.h limits.h pwd.h string.h strings.h \
+  termcap.h termio.h termios.h unistd.h \
+  sys/fcntl.h sys/file.h sys/stream.h sys/time.h sys/ttold.h sys/wait.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9805,32 +14504,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9844,119 +14544,106 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-    { echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
-echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6; }
-  result=
+
+# sys/ptem.h requires sys/stream.h for mblk_t on Solaris.
+
+for ac_header in sys/ptem.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
+#if HAVE_SYS_STREAM_H
+#include <sys/stream.h>
 #endif
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Found it" >/dev/null 2>&1; then
-  result=yes
-fi
-rm -f conftest*
 
-  if test -z "$result"; then
-                    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -9964,85 +14651,193 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+{ $as_echo "$as_me:$LINENO: checking POSIX termios" >&5
+$as_echo_n "checking POSIX termios... " >&6; }
+if test "${ac_cv_sys_posix_termios+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <termios.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
-test_array [0] = 0
-
+/* SunOS 4.0.3 has termios.h but not the library calls.  */
+   tcgetattr(0, 0);
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_sys_posix_termios=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
+	ac_cv_sys_posix_termios=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_posix_termios" >&5
+$as_echo "$ac_cv_sys_posix_termios" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking whether termios.h defines TIOCGWINSZ" >&5
+$as_echo_n "checking whether termios.h defines TIOCGWINSZ... " >&6; }
+if test "${ac_cv_sys_tiocgwinsz_in_termios_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <termios.h>
+#ifdef TIOCGWINSZ
+  yes
+#endif
 
-	cat >conftest.$ac_ext <<_ACEOF
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then
+  ac_cv_sys_tiocgwinsz_in_termios_h=yes
+else
+  ac_cv_sys_tiocgwinsz_in_termios_h=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5
+$as_echo "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
+
+if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then
+  { $as_echo "$as_me:$LINENO: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
+$as_echo_n "checking whether sys/ioctl.h defines TIOCGWINSZ... " >&6; }
+if test "${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#ifdef TIOCGWINSZ
+  yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then
+  ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes
+else
+  ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5
+$as_echo "$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6; }
+
+  if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define GWINSZ_IN_SYS_IOCTL 1
+_ACEOF
+
+  fi
+fi
+
+
+# Checks for typedefs, structures, and compiler characteristics.
+{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
+$as_echo_n "checking for off_t... " >&6; }
+if test "${ac_cv_type_off_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_off_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !((~(size_t)0 / 10) < 0)];
-test_array [0] = 0
-
+if (sizeof (off_t))
+       return 0;
   ;
   return 0;
 }
@@ -10053,32 +14848,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+$ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !((~(size_t)0 / 10) >= $ac_mid)];
-test_array [0] = 0
-
+if (sizeof ((off_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -10089,59 +14882,66 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
+	ac_cv_type_off_t=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo= ac_hi=
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+$as_echo "$ac_cv_type_off_t" >&6; }
+if test $ac_cv_type_off_t = yes; then
+  :
+else
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+cat >>confdefs.h <<_ACEOF
+#define off_t long int
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if test "${ac_cv_type_signal+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+#include <sys/types.h>
+#include <signal.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
-test_array [0] = 0
-
+return *(signal (0, 0)) (0) == 1;
   ;
   return 0;
 }
@@ -10152,117 +14952,100 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
+  ac_cv_type_signal=int
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo=`expr '(' $ac_mid ')' + 1`
+	ac_cv_type_signal=void
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) res_hi=$ac_lo;;
-'') result=? ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-static long int longval () { return ~(size_t)0 / 10; }
-static unsigned long int ulongval () { return ~(size_t)0 / 10; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if ((~(size_t)0 / 10) < 0)
-    {
-      long int i = longval ();
-      if (i != (~(size_t)0 / 10))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != (~(size_t)0 / 10))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
 
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define RETSIGTYPE $ac_cv_type_signal
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  res_hi=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-result=?
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
 
-    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if test "${ac_cv_c_const+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((~(size_t)0 % 10) >= 0)];
-test_array [0] = 0
+/* FIXME: Include the comments suggested by Paul. */
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this.  */
+  typedef int charset[2];
+  const charset cs;
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *pcpcc;
+  char **ppc;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* AIX XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  pcpcc = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
+  { /* SCO 3.2v4 cc rejects this.  */
+    char *t;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+    if (s) return 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; };
+    struct s *b; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+    if (!foo) return 0;
+  }
+  return !cs[0] && !zero.x;
+#endif
 
   ;
   return 0;
@@ -10274,32 +15057,58 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_c_const=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_const=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+cat >>confdefs.h <<\_ACEOF
+#define const /**/
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if test "${ac_cv_struct_tm+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+#include <sys/types.h>
+#include <time.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
-test_array [0] = 0
-
+struct tm tm;
+				     int *p = &tm.tm_sec;
+				     return !p;
   ;
   return 0;
 }
@@ -10310,48 +15119,58 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
+  ac_cv_struct_tm=time.h
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
+	ac_cv_struct_tm=sys/time.h
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
+if test $ac_cv_struct_tm = sys/time.h; then
 
-	cat >conftest.$ac_ext <<_ACEOF
+cat >>confdefs.h <<\_ACEOF
+#define TM_IN_SYS_TIME 1
+_ACEOF
+
+fi
+
+
+# Checks for function declarations.
+{ $as_echo "$as_me:$LINENO: checking whether memchr is declared" >&5
+$as_echo_n "checking whether memchr is declared... " >&6; }
+if test "${ac_cv_have_decl_memchr+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+$ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !((~(size_t)0 % 10) < 0)];
-test_array [0] = 0
+#ifndef memchr
+  (void) memchr;
+#endif
 
   ;
   return 0;
@@ -10363,31 +15182,62 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_have_decl_memchr=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_memchr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_memchr" >&5
+$as_echo "$ac_cv_have_decl_memchr" >&6; }
+if test $ac_cv_have_decl_memchr = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MEMCHR 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MEMCHR 0
+_ACEOF
+
+
+fi
+{ $as_echo "$as_me:$LINENO: checking whether strcoll is declared" >&5
+$as_echo_n "checking whether strcoll is declared... " >&6; }
+if test "${ac_cv_have_decl_strcoll+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+$ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !((~(size_t)0 % 10) >= $ac_mid)];
-test_array [0] = 0
+#ifndef strcoll
+  (void) strcoll;
+#endif
 
   ;
   return 0;
@@ -10399,58 +15249,62 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
+  ac_cv_have_decl_strcoll=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
+	ac_cv_have_decl_strcoll=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_strcoll" >&5
+$as_echo "$ac_cv_have_decl_strcoll" >&6; }
+if test $ac_cv_have_decl_strcoll = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRCOLL 1
+_ACEOF
+
+
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRCOLL 0
+_ACEOF
 
-	ac_lo= ac_hi=
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+{ $as_echo "$as_me:$LINENO: checking whether strerror is declared" >&5
+$as_echo_n "checking whether strerror is declared... " >&6; }
+if test "${ac_cv_have_decl_strerror+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+$ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
-test_array [0] = 0
+#ifndef strerror
+  (void) strerror;
+#endif
 
   ;
   return 0;
@@ -10462,31 +15316,55 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
+  ac_cv_have_decl_strerror=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo=`expr '(' $ac_mid ')' + 1`
+	ac_cv_have_decl_strerror=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) res_lo=$ac_lo;;
-'') result=? ;;
-esac
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror" >&5
+$as_echo "$ac_cv_have_decl_strerror" >&6; }
+if test $ac_cv_have_decl_strerror = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR 0
+_ACEOF
+
+
+fi
+
+
+
+# Checks for library functions.
+{ $as_echo "$as_me:$LINENO: checking for working strcoll" >&5
+$as_echo_n "checking for working strcoll... " >&6; }
+if test "${ac_cv_func_strcoll_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_func_strcoll_works=no
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -10494,34 +15372,13 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
-static long int longval () { return ~(size_t)0 % 10; }
-static unsigned long int ulongval () { return ~(size_t)0 % 10; }
-#include <stdio.h>
-#include <stdlib.h>
+$ac_includes_default
 int
 main ()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if ((~(size_t)0 % 10) < 0)
-    {
-      long int i = longval ();
-      if (i != (~(size_t)0 % 10))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != (~(size_t)0 % 10))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
+return (strcoll ("abc", "def") >= 0 ||
+	 strcoll ("ABC", "DEF") >= 0 ||
+	 strcoll ("123", "456") >= 0)
   ;
   return 0;
 }
@@ -10532,428 +15389,762 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  res_lo=`cat conftest.val`
+  ac_cv_func_strcoll_works=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-result=?
+ac_cv_func_strcoll_works=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.val
 
-    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
+$as_echo "$ac_cv_func_strcoll_works" >&6; }
+if test $ac_cv_func_strcoll_works = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRCOLL 1
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+
+fi
+
+
+for ac_func in vprintf
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
-test_array [0] = 0
-
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
+	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
-	cat >conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5
+$as_echo_n "checking for _doprnt... " >&6; }
+if test "${ac_cv_func__doprnt+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define _doprnt innocuous__doprnt
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char _doprnt (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef _doprnt
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char _doprnt ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub__doprnt || defined __stub____doprnt
+choke me
+#endif
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)];
-test_array [0] = 0
-
+return _doprnt ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func__doprnt=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func__doprnt=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
+$as_echo "$ac_cv_func__doprnt" >&6; }
+if test $ac_cv_func__doprnt = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DOPRNT 1
+_ACEOF
+
+fi
+
+fi
+done
+
+
+# in theory only pre-sysvr3 systems needed this and it's not likely
+# that anyone compiling new texinfo still has such a thing? we'll see.
+# AC_FUNC_SETVBUF_REVERSED
+
+
+
+
+
+
+
+
+
+for ac_func in bzero getcwd memset setlocale setvbuf sigaction sigprocmask \
+               sigsetmask strchr
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)];
-test_array [0] = 0
-
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
+	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+done
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+
+
+
+
+for ac_func in memcpy memmove strdup strerror
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
-test_array [0] = 0
-
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo=`expr '(' $ac_mid ')' + 1`
+	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  case " $LIBOBJS " in
+  *" $ac_func.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
+ ;;
+esac
+
+fi
 done
-case $ac_lo in
-?*) fits_in_uint=$ac_lo;;
-'') result=? ;;
+
+
+
+# We want to recognize djgpp to avoid the useless warning about no
+# term library.
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
 esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+
+# We need to run some of our own binaries, most notably makedoc, but as
+# long as we have this process, we also use our own makeinfo and
+# install-info.
+#
+# This means that if we are cross compiling, we have to configure the
+# package twice: once with the native compiler (this is done in a
+# subdirectory $native_tools), and once with the cross compiler.
+# The former is invoked automatically here, with --host=$build.
+# $native_tools is also added to SUBDIRS in the main Makefile.am,
+# so that make compiles the native tools first.
+#
+if test "$cross_compiling" = no; then
+  native_tools=
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  native_tools=tools
+  test -d "$native_tools" || mkdir "$native_tools"
+  confdir=`(cd "$srcdir";pwd)`
+  # Make sure the secondary configure won't fail with
+  # "error: source directory already configured".
+  rm -f config.status
+  { $as_echo "$as_me:$LINENO: Doing configure of native tools (${build})." >&5
+$as_echo "$as_me: Doing configure of native tools (${build})." >&6;}
+  cd "$native_tools" || exit 1
+  # Run secondary configure in alternate environment or
+  # it gets the wrong CC etc.
+  # env -i gives this build host configure a clean environment;
+  # consequently, we have to re-initialize $PATH.
+  env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \
+      PATH="$PATH" \
+      tools_only=1 \
+    ${confdir}/configure --build=${build} --host=${build} \
+                         --disable-rpath --disable-nls
+  cd .. || exit 1
+  { $as_echo "$as_me:$LINENO: Continuing with main configure (${host})." >&5
+$as_echo "$as_me: Continuing with main configure (${host})." >&6;}
+fi
+
+ if test "x$tools_only" = x1; then
+  TOOLS_ONLY_TRUE=
+  TOOLS_ONLY_FALSE='#'
+else
+  TOOLS_ONLY_TRUE='#'
+  TOOLS_ONLY_FALSE=
+fi
+
+
+# Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but
+# rather ncurses.  So we check for it.
+TERMLIBS=
+# Check for termlib before termcap because Solaris termcap needs libucb.
+TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo"
+for termlib in ${TERMLIB_VARIANTS}; do
+  as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
+$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-l${termlib}  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
-static long int longval () { return sizeof (size_t) <= sizeof (unsigned int); }
-static unsigned long int ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
-#include <stdio.h>
-#include <stdlib.h>
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent ();
 int
 main ()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
-    {
-      long int i = longval ();
-      if (i != (sizeof (size_t) <= sizeof (unsigned int)))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != (sizeof (size_t) <= sizeof (unsigned int)))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
+return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  fits_in_uint=`cat conftest.val`
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-result=?
+	eval "$as_ac_Lib=no"
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+  TERMLIBS="${TERMLIBS} -l${termlib}"; break
+fi
+
+done
+# don't bother warning on djgpp, it doesn't have a term library, it
+# ports each termcap-needing program separately according to its needs.
+if test -z "$TERMLIBS" && echo "$build" | grep -v djgpp >/dev/null; then
+  { $as_echo "$as_me:$LINENO: WARNING: probably need a terminal library, one of: ${TERMLIB_VARIANTS}" >&5
+$as_echo "$as_me: WARNING: probably need a terminal library, one of: ${TERMLIB_VARIANTS}" >&2;}
 fi
-rm -f conftest.val
 
-    if test "$fits_in_uint" = 1; then
-                  cat >conftest.$ac_ext <<_ACEOF
+# Checks for variables.
+# HP-UX 9 (at least) needs -lncurses which defines termcap variables PC etc.
+{ $as_echo "$as_me:$LINENO: checking for library with termcap variables" >&5
+$as_echo_n "checking for library with termcap variables... " >&6; }
+if test "${ac_cv_var_ospeed+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  oldLIBS=$LIBS
+for trylib in $termlib ${TERMLIB_VARIANTS}; do
+   if test "x$trylib" != "x$termlib"; then
+     LIBS="$oldLIBS -l$termlib -l$trylib"
+   else
+     LIBS="$oldLIBS -l$termlib"
+   fi
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
-        extern size_t foo;
-        extern unsigned long foo;
 
 int
 main ()
 {
+#ifdef HAVE_NCURSES_TERMCAP_H
+#include <ncurses/termcap.h>
+#else
+#ifdef HAVE_TERMCAP_H
+#include <termcap.h>
+#else
+#undef PC
+char *BC;
+char **UP;
+char PC;
+short ospeed;
+#endif
+#endif
+/* Make sure all variables actually exist.  AIX 4.3 has ospeed but no BC.
+   --Andreas Ley <andy@rz.uni-karlsruhe.de> 24 Aug 2000.  */
+BC++;
+UP++;
+PC++;
+return ospeed != 0;
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  fits_in_uint=0
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_var_ospeed=$trylib; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test -z "$result"; then
-      if test "$fits_in_uint" = 1; then
-        result="$res_hi$res_lo"U
-      else
-        result="$res_hi$res_lo"UL
-      fi
-    else
-            result='~(size_t)0'
-    fi
-  fi
-  { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-  if test "$result" != yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define SIZE_MAX $result
-_ACEOF
-
-  fi
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+done
+LIBS=$oldLIBS
 
+fi
 
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_var_ospeed" >&5
+$as_echo "$ac_cv_var_ospeed" >&6; }
+if test -n "$ac_cv_var_ospeed" \
+   && test "x$termlib" != "x$ac_cv_var_ospeed"; then
+  TERMLIBS="${TERMLIBS} -l${ac_cv_var_ospeed}"
+fi
+#
 
+# Do not use <ncurses/termcap.h> unless we're linking with ncurses.
+# Must come after the termlib tests.
+if test "x$termlib" = xncurses; then
+  # Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined.
 
-for ac_header in stdint.h
+for ac_header in ncurses/termcap.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10969,32 +16160,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11008,75 +16200,459 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to bug-texinfo@gnu.org ##
+## ---------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
+fi
+
+# For teTeX and TeX Live.
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+# Check whether --enable-multiplatform was given.
+if test "${enable_multiplatform+set}" = set; then
+  enableval=$enable_multiplatform;
+fi
+# if enable_multiplatform is set in the environment, use that.
+if test "x$enable_multiplatform" = xyes; then
+  test "x$bindir" = 'x${exec_prefix}/bin' && bindir="$bindir/$host"
+  test "x$libdir" = 'x${exec_prefix}/lib' && libdir="$libdir/$host"
+fi
+
+# Taken from the example in
+# http://www.gnu.org/software/automake/manual/html_node/Conditionals.html.
+# Check whether --enable-install-warnings was given.
+if test "${enable_install_warnings+set}" = set; then
+  enableval=$enable_install_warnings; case "${enableval}" in
+     yes) install_warnings=true ;;
+      no) install_warnings=false ;;
+       *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-install-warnings" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-install-warnings" >&2;}
+   { (exit 1); exit 1; }; } ;;
+   esac
+else
+  install_warnings=true
+fi
+
+ if test x"$install_warnings" = xtrue || test x"$install_warnings" = xyes; then
+  INSTALL_WARNINGS_TRUE=
+  INSTALL_WARNINGS_FALSE='#'
+else
+  INSTALL_WARNINGS_TRUE='#'
+  INSTALL_WARNINGS_FALSE=
+fi
+
+
+# i18n support.  To update to a new version of gettext, run:
+# gettextize -f -c
+
+
+  { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then
+  enableval=$enable_nls; USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi
+
+  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
+
+
+      GETTEXT_MACRO_VERSION=0.17
+
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGFMT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+    ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+    case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case "$XGETTEXT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+    ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+    rm -f messages.po
+
+    case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGMERGE+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGMERGE" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
+            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+    ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        test -n "$localedir" || localedir='${datadir}/locale'
+
+
+    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+
+
+  ac_config_commands="$ac_config_commands po-directories"
+
 
 
       if test "X$prefix" = "XNONE"; then
@@ -11118,8 +16694,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -11148,14 +16724,14 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${acl_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -11182,19 +16758,19 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${acl_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -11204,16 +16780,17 @@ case `$LD -v 2>&1 </dev/null` in
   acl_cv_prog_gnu_ld=no ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                                                { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
+
+                                                { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
 if test "${acl_cv_rpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
@@ -11223,15 +16800,17 @@ else
     acl_cv_rpath=done
 
 fi
-{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
     # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then
   enableval=$enable_rpath; :
@@ -11241,6 +16820,30 @@ fi
 
 
 
+                  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
+        esac
+      fi
+    done
+    IFS="$acl_save_IFS"
+  fi
+
+
+
+
+
+
+
 
 
 
@@ -11281,7 +16884,7 @@ if test "${with_libiconv_prefix+set}" = set; then
 
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
       fi
     fi
 
@@ -11290,6 +16893,7 @@ fi
       LIBICONV=
   LTLIBICONV=
   INCICONV=
+  LIBICONV_PREFIX=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -11323,22 +16927,52 @@ fi
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
                 fi
               fi
             fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBICONV; do
@@ -11354,21 +16988,44 @@ fi
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
                       fi
                     fi
                   fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -11379,7 +17036,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
               else
                                                                                 haveit=
@@ -11392,10 +17049,10 @@ fi
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$hardcode_direct" = yes; then
+                                if test "$acl_hardcode_direct" = yes; then
                                                       LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                                                             LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -11427,7 +17084,7 @@ fi
                     if test -z "$haveit"; then
                       LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                                                                                         LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                     else
                                                                                                                                                                                 LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
@@ -11444,8 +17101,9 @@ fi
             fi
                         additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                LIBICONV_PREFIX="$basedir"
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -11455,7 +17113,7 @@ fi
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux*) haveit=yes;;
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                     esac
                   fi
                 fi
@@ -11494,12 +17152,12 @@ fi
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux*) haveit=yes;;
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                           esac
                         fi
                       fi
@@ -11596,21 +17254,21 @@ fi
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
@@ -11629,221 +17287,6 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
-echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_ptrdiff_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef ptrdiff_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_ptrdiff_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_ptrdiff_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
-echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
-if test $ac_cv_type_ptrdiff_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define ptrdiff_t long
-_ACEOF
-
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
 
 
 
@@ -11866,58 +17309,24 @@ done
 
 
 
-for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \
-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
-__fsetlocking
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
+#include <CoreFoundation/CFPreferences.h>
 int
 main ()
 {
-return $ac_func ();
+CFPreferencesCopyAppValue(NULL, NULL)
   ;
   return 0;
 }
@@ -11928,307 +17337,154 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  gt_cv_func_CFPreferencesCopyAppValue=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_var=no"
+	gt_cv_func_CFPreferencesCopyAppValue=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
 
-  { echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
-echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl__snprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef _snprintf
-  char *p = (char *) _snprintf;
-#endif
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl__snprintf=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl__snprintf=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6; }
-  if test $ac_cv_have_decl__snprintf = yes; then
-    gt_value=1
-  else
-    gt_value=0
   fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNPRINTF $gt_value
-_ACEOF
-
-
-
-  { echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
-echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl__snwprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <CoreFoundation/CFLocale.h>
 int
 main ()
 {
-
-#ifndef _snwprintf
-  char *p = (char *) _snwprintf;
-#endif
-
+CFLocaleCopyCurrent();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl__snwprintf=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  gt_cv_func_CFLocaleCopyCurrent=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_have_decl__snwprintf=no
+	gt_cv_func_CFLocaleCopyCurrent=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6; }
-  if test $ac_cv_have_decl__snwprintf = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNWPRINTF $gt_value
-_ACEOF
-
-
-
-
-  { echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
-echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CFLOCALECOPYCURRENT 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef feof_unlocked
-  char *p = (char *) feof_unlocked;
-#endif
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_feof_unlocked=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_feof_unlocked=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6; }
-  if test $ac_cv_have_decl_feof_unlocked = yes; then
-    gt_value=1
-  else
-    gt_value=0
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
   fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FEOF_UNLOCKED $gt_value
-_ACEOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
-echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
 
-#ifndef fgets_unlocked
-  char *p = (char *) fgets_unlocked;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_fgets_unlocked=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_have_decl_fgets_unlocked=no
-fi
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6; }
-  if test $ac_cv_have_decl_fgets_unlocked = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
+    case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FGETS_UNLOCKED $gt_value
-_ACEOF
+    if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
 
 
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
 
-  { echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
-echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
+if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -12236,84 +17492,58 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
 int
 main ()
 {
-
-#ifndef getc_unlocked
-  char *p = (char *) getc_unlocked;
-#endif
-
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_getc_unlocked=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$gt_func_gnugettext_libc=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_have_decl_getc_unlocked=no
+	eval "$gt_func_gnugettext_libc=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6; }
-  if test $ac_cv_have_decl_getc_unlocked = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED $gt_value
-_ACEOF
-
-
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
-
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
-
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
-  fi
-
+ac_res=`eval 'as_val=${'$gt_func_gnugettext_libc'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
 
 
 
@@ -12344,10 +17574,10 @@ _ACEOF
   done
 
 
-  { echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
 if test "${am_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
@@ -12376,26 +17606,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   am_cv_func_iconv=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
@@ -12425,313 +17659,184 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
-
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6; }
-  else
-            CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-
-
-
-  if test "$am_cv_func_iconv" = yes; then
-    { echo "$as_me:$LINENO: checking for iconv declaration" >&5
-echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }
-    if test "${am_cv_proto_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:$LINENO: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if test "${am_cv_func_iconv_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
 
-      cat >conftest.$ac_ext <<_ACEOF
+            am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes; then
+  case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-#include <stdlib.h>
 #include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-
-int
-main ()
+#include <string.h>
+int main ()
 {
-
-  ;
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  am_cv_proto_iconv_arg1=""
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	am_cv_proto_iconv_arg1="const"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
-fi
-
-    am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    { echo "$as_me:$LINENO: result: ${ac_t:-
-         }$am_cv_proto_iconv" >&5
-echo "${ECHO_T}${ac_t:-
-         }$am_cv_proto_iconv" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define ICONV_CONST $am_cv_proto_iconv_arg1
-_ACEOF
-
-  fi
-
-
-  { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
-if test "${am_cv_langinfo_codeset+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <langinfo.h>
-int
-main ()
-{
-char* cs = nl_langinfo(CODESET);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  am_cv_langinfo_codeset=yes
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  am_cv_func_iconv_works=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	am_cv_langinfo_codeset=no
+( exit $ac_status )
+am_cv_func_iconv_works=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; }
-  if test $am_cv_langinfo_codeset = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LANGINFO_CODESET 1
-_ACEOF
 
-  fi
-
-  if test $ac_cv_header_locale_h = yes; then
-
-  { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <locale.h>
-int
-main ()
-{
-return LC_MESSAGES
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  am_cv_val_LC_MESSAGES=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	am_cv_val_LC_MESSAGES=no
-fi
+      LIBS="$am_save_LIBS"
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
-  if test $am_cv_val_LC_MESSAGES = yes; then
+{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
+#define HAVE_ICONV 1
 _ACEOF
 
   fi
-
-  fi
-
-                      for ac_prog in bison
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_INTLBISON+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$INTLBISON"; then
-  ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_INTLBISON="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-INTLBISON=$ac_cv_prog_INTLBISON
-if test -n "$INTLBISON"; then
-  { echo "$as_me:$LINENO: result: $INTLBISON" >&5
-echo "${ECHO_T}$INTLBISON" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$INTLBISON" && break
-done
-
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
+  if test "$am_cv_lib_iconv" = yes; then
+    { $as_echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
   else
-        { echo "$as_me:$LINENO: checking version of bison" >&5
-echo $ECHO_N "checking version of bison... $ECHO_C" >&6; }
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    { echo "$as_me:$LINENO: result: $ac_prog_version" >&5
-echo "${ECHO_T}$ac_prog_version" >&6; }
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
+            CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
   fi
 
 
@@ -12744,116 +17849,6 @@ echo "${ECHO_T}$ac_prog_version" >&6; }
 
 
 
-
-
-
-
-
-  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
-  enableval=$enable_nls; USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
-
-
-
-
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-    if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-
-      { echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
-echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6; }
-
-# Check whether --with-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
-  withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval
-else
-  nls_cv_force_use_gnu_gettext=no
-fi
-
-      { echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
-echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6; }
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-
-
-
-
-
-
-        { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
-if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-int
-main ()
-{
-bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  gt_cv_func_gnugettext1_libc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_gnugettext1_libc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
-
-        if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
-
-
-
     use_additional=yes
 
   acl_save_prefix="$prefix"
@@ -12889,7 +17884,7 @@ if test "${with_libintl_prefix+set}" = set; then
 
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
       fi
     fi
 
@@ -12898,6 +17893,7 @@ fi
       LIBINTL=
   LTLIBINTL=
   INCINTL=
+  LIBINTL_PREFIX=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -12931,22 +17927,52 @@ fi
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
                 fi
               fi
             fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBINTL; do
@@ -12962,21 +17988,44 @@ fi
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
                       fi
                     fi
                   fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -12987,7 +18036,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                 LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
               else
                                                                                 haveit=
@@ -13000,10 +18049,10 @@ fi
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$hardcode_direct" = yes; then
+                                if test "$acl_hardcode_direct" = yes; then
                                                       LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                                                             LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -13035,7 +18084,7 @@ fi
                     if test -z "$haveit"; then
                       LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                                                                                         LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                     else
                                                                                                                                                                                 LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
@@ -13052,8 +18101,9 @@ fi
             fi
                         additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                LIBINTL_PREFIX="$basedir"
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -13063,7 +18113,7 @@ fi
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux*) haveit=yes;;
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                     esac
                   fi
                 fi
@@ -13102,12 +18152,12 @@ fi
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux*) haveit=yes;;
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                           esac
                         fi
                       fi
@@ -13204,21 +18254,21 @@ fi
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
@@ -13230,10 +18280,15 @@ fi
     done
   fi
 
-          { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
-if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+          { $as_echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
+if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
@@ -13246,17 +18301,18 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <libintl.h>
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();
+const char *_nl_expand_alias (const char *);
 int
 main ()
 {
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
   ;
   return 0;
 }
@@ -13267,29 +18323,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  gt_cv_func_gnugettext1_libintl=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$gt_func_gnugettext_libintl=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	gt_cv_func_gnugettext1_libintl=no
+	eval "$gt_func_gnugettext_libintl=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-                        if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
+                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13298,17 +18358,18 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <libintl.h>
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();
+const char *_nl_expand_alias (const char *);
 int
 main ()
 {
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
   ;
   return 0;
 }
@@ -13319,41 +18380,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext1_libintl=yes
+                eval "$gt_func_gnugettext_libintl=yes"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
+ac_res=`eval 'as_val=${'$gt_func_gnugettext_libintl'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
         fi
 
-                                        if test "$gt_cv_func_gnugettext1_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
+                                        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
                 && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
@@ -13364,24 +18431,14 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
         fi
 
 
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-                              nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-                BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
-        LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
 
+    if test -n "$INTL_MACOSX_LIBS"; then
       if test "$gt_use_preinstalled_gnugettext" = "yes" \
          || test "$nls_cv_use_gnu_gettext" = "yes"; then
-                CATOBJEXT=.gmo
+                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
       fi
-
+    fi
 
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
@@ -13395,15 +18452,15 @@ _ACEOF
     fi
   fi
 
-  { echo "$as_me:$LINENO: checking whether to use NLS" >&5
-echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; }
-  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to use NLS" >&5
+$as_echo_n "checking whether to use NLS... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
-echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
+$as_echo_n "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         gt_source="external libintl"
       else
         gt_source="libc"
@@ -13411,18 +18468,18 @@ echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
     else
       gt_source="included intl directory"
     fi
-    { echo "$as_me:$LINENO: result: $gt_source" >&5
-echo "${ECHO_T}$gt_source" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $gt_source" >&5
+$as_echo "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-        { echo "$as_me:$LINENO: checking how to link with libintl" >&5
-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
-        { echo "$as_me:$LINENO: result: $LIBINTL" >&5
-echo "${ECHO_T}$LIBINTL" >&6; }
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        { $as_echo "$as_me:$LINENO: checking how to link with libintl" >&5
+$as_echo_n "checking how to link with libintl... " >&6; }
+        { $as_echo "$as_me:$LINENO: result: $LIBINTL" >&5
+$as_echo "$LIBINTL" >&6; }
 
   for element in $INCINTL; do
     haveit=
@@ -13464,44 +18521,106 @@ _ACEOF
   fi
 
 
-            if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-
 
+    INTLLIBS="$LIBINTL"
 
 
-        nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-        DATADIRNAME=share
-
-
-        INSTOBJEXT=.mo
 
 
-        GENCAT=gencat
 
 
-        if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
 
+# The test suite.
+ac_config_files="$ac_config_files install-info/tests/defs"
 
-        INTL_LIBTOOL_SUFFIX_PREFIX=
+ac_config_files="$ac_config_files util/defs"
 
+for ac_prog in hevea
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_HEVEA+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$HEVEA"; then
+  ac_cv_prog_HEVEA="$HEVEA" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_HEVEA="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
+fi
+fi
+HEVEA=$ac_cv_prog_HEVEA
+if test -n "$HEVEA"; then
+  { $as_echo "$as_me:$LINENO: result: $HEVEA" >&5
+$as_echo "$HEVEA" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    INTLLIBS="$LIBINTL"
 
+  test -n "$HEVEA" && break
+done
 
+for ac_prog in tex
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_TEX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$TEX"; then
+  ac_cv_prog_TEX="$TEX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_TEX="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
+fi
+fi
+TEX=$ac_cv_prog_TEX
+if test -n "$TEX"; then
+  { $as_echo "$as_me:$LINENO: result: $TEX" >&5
+$as_echo "$TEX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
+  test -n "$TEX" && break
+done
 
 
-ac_config_files="$ac_config_files Makefile doc/Makefile info/Makefile intl/Makefile lib/Makefile m4/Makefile makeinfo/Makefile makeinfo/tests/Makefile po/Makefile.in util/Makefile"
+ac_config_files="$ac_config_files Makefile doc/Makefile gnulib/lib/Makefile info/Makefile install-info/Makefile install-info/tests/Makefile lib/Makefile makeinfo/Makefile makeinfo/tests/Makefile po/Makefile.in util/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -13530,11 +18649,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -13567,12 +18687,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -13588,7 +18708,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -13600,47 +18720,87 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"GL_COND_LIBTOOL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"GL_COND_LIBTOOL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+    gl_libobjs=
+    gl_ltlibobjs=
+    if test -n "$gl_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
+        gl_libobjs="$gl_libobjs $i.$ac_objext"
+        gl_ltlibobjs="$gl_ltlibobjs $i.lo"
+      done
+    fi
+    gl_LIBOBJS=$gl_libobjs
+
+    gl_LTLIBOBJS=$gl_ltlibobjs
+
+
+
+    gltests_libobjs=
+    gltests_ltlibobjs=
+    if test -n "$gltests_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
+        gltests_libobjs="$gltests_libobjs $i.$ac_objext"
+        gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
+      done
+    fi
+    gltests_LIBOBJS=$gltests_libobjs
+
+    gltests_LTLIBOBJS=$gltests_ltlibobjs
+
+
 if test -z "${TOOLS_ONLY_TRUE}" && test -z "${TOOLS_ONLY_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"TOOLS_ONLY\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"TOOLS_ONLY\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"TOOLS_ONLY\" was never defined.
+$as_echo "$as_me: error: conditional \"TOOLS_ONLY\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${INSTALL_WARNINGS_TRUE}" && test -z "${INSTALL_WARNINGS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_WARNINGS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_WARNINGS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"INSTALL_WARNINGS\" was never defined.
+$as_echo "$as_me: error: conditional \"INSTALL_WARNINGS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -13653,7 +18813,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -13663,7 +18823,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -13685,17 +18845,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -13711,8 +18899,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -13735,7 +18921,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -13748,17 +18934,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -13780,7 +18959,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -13831,7 +19010,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -13859,7 +19038,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -13872,19 +19050,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -13909,10 +19090,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -13934,8 +19115,8 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU Texinfo $as_me 4.8, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+This file was extended by GNU Texinfo $as_me 4.12, which was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -13948,7 +19129,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -13956,7 +19137,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -13969,9 +19150,9 @@ Usage: $0 [OPTIONS] [FILE]...
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -13985,24 +19166,26 @@ $config_commands
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-GNU Texinfo config.status 4.8
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+GNU Texinfo config.status 4.12
+configured by $0, generated by GNU Autoconf 2.62,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -14024,30 +19207,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -14066,34 +19255,36 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
+    # from automake < 1.5.
     eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
     # Capture the value of LINGUAS because we need it to compute CATALOGS.
     LINGUAS="${LINGUAS-%UNSET%}"
@@ -14101,7 +19292,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -14109,20 +19300,23 @@ do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
+    "install-info/tests/defs") CONFIG_FILES="$CONFIG_FILES install-info/tests/defs" ;;
+    "util/defs") CONFIG_FILES="$CONFIG_FILES util/defs" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "gnulib/lib/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/lib/Makefile" ;;
     "info/Makefile") CONFIG_FILES="$CONFIG_FILES info/Makefile" ;;
-    "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+    "install-info/Makefile") CONFIG_FILES="$CONFIG_FILES install-info/Makefile" ;;
+    "install-info/tests/Makefile") CONFIG_FILES="$CONFIG_FILES install-info/tests/Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-    "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
     "makeinfo/Makefile") CONFIG_FILES="$CONFIG_FILES makeinfo/Makefile" ;;
     "makeinfo/tests/Makefile") CONFIG_FILES="$CONFIG_FILES makeinfo/tests/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -14163,231 +19357,143 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-MAINT!$MAINT$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-RANLIB!$RANLIB$ac_delim
-HELP2MAN!$HELP2MAN$ac_delim
-ALLOCA!$ALLOCA$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-native_tools!$native_tools$ac_delim
-TOOLS_ONLY_TRUE!$TOOLS_ONLY_TRUE$ac_delim
-TOOLS_ONLY_FALSE!$TOOLS_ONLY_FALSE$ac_delim
-TERMLIBS!$TERMLIBS$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-INSTALL_WARNINGS_TRUE!$INSTALL_WARNINGS_TRUE$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-INSTALL_WARNINGS_FALSE!$INSTALL_WARNINGS_FALSE$ac_delim
-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-USE_NLS!$USE_NLS$ac_delim
-MSGFMT!$MSGFMT$ac_delim
-GMSGFMT!$GMSGFMT$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
-MSGMERGE!$MSGMERGE$ac_delim
-GLIBC21!$GLIBC21$ac_delim
-HAVE_POSIX_PRINTF!$HAVE_POSIX_PRINTF$ac_delim
-HAVE_ASPRINTF!$HAVE_ASPRINTF$ac_delim
-HAVE_SNPRINTF!$HAVE_SNPRINTF$ac_delim
-HAVE_WPRINTF!$HAVE_WPRINTF$ac_delim
-LIBICONV!$LIBICONV$ac_delim
-LTLIBICONV!$LTLIBICONV$ac_delim
-INTLBISON!$INTLBISON$ac_delim
-BUILD_INCLUDED_LIBINTL!$BUILD_INCLUDED_LIBINTL$ac_delim
-USE_INCLUDED_LIBINTL!$USE_INCLUDED_LIBINTL$ac_delim
-CATOBJEXT!$CATOBJEXT$ac_delim
-DATADIRNAME!$DATADIRNAME$ac_delim
-INSTOBJEXT!$INSTOBJEXT$ac_delim
-GENCAT!$GENCAT$ac_delim
-INTLOBJS!$INTLOBJS$ac_delim
-INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
-LTLIBINTL!$LTLIBINTL$ac_delim
-POSUB!$POSUB$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -14403,19 +19509,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    prefix = substr(line, 1, index(line, defundef) - 1)
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", line, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -14444,26 +19664,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -14473,7 +19705,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14499,7 +19731,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -14508,7 +19740,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14529,17 +19761,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -14577,14 +19809,20 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -14593,13 +19831,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -14613,15 +19852,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -14630,136 +19870,77 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14779,8 +19960,8 @@ echo X$ac_file |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -14794,14 +19975,15 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
+$as_echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14845,7 +20027,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
+$as_echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14871,7 +20053,7 @@ echo X"$file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -14880,7 +20062,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14901,15 +20083,15 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
   done
 done
  ;;
-    "default-1":C)
+    "po-directories":C)
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
       case "$ac_file" in
@@ -14929,6 +20111,9 @@ done
           /*) top_srcdir="$ac_given_srcdir" ;;
           *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
         esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
@@ -14942,12 +20127,13 @@ done
             if test -n "$OBSOLETE_ALL_LINGUAS"; then
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -15028,6 +20214,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -15049,4 +20240,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
diff --git a/Build/source/utils/texinfo/configure.ac b/Build/source/utils/texinfo/configure.ac
index d6c9a8bb6ad..ef15831fbe9 100644
--- a/Build/source/utils/texinfo/configure.ac
+++ b/Build/source/utils/texinfo/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.50 2004/12/22 13:29:44 karl Exp $
+# $Id: configure.ac,v 1.87 2008/04/17 17:54:16 karl Exp $
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,12 +9,18 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-AC_PREREQ(2.59)# Minimum Autoconf version required.
-#
-AC_INIT([GNU Texinfo], [4.8])
-AC_CONFIG_HEADERS(config.h:config.in)# Keep filename to 8.3 for MS-DOS.
+AC_INIT([GNU Texinfo], [4.12], [bug-texinfo@gnu.org])
+
+dnl Must come before AM_INIT_AUTOMAKE.
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-lzma])
+
+# Minimum Autoconf version required.
+AC_PREREQ(2.59)
+
+# Where to generate output; srcdir location.
+AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
 AC_CONFIG_SRCDIR([makeinfo/makeinfo.c])
-AM_INIT_AUTOMAKE([dist-bzip2])
 
 # When the Texinfo source is imported into other repositories
 # (NetBSD and TeX Live), timestamps are generally not preserved.  This
@@ -23,17 +29,25 @@ AM_MAINTAINER_MODE
 
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_GCC_TRADITIONAL
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
+
+# Since we use gnulib: gl_EARLY must be called as soon as possible after
+# the C compiler is checked.  The others could be later, but we just
+# keep everything together.
+gl_EARLY
+
+dnl Rest of Gnulib.
+gl_INIT
+
+
+# Since we make a helper library.
 AC_PROG_RANLIB
 AM_MISSING_PROG(HELP2MAN, help2man)
 
-AC_ISC_POSIX
-AC_MINIX
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 
 # Needed on sysV68 for sigblock, sigsetmask.  But check for it in libc first.
-AC_CHECK_FUNC(sigblock, , AC_CHECK_LIB(bsd, sigblock))
+AC_CHECK_FUNC(sigblock, , [AC_CHECK_LIB(bsd, sigblock)])
 
 # Checks for header files.
 AC_HEADER_STAT
@@ -62,19 +76,15 @@ AC_STRUCT_TM
 AC_CHECK_DECLS([memchr, strcoll, strerror])
 
 # Checks for library functions.
-AC_FUNC_ALLOCA
 AC_FUNC_STRCOLL
 AC_FUNC_VPRINTF
 # in theory only pre-sysvr3 systems needed this and it's not likely
 # that anyone compiling new texinfo still has such a thing? we'll see.
 # AC_FUNC_SETVBUF_REVERSED
-AC_CHECK_FUNCS(bzero getcwd memset setvbuf sigaction sigprocmask \
+AC_CHECK_FUNCS(bzero getcwd memset setlocale setvbuf sigaction sigprocmask \
                sigsetmask strchr)
 AC_REPLACE_FUNCS(memcpy memmove strdup strerror)
 
-# strcasecmp and strncasecmp, gnulib-style.
-gl_STRCASE
-
 # We want to recognize djgpp to avoid the useless warning about no
 # term library.
 AC_CANONICAL_BUILD
@@ -82,7 +92,7 @@ AC_CANONICAL_BUILD
 # We need to run some of our own binaries, most notably makedoc, but as
 # long as we have this process, we also use our own makeinfo and
 # install-info.
-# 
+#
 # This means that if we are cross compiling, we have to configure the
 # package twice: once with the native compiler (this is done in a
 # subdirectory $native_tools), and once with the cross compiler.
@@ -102,10 +112,11 @@ else
   AC_MSG_NOTICE([[Doing configure of native tools (${build}).]])
   cd "$native_tools" || exit 1
   # Run secondary configure in alternate environment or
-  # it gets the wrong CC etc.  env -i gives this build host configure
-  # a clean environment.
-  env -i CC="${BUILD_CC}" AR="${BUILD_AR}" RANLIB="${BUILD_RANLIB}" \
-      PATH="${PATH}" \
+  # it gets the wrong CC etc.
+  # env -i gives this build host configure a clean environment;
+  # consequently, we have to re-initialize $PATH.
+  env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \
+      PATH="$PATH" \
       tools_only=1 \
     ${confdir}/configure --build=${build} --host=${build} \
                          --disable-rpath --disable-nls
@@ -134,15 +145,14 @@ fi
 # HP-UX 9 (at least) needs -lncurses which defines termcap variables PC etc.
 AC_MSG_CHECKING(for library with termcap variables)
 AC_CACHE_VAL(ac_cv_var_ospeed,
-oldLIBS=$LIBS
+[oldLIBS=$LIBS
 for trylib in $termlib ${TERMLIB_VARIANTS}; do
    if test "x$trylib" != "x$termlib"; then
      LIBS="$oldLIBS -l$termlib -l$trylib"
    else
      LIBS="$oldLIBS -l$termlib"
    fi
-   AC_TRY_LINK(,
-[#ifdef HAVE_NCURSES_TERMCAP_H
+   AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[#ifdef HAVE_NCURSES_TERMCAP_H
 #include <ncurses/termcap.h>
 #else
 #ifdef HAVE_TERMCAP_H
@@ -161,10 +171,10 @@ BC++;
 UP++;
 PC++;
 return ospeed != 0;
-], ac_cv_var_ospeed=$trylib; break)
+]])], [ac_cv_var_ospeed=$trylib; break])
 done
 LIBS=$oldLIBS
-)
+])
 AC_MSG_RESULT($ac_cv_var_ospeed)
 if test -n "$ac_cv_var_ospeed" \
    && test "x$termlib" != "x$ac_cv_var_ospeed"; then
@@ -179,9 +189,6 @@ if test "x$termlib" = xncurses; then
   AC_CHECK_HEADERS(ncurses/termcap.h)
 fi
 
-# gnulib.
-gl_FUNC_MKSTEMP
-
 # For teTeX and TeX Live.
 AC_CANONICAL_HOST
 AC_ARG_ENABLE([multiplatform],
@@ -207,17 +214,24 @@ AM_CONDITIONAL(INSTALL_WARNINGS,
    test x"$install_warnings" = xtrue || test x"$install_warnings" = xyes)
 
 # i18n support.  To update to a new version of gettext, run:
-# gettextize -f -c --intl
-AM_GNU_GETTEXT_VERSION(0.14.1)
-AM_GNU_GETTEXT()
+# gettextize -f -c
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
+
+# The test suite.
+AC_CONFIG_FILES([install-info/tests/defs])
+AC_CONFIG_FILES([util/defs])
+AC_CHECK_PROGS([HEVEA], [hevea], [])
+AC_CHECK_PROGS([TEX], [tex], [])
 
 AC_CONFIG_FILES([
   Makefile
   doc/Makefile
+  gnulib/lib/Makefile
   info/Makefile
-  intl/Makefile
+  install-info/Makefile
+  install-info/tests/Makefile
   lib/Makefile
-  m4/Makefile
   makeinfo/Makefile
   makeinfo/tests/Makefile
   po/Makefile.in
diff --git a/Build/source/utils/texinfo/djgpp/config.bat b/Build/source/utils/texinfo/djgpp/config.bat
index 3b000ee6dc2..f5dffc454c4 100755
--- a/Build/source/utils/texinfo/djgpp/config.bat
+++ b/Build/source/utils/texinfo/djgpp/config.bat
@@ -76,11 +76,11 @@ if not "%1" == "" goto arg_loop
 set SPECARG=

 

 Rem Create a response file for the configure script.

-echo --srcdir=%XSRC% > arguments

-if "%CACHE%" == "enabled"    echo --config-cache >>arguments

-if "%DEPTRAK%" == "enabled"  echo --enable-dependency-tracking >>arguments

-if "%DEPTRAK%" == "disabled" echo --disable-dependency-tracking >>arguments

-if not "%ARGS%" == ""        echo %ARGS% >>arguments

+echo --srcdir=%XSRC% > args

+if "%CACHE%" == "enabled"    echo --config-cache >> args

+if "%DEPTRAK%" == "enabled"  echo --enable-dependency-tracking >> args

+if "%DEPTRAK%" == "disabled" echo --disable-dependency-tracking >> args

+if not "%ARGS%" == ""        echo %ARGS% >> args

 set ARGS=

 set CACHE=

 set DEPTRAK=

@@ -88,16 +88,16 @@ set DEPTRAK=
 if "%XSRC%" == "." goto in_place

 

 :not_in_place

-redir -e /dev/null update %XSRC%/configure.orig ./configure

+redir -e /dev/null update %XSRC%/configure.org ./configure

 test -f ./configure

 if errorlevel 1 update %XSRC%/configure ./configure

 

 :in_place

 Rem Update configuration files

 echo Updating configuration scripts...

-test -f ./configure.orig

-if errorlevel 1 update configure configure.orig

-sed -f %XSRC%/djgpp/config.sed configure.orig > configure

+test -f ./configure.org

+if errorlevel 1 update configure configure.org

+sed -f %XSRC%/djgpp/config.sed configure.org > configure

 if errorlevel 1 goto sed_error

 

 Rem Make sure they have a config.site file

@@ -185,30 +185,27 @@ if not errorlevel 0 goto missing_NLS_tools
 

 Rem Recreate the files in the %XSRC%/po subdir with our ported tools.

 redir -e /dev/null rm %XSRC%/po/*.gmo

-redir -e /dev/null rm %XSRC%/po/diffutil*.pot

+redir -e /dev/null rm %XSRC%/po/texinfo*.pot

 redir -e /dev/null rm %XSRC%/po/cat-id-tbl.c

 redir -e /dev/null rm %XSRC%/po/stamp-cat-id

 

 Rem Update the arguments file for the configure script.

 Rem We prefer without-included-gettext because libintl.a from gettext package

 Rem is the only one that is guaranteed to have been ported to DJGPP.

-echo --enable-nls --without-included-gettext >> arguments

+echo --enable-nls --without-included-gettext >> args

 goto configure_package

 

 :missing_NLS_tools

 echo Needed libs/tools for NLS not found.  Configuring without NLS.

 :without_NLS

 Rem Update the arguments file for the configure script.

-echo --disable-nls >> arguments

+echo --disable-nls >> args

 

 :configure_package

 echo Running the ./configure script...

-sh ./configure @arguments

+sh ./configure @args

 if errorlevel 1 goto cfg_error

-rm arguments

-

-Rem Remove files created by the gl_FUNC_MKSTEMP test.

-rm co*.tmp

+rm args

 echo Done.

 goto End

 

diff --git a/Build/source/utils/texinfo/djgpp/config.sed b/Build/source/utils/texinfo/djgpp/config.sed
index c4193df0fbd..965e31ca48e 100644
--- a/Build/source/utils/texinfo/djgpp/config.sed
+++ b/Build/source/utils/texinfo/djgpp/config.sed
@@ -1,25 +1,37 @@
-# Additional editing of configure and Makefiles for DJGPP
+# DJGPP specific configuration file.
+# Sed script for additional DJGPP specific editing
+# of the configure script generated by autoconf 2.62.
 
-/(echo[ 	]*':t/ a\
+
+# Additional editing of Makefiles
+/^eval sed.*ac_file_inputs.*tmp\/out \\$/ {
+:loop
+n
+/^$/!b loop
+a\
+cat > "$tmp/subs-djgpp.sed" << eof_djgpp\
 # DJGPP specific Makefile changes.\
-  /^aliaspath *	*=/s,:,";",g;t t\
-  /TEXINPUTS=/s,:,";",g;t t\
-  /PATH=/s,:,";",g;t t\
-  s,\\.deps,_deps,g;t t\
-  s,\\.new\\.,_new.,g;t t\
-  s,\\.old\\.,_old.,g;t t\
-  s,\\.tab\\.,_tab.,g;t t\
-  s,Makefile\\.in\\.in,Makefile.in-in,g;t t\
-  s,Makefile\\.am\\.in,Makefile.am-in,g;t t\
-  /^install-info-am:/,/^$/ {\
-    /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\
-    s,\\(\\\$\\\$d/\\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$d/\\$\\$file[0-9] \\$\\$d/\\$\\$file[0-9][0-9]\\2,\
-    s,\\( \\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\
-  }\
-  /^uninstall-info-am:/,/^$/ {\
-    /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\
-    s,\\(file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\
-  }
+s,\\.deps,_deps,g\
+s,\\.libs,_libs,g\
+s,\\.new\\.,_new.,g\
+s,\\.old\\.,_old.,g\
+s,\\.tab\\.,_tab.,g\
+s,Makefile\\.am\\.in,Makefile.am-in,g\
+s,Makefile\\.in\\.in,Makefile.in-in,g\
+/^install-info-am:/,/^$/ {\
+  /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\
+  s,\\(\\\$\\\$d/\\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$d/\\$\\$file[0-9] \\$\\$d/\\$\\$file[0-9][0-9]\\2,\
+  s,\\( \\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\
+}\
+/^uninstall-info-am:/,/^$/ {\
+  /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\
+  s,\\(file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\
+}\
+eof_djgpp\
+sed -f "\$tmp/subs-djgpp.sed" \$tmp/out > \$tmp/out.djgpp\
+mv -f \$tmp/out.djgpp \$tmp/out
+}
+
 
 # Makefile.in.in is renamed to Makefile.in-in.
 /ac_config_files=/,/_ACEOF/ {
@@ -27,18 +39,19 @@
 }
 /CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2
 
-# We always use _deps instead of .deps, because the latter is an
-# invalid name on 8+3 MS-DOS filesystem.  This makes the generated
-# Makefiles good for every DJGPP installation, not only the one
-# where the package was configured (which could happen to be a
-# Windows box, where leading dots in file names are allowed).
-s,\.deps,_deps,g
+# We always use _deps and _libs instead of .deps and .libs, because
+# the latter is an invalid name on 8+3 MS-DOS file system.  This makes
+# the generated Makefiles good for every DJGPP installation, not only
+# the one where the package was configured (which could happen to be
+# a Windows box, where leading dots in file names are allowed).
+/^rmdir[	 ]*\.tst/ i\
+am__leading_dot=_
 
 # The following two items are changes needed for configuring
 # and compiling across partitions.
 # The given srcdir value is always translated from the
 # "x:" syntax into "/dev/x" syntax while we run configure.
-/^[ 	]*-srcdir=\*.*$/ a\
+/^[	 ]*-srcdir=\*.*$/ a\
     ac_optarg=`echo "$ac_optarg" | sed "s,^\\([A-Za-z]\\):,/dev/\\1,"`
 /set X `ls -Lt \$srcdir/ i\
    if `echo $srcdir | grep "^/dev/" - > /dev/null`; then\
@@ -51,10 +64,28 @@ s,\.deps,_deps,g
 # the package has not been configured for.
 /MISSING=/,/^$/ {
   /^fi$/ a\
-am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
+am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%'`
 }
 /^install_sh=/a\
-install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
+install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%'`
+
+# On DOS/WIN systems every partition has its own root directory,
+# so do not make any assumptions about absolute paths or the
+# configure script and the generated Makefiles will only be
+# good for the system where the package has been configured for.
+/^ac_abs_srcdir=/ i\
+ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"`\
+ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`\
+ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`
+#ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"`
+/^ac_abs_srcdir=/ a\
+for dj_dir in $ac_abs_builddir $ac_abs_top_builddir $ac_abs_top_srcdir $ac_abs_srcdir\
+do\
+  ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%//%/%g"`\
+  ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%//%/%g"`\
+  ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%//%/%g"`\
+  ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%//%/%g"`\
+done
 
 # The following makes sure we are not going to remove a directory
 # which is the cwd on its drive (DOS doesn't allow to remove such
@@ -65,3 +96,9 @@ install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\
 # AC_CONFIG_LINKS fails if the source and destination are on
 # different file systems and symlinks don't work.
 /^    ln \$srcdir/s%||%|| cp -pf $srcdir/$ac_source $ac_dest ||%
+
+# The CR test for awk does not work for DJGPP.
+/^ac_cs_awk_cr=/,/^$/ {
+  /^fi$/ a\
+ac_cs_awk_cr=$ac_cr
+}
diff --git a/Build/source/utils/texinfo/djgpp/config.site b/Build/source/utils/texinfo/djgpp/config.site
index c7768b11f06..c8a112360ec 100644
--- a/Build/source/utils/texinfo/djgpp/config.site
+++ b/Build/source/utils/texinfo/djgpp/config.site
@@ -44,6 +44,15 @@ NM=${NM='nm'}
 LD=${LD='ld'}
 MAKEINFO=${MAKEINFO='makeinfo'}
 
+# A sane default for mkdir.
+ac_cv_path_mkdir=${MKDIR_P='/dev/env/DJDIR/bin/mkdir -p'}
+
+# A sane default for grep.
+ac_cv_path_GREP=${GREP='/dev/env/DJDIR/bin/grep'}
+
+# A sane default for egrep.
+ac_cv_path_EGREP=${EGREP='/dev/env/DJDIR/bin/egrep'}
+
 # Force the test for 'ln -s' to report 'cp -pf'.
 ac_cv_prog_LN_S='cp -pf'
 
diff --git a/Build/source/utils/texinfo/doc/Makefile.am b/Build/source/utils/texinfo/doc/Makefile.am
index 5e36cb74c86..e4182c4b358 100644
--- a/Build/source/utils/texinfo/doc/Makefile.am
+++ b/Build/source/utils/texinfo/doc/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.20 2004/11/18 01:10:59 karl Exp $
+# $Id: Makefile.am,v 1.37 2008/03/25 10:51:19 akim Exp $
 # Makefile.am for texinfo/doc.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -14,19 +14,23 @@
 info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
 DISTCLEANFILES = texinfo texinfo-* info*.info*
 
-man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \
+man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1  \
            info.5 texinfo.5
 
 # Use the programs built in our distribution, taking account of possible
 # cross-compiling.
 MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
-INSTALL_INFO = $(top_builddir)/$(native_tools)/util/install-info
+
+# We'd also like to use something like this, but Automake calls
+# "install-info" directly.
+# INSTALL_INFO = $(top_builddir)/$(native_tools)/util/ginstall-info
 
 TXI_XLATE = txi-cs.tex txi-de.tex txi-en.tex txi-es.tex txi-fr.tex \
-	    txi-it.tex txi-nl.tex txi-no.tex txi-pl.tex txi-pt.tex txi-tr.tex
+	    txi-it.tex txi-nl.tex txi-nb.tex txi-pl.tex txi-pt.tex \
+	    txi-ru.tex txi-sr.tex txi-tr.tex txi-uk.tex
 
 # Include our texinfo.tex, not Automake's.
-EXTRA_DIST = epsf.tex pdfcolor.tex texinfo.tex \
+EXTRA_DIST = epsf.tex texinfo.tex \
              fdl.texi \
 	     $(man_MANS) $(TXI_XLATE)
 
@@ -41,40 +45,80 @@ install-data-local:
 	@echo "         See doc/README for some considerations."
 	@echo "         You can run make TEXMF=/your/texmf install-tex to do this."
 	@echo
-	@echo "         You may also need to install epsf.tex and (if you"
-	@echo "         use pdftex) pdfcolor.tex in TEXMF/tex/generic/dvips"
-	@echo "         and TEXMF/pdftex/plain/misc/pdfcolor.tex respectively,"
-	@echo "         if your TeX installation did not include them."
+	@echo "         You may also need to install epsf.tex in"
+	@echo "         TEXMF/tex/generic/dvips, if your TeX"
+	@echo "         installation did not include it."
 endif
 
 texmf_texinfo = $(TEXMF)/tex/texinfo
 texmf_dvips = $(TEXMF)/tex/generic/epsf
-texmf_pdftex_misc = $(TEXMF)/tex/plain/pdfcolor
 install-tex:
 	test -n "$(TEXMF)" || (echo "TEXMF must be set." >&2; exit 1)
-	$(mkinstalldirs) $(DESTDIR)$(texmf_texinfo) $(DESTDIR)$(texmf_dvips) $(DESTDIR)$(texmf_pdftex_misc)
+	$(mkinstalldirs) $(DESTDIR)$(texmf_texinfo) $(DESTDIR)$(texmf_dvips)
 	$(INSTALL_DATA) $(srcdir)/texinfo.tex $(DESTDIR)$(texmf_texinfo)/texinfo.tex
 	$(INSTALL_DATA) $(srcdir)/epsf.tex $(DESTDIR)$(texmf_dvips)/epsf.tex
-	$(INSTALL_DATA) $(srcdir)/pdfcolor.tex $(DESTDIR)$(texmf_pdftex_misc)/pdfcolor.tex
 	for f in $(TXI_XLATE); do \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done
 
 # The man pages depend on the --help strings and the version number.
-if MAINTAINER_MODE
 common_mandeps = $(top_srcdir)/configure.ac
-info.1: $(top_srcdir)/info/info.c $(common_mandeps)
-	$(HELP2MAN) --name="read Info documents" `basename $@ .1` >$@
-infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
-	$(HELP2MAN) --name="compile customizations for Info" `basename $@ .1` >$@
-install-info.1: $(top_srcdir)/util/install-info.c $(common_mandeps)
-	$(HELP2MAN) --name="update info/dir entries" `basename $@ .1` >$@
-makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
-	$(HELP2MAN) --name="translate Texinfo documents" `basename $@ .1` >$@
-texi2dvi.1: $(top_srcdir)/util/texi2dvi $(common_mandeps)
-	$(HELP2MAN) --name="print Texinfo documents" `basename $@ .1` >$@
-texindex.1: $(top_srcdir)/util/texindex.c $(common_mandeps)
-	$(HELP2MAN) --name="sort Texinfo index files" `basename $@ .1` >$@
-endif
+
+# Set up the variables:
+man_rule_0 = \
+	program=`expr '/$@' : '.*/\(.*\)\.1'` && \
+	case $$program in makeinfo) dir=makeinfo;; info*) dir=info;; \
+	        *install-info) dir=install-info;; *) dir=util;; esac && \
+	dir="$(top_builddir)/$(native_tools)/$$dir" && \
+	case $$program in info|install-info) program=g$$program;; \
+		esac
+
+# Update the manpage for a binary program; set up the variables,
+# make sure the binary is up-to-date and then generate the man page.
+man_rule_bin = echo "Updating man page $@" && \
+	$(man_rule_0) && \
+	echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT) && \
+	    (cd "$$dir"  &&  $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT)) && \
+	echo $(HELP2MAN) --name=\""$$name"\" "$$dir/$$program" -o '$@' && \
+	     $(HELP2MAN) --name="$$name"     "$$dir/$$program" -o '$@'
+
+$(srcdir)/info.1: $(top_srcdir)/info/info.c $(common_mandeps)
+	@name="read Info documents" && $(man_rule_bin)
+$(srcdir)/infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
+	@name="compile customizations for Info" && $(man_rule_bin)
+$(srcdir)/install-info.1: $(top_srcdir)/install-info/install-info.c $(common_mandeps)
+	@name="update info/dir entries" && $(man_rule_bin)
+
+# Here we need some postprocessing:
+$(srcdir)/makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
+	@name="translate Texinfo documents" && $(man_rule_bin)
+	mv $@ $@.tmp
+	sed '/^\.IP$$/N;/\nAlso/s/I//;/\nThe/s/I//' $@.tmp >$@
+	rm $@.tmp
+
+$(srcdir)/texindex.1: $(util_srcdir)/texindex.c $(common_mandeps)
+	@name="sort Texinfo index files" && $(man_rule_bin)
+
+
+## ---------- ##
+## texi2dvi.  ##
+## ---------- ##
+
+man_MANS += texi2dvi.1 texi2pdf.1 pdftexi2dvi.1
+util_srcdir = $(top_srcdir)/util
+# Do not depend on the current user's settings.
+unset_envvars = unset TEXI2DVI_BUILD_MODE; unset TEXI2DVI_BUILD_DIRECTORY
+
+common_texi2dvi_deps = $(common_mandeps) \
+                       $(util_srcdir)/texi2dvi $(util_srcdir)/texi2pdf
+
+$(srcdir)/texi2dvi.1: $(common_texi2dvi_deps)
+	$(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to DVI" $(util_srcdir)/texi2dvi >$@
+
+$(srcdir)/texi2pdf.1: $(common_texi2dvi_deps)
+	$(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@
+
+$(srcdir)/pdftexi2dvi.1:  $(common_texi2dvi_deps)
+	$(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@
 
 # Do not create info files for distribution.
 dist-info:
diff --git a/Build/source/utils/texinfo/doc/Makefile.in b/Build/source/utils/texinfo/doc/Makefile.in
index 41dbf34a7cf..f43ae4c68cf 100644
--- a/Build/source/utils/texinfo/doc/Makefile.in
+++ b/Build/source/utils/texinfo/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am,v 1.20 2004/11/18 01:10:59 karl Exp $
+# $Id: Makefile.am,v 1.37 2008/03/25 10:51:19 akim Exp $
 # Makefile.am for texinfo/doc.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -25,15 +25,11 @@
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -50,35 +46,75 @@ host_triplet = @host@
 subdir = doc
 DIST_COMMON = README $(info_TEXINFOS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/stamp-1 $(srcdir)/stamp-vti \
-	$(srcdir)/version-stnd.texi $(srcdir)/version.texi mdate-sh \
-	texinfo.tex
+	$(srcdir)/version-stnd.texi $(srcdir)/version.texi texinfo.tex
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
-	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \
-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mkstemp.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/onceonly_2_57.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
+	$(top_srcdir)/gnulib/m4/argz.m4 \
+	$(top_srcdir)/gnulib/m4/codeset.m4 \
+	$(top_srcdir)/gnulib/m4/eealloc.m4 \
+	$(top_srcdir)/gnulib/m4/environ.m4 \
+	$(top_srcdir)/gnulib/m4/error.m4 \
+	$(top_srcdir)/gnulib/m4/exitfail.m4 \
+	$(top_srcdir)/gnulib/m4/extensions.m4 \
+	$(top_srcdir)/gnulib/m4/getopt.m4 \
+	$(top_srcdir)/gnulib/m4/gettext.m4 \
+	$(top_srcdir)/gnulib/m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib/m4/glibc21.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib/m4/iconv.m4 \
+	$(top_srcdir)/gnulib/m4/include_next.m4 \
+	$(top_srcdir)/gnulib/m4/inline.m4 \
+	$(top_srcdir)/gnulib/m4/intlmacosx.m4 \
+	$(top_srcdir)/gnulib/m4/lib-ld.m4 \
+	$(top_srcdir)/gnulib/m4/lib-link.m4 \
+	$(top_srcdir)/gnulib/m4/lib-prefix.m4 \
+	$(top_srcdir)/gnulib/m4/localcharset.m4 \
+	$(top_srcdir)/gnulib/m4/longlong.m4 \
+	$(top_srcdir)/gnulib/m4/malloc.m4 \
+	$(top_srcdir)/gnulib/m4/malloca.m4 \
+	$(top_srcdir)/gnulib/m4/mbchar.m4 \
+	$(top_srcdir)/gnulib/m4/mbiter.m4 \
+	$(top_srcdir)/gnulib/m4/mbrtowc.m4 \
+	$(top_srcdir)/gnulib/m4/mbscasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbsncasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbstate_t.m4 \
+	$(top_srcdir)/gnulib/m4/mbswidth.m4 \
+	$(top_srcdir)/gnulib/m4/memchr.m4 \
+	$(top_srcdir)/gnulib/m4/memcpy.m4 \
+	$(top_srcdir)/gnulib/m4/memmove.m4 \
+	$(top_srcdir)/gnulib/m4/mkstemp.m4 \
+	$(top_srcdir)/gnulib/m4/nls.m4 \
+	$(top_srcdir)/gnulib/m4/onceonly.m4 \
+	$(top_srcdir)/gnulib/m4/po.m4 \
+	$(top_srcdir)/gnulib/m4/progtest.m4 \
+	$(top_srcdir)/gnulib/m4/setenv.m4 \
+	$(top_srcdir)/gnulib/m4/stdbool.m4 \
+	$(top_srcdir)/gnulib/m4/stdint.m4 \
+	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
+	$(top_srcdir)/gnulib/m4/strdup.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
+	$(top_srcdir)/gnulib/m4/string_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_time_h.m4 \
+	$(top_srcdir)/gnulib/m4/tempname.m4 \
+	$(top_srcdir)/gnulib/m4/unistd_h.m4 \
+	$(top_srcdir)/gnulib/m4/wchar.m4 \
+	$(top_srcdir)/gnulib/m4/wchar_t.m4 \
+	$(top_srcdir)/gnulib/m4/wctype.m4 \
+	$(top_srcdir)/gnulib/m4/wcwidth.m4 \
+	$(top_srcdir)/gnulib/m4/wint_t.m4 \
+	$(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 INFO_DEPS = texinfo info-stnd.info info.info
-am__TEXINFO_TEX_DIR = $(srcdir)
+TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
+am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
 DVIS = texinfo.dvi info-stnd.dvi info.dvi
 PDFS = texinfo.pdf info-stnd.pdf info.pdf
 PSS = texinfo.ps info-stnd.ps info.ps
@@ -91,6 +127,12 @@ AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
 DVIPS = dvips
 am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man5dir)"
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 man1dir = $(mandir)/man1
 man5dir = $(mandir)/man5
 NROFF = nroff
@@ -98,22 +140,24 @@ MANS = $(man_MANS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+ARGZ_H = @ARGZ_H@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -121,44 +165,158 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
+GETOPT_H = @GETOPT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_IO_H = @HAVE_IO_H@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRNDUP = @HAVE_STRNDUP@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRSEP = @HAVE_STRSEP@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNSETENV = @HAVE_UNSETENV@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
+HEVEA = @HEVEA@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@
-INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 
 # Use the programs built in our distribution, taking account of possible
 # cross-compiling.
 MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -168,20 +326,50 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
 RANLIB = @RANLIB@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDINT_H = @STDINT_H@
 STRIP = @STRIP@
+SYS_STAT_H = @SYS_STAT_H@
+SYS_TIME_H = @SYS_TIME_H@
 TERMLIBS = @TERMLIBS@
-TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@
-TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+TEX = @TEX@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VOID_UNSETENV = @VOID_UNSETENV@
+WCHAR_H = @WCHAR_H@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WCTYPE_H = @WCTYPE_H@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,11 +381,16 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -221,31 +414,63 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 # Put texinfo.txi first because that's the most important.
 info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
 DISTCLEANFILES = texinfo texinfo-* info*.info*
-man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \
-           info.5 texinfo.5
+man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 \
+	info.5 texinfo.5 texi2dvi.1 texi2pdf.1 pdftexi2dvi.1
 
-INSTALL_INFO = $(top_builddir)/$(native_tools)/util/install-info
+# We'd also like to use something like this, but Automake calls
+# "install-info" directly.
+# INSTALL_INFO = $(top_builddir)/$(native_tools)/util/ginstall-info
 TXI_XLATE = txi-cs.tex txi-de.tex txi-en.tex txi-es.tex txi-fr.tex \
-	    txi-it.tex txi-nl.tex txi-no.tex txi-pl.tex txi-pt.tex txi-tr.tex
+	    txi-it.tex txi-nl.tex txi-nb.tex txi-pl.tex txi-pt.tex \
+	    txi-ru.tex txi-sr.tex txi-tr.tex txi-uk.tex
 
 
 # Include our texinfo.tex, not Automake's.
-EXTRA_DIST = epsf.tex pdfcolor.tex texinfo.tex \
+EXTRA_DIST = epsf.tex texinfo.tex \
              fdl.texi \
 	     $(man_MANS) $(TXI_XLATE)
 
 texmf_texinfo = $(TEXMF)/tex/texinfo
 texmf_dvips = $(TEXMF)/tex/generic/epsf
-texmf_pdftex_misc = $(TEXMF)/tex/plain/pdfcolor
 
 # The man pages depend on the --help strings and the version number.
-@MAINTAINER_MODE_TRUE@common_mandeps = $(top_srcdir)/configure.ac
+common_mandeps = $(top_srcdir)/configure.ac
+
+# Set up the variables:
+man_rule_0 = \
+	program=`expr '/$@' : '.*/\(.*\)\.1'` && \
+	case $$program in makeinfo) dir=makeinfo;; info*) dir=info;; \
+	        *install-info) dir=install-info;; *) dir=util;; esac && \
+	dir="$(top_builddir)/$(native_tools)/$$dir" && \
+	case $$program in info|install-info) program=g$$program;; \
+		esac
+
+
+# Update the manpage for a binary program; set up the variables,
+# make sure the binary is up-to-date and then generate the man page.
+man_rule_bin = echo "Updating man page $@" && \
+	$(man_rule_0) && \
+	echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT) && \
+	    (cd "$$dir"  &&  $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT)) && \
+	echo $(HELP2MAN) --name=\""$$name"\" "$$dir/$$program" -o '$@' && \
+	     $(HELP2MAN) --name="$$name"     "$$dir/$$program" -o '$@'
+
+util_srcdir = $(top_srcdir)/util
+# Do not depend on the current user's settings.
+unset_envvars = unset TEXI2DVI_BUILD_MODE; unset TEXI2DVI_BUILD_DIRECTORY
+common_texi2dvi_deps = $(common_mandeps) \
+                       $(util_srcdir)/texi2dvi $(util_srcdir)/texi2pdf
+
 all: all-am
 
 .SUFFIXES:
@@ -324,7 +549,7 @@ texinfo.html: texinfo.txi $(srcdir)/version.texi
 $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti
 $(srcdir)/stamp-vti: texinfo.txi $(top_srcdir)/configure
 	@(dir=.; test -f ./texinfo.txi || dir=$(srcdir); \
-	set `$(SHELL) $(srcdir)/mdate-sh $$dir/texinfo.txi`; \
+	set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/texinfo.txi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
@@ -385,7 +610,7 @@ info-stnd.html: info-stnd.texi $(srcdir)/version-stnd.texi
 $(srcdir)/version-stnd.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-1
 $(srcdir)/stamp-1: info-stnd.texi $(top_srcdir)/configure
 	@(dir=.; test -f ./info-stnd.texi || dir=$(srcdir); \
-	set `$(SHELL) $(srcdir)/mdate-sh $$dir/info-stnd.texi`; \
+	set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/info-stnd.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
@@ -447,9 +672,26 @@ info.html: info.texi $(info_TEXINFOS)
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	$(DVIPS) -o $@ $<
 
+uninstall-dvi-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(DVIS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(dvidir)/$$f"; \
+	done
+
+uninstall-html-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(HTMLS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
+	  rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
+	done
+
 uninstall-info-am:
 	@$(PRE_UNINSTALL)
-	@if (install-info --version && \
+	@if test -d '$(DESTDIR)$(infodir)' && \
+	    (install-info --version && \
 	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
@@ -463,12 +705,28 @@ uninstall-info-am:
 	for file in $$list; do \
 	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
 	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  (if cd "$(DESTDIR)$(infodir)"; then \
+	  (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
 	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
 	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
 	   else :; fi); \
 	done
 
+uninstall-pdf-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(PDFS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+	done
+
+uninstall-ps-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(PSS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(psdir)/$$f"; \
+	done
+
 mostlyclean-aminfo:
 	-rm -rf texinfo.aux texinfo.cp texinfo.cps texinfo.fn texinfo.fns texinfo.ky \
 	  texinfo.kys texinfo.log texinfo.op texinfo.pg texinfo.tmp \
@@ -490,7 +748,7 @@ maintainer-clean-aminfo:
 	done
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -535,7 +793,7 @@ uninstall-man1:
 	done
 install-man5: $(man5_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
+	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -586,22 +844,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -620,7 +877,7 @@ check: check-am
 all-am: Makefile $(INFO_DEPS) $(MANS)
 installdirs:
 	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -670,13 +927,42 @@ info-am: $(INFO_DEPS)
 
 install-data-am: install-data-local install-info-am install-man
 
+install-dvi: install-dvi-am
+
+install-dvi-am: $(DVIS)
+	@$(NORMAL_INSTALL)
+	test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
+	@list='$(DVIS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
+	done
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am: $(HTMLS)
+	@$(NORMAL_INSTALL)
+	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
+	@list='$(HTMLS)'; for p in $$list; do \
+	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  if test -d "$$d$$p"; then \
+	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+	  else \
+	    echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+	  fi; \
+	done
 install-info: install-info-am
 
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
-	test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
+	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; \
 	for file in $$list; do \
@@ -706,6 +992,28 @@ install-info-am: $(INFO_DEPS)
 	else : ; fi
 install-man: install-man1 install-man5
 
+install-pdf: install-pdf-am
+
+install-pdf-am: $(PDFS)
+	@$(NORMAL_INSTALL)
+	test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
+	@list='$(PDFS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+	done
+install-ps: install-ps-am
+
+install-ps-am: $(PSS)
+	@$(NORMAL_INSTALL)
+	test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
+	@list='$(PSS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
+	done
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -727,21 +1035,28 @@ ps: ps-am
 
 ps-am: $(PSS)
 
-uninstall-am: uninstall-info-am uninstall-man
+uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
+	uninstall-man uninstall-pdf-am uninstall-ps-am
 
 uninstall-man: uninstall-man1 uninstall-man5
 
+.MAKE: install-am install-strip
+
 .PHONY: all all-am check check-am clean clean-generic dist-info \
 	distclean distclean-generic distdir dvi dvi-am html html-am \
 	info info-am install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-man1 install-man5 \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-1 maintainer-clean-aminfo \
 	maintainer-clean-generic maintainer-clean-vti mostlyclean \
 	mostlyclean-1 mostlyclean-aminfo mostlyclean-generic \
 	mostlyclean-vti pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-man uninstall-man1 uninstall-man5
+	uninstall-dvi-am uninstall-html-am uninstall-info-am \
+	uninstall-man uninstall-man1 uninstall-man5 uninstall-pdf-am \
+	uninstall-ps-am
 
 
 @INSTALL_WARNINGS_TRUE@install-data-local:
@@ -754,30 +1069,42 @@ uninstall-man: uninstall-man1 uninstall-man5
 @INSTALL_WARNINGS_TRUE@	@echo "         See doc/README for some considerations."
 @INSTALL_WARNINGS_TRUE@	@echo "         You can run make TEXMF=/your/texmf install-tex to do this."
 @INSTALL_WARNINGS_TRUE@	@echo
-@INSTALL_WARNINGS_TRUE@	@echo "         You may also need to install epsf.tex and (if you"
-@INSTALL_WARNINGS_TRUE@	@echo "         use pdftex) pdfcolor.tex in TEXMF/tex/generic/dvips"
-@INSTALL_WARNINGS_TRUE@	@echo "         and TEXMF/pdftex/plain/misc/pdfcolor.tex respectively,"
-@INSTALL_WARNINGS_TRUE@	@echo "         if your TeX installation did not include them."
+@INSTALL_WARNINGS_TRUE@	@echo "         You may also need to install epsf.tex in"
+@INSTALL_WARNINGS_TRUE@	@echo "         TEXMF/tex/generic/dvips, if your TeX"
+@INSTALL_WARNINGS_TRUE@	@echo "         installation did not include it."
 install-tex:
 	test -n "$(TEXMF)" || (echo "TEXMF must be set." >&2; exit 1)
-	$(mkinstalldirs) $(DESTDIR)$(texmf_texinfo) $(DESTDIR)$(texmf_dvips) $(DESTDIR)$(texmf_pdftex_misc)
+	$(mkinstalldirs) $(DESTDIR)$(texmf_texinfo) $(DESTDIR)$(texmf_dvips)
 	$(INSTALL_DATA) $(srcdir)/texinfo.tex $(DESTDIR)$(texmf_texinfo)/texinfo.tex
 	$(INSTALL_DATA) $(srcdir)/epsf.tex $(DESTDIR)$(texmf_dvips)/epsf.tex
-	$(INSTALL_DATA) $(srcdir)/pdfcolor.tex $(DESTDIR)$(texmf_pdftex_misc)/pdfcolor.tex
 	for f in $(TXI_XLATE); do \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done
-@MAINTAINER_MODE_TRUE@info.1: $(top_srcdir)/info/info.c $(common_mandeps)
-@MAINTAINER_MODE_TRUE@	$(HELP2MAN) --name="read Info documents" `basename $@ .1` >$@
-@MAINTAINER_MODE_TRUE@infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
-@MAINTAINER_MODE_TRUE@	$(HELP2MAN) --name="compile customizations for Info" `basename $@ .1` >$@
-@MAINTAINER_MODE_TRUE@install-info.1: $(top_srcdir)/util/install-info.c $(common_mandeps)
-@MAINTAINER_MODE_TRUE@	$(HELP2MAN) --name="update info/dir entries" `basename $@ .1` >$@
-@MAINTAINER_MODE_TRUE@makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
-@MAINTAINER_MODE_TRUE@	$(HELP2MAN) --name="translate Texinfo documents" `basename $@ .1` >$@
-@MAINTAINER_MODE_TRUE@texi2dvi.1: $(top_srcdir)/util/texi2dvi $(common_mandeps)
-@MAINTAINER_MODE_TRUE@	$(HELP2MAN) --name="print Texinfo documents" `basename $@ .1` >$@
-@MAINTAINER_MODE_TRUE@texindex.1: $(top_srcdir)/util/texindex.c $(common_mandeps)
-@MAINTAINER_MODE_TRUE@	$(HELP2MAN) --name="sort Texinfo index files" `basename $@ .1` >$@
+
+$(srcdir)/info.1: $(top_srcdir)/info/info.c $(common_mandeps)
+	@name="read Info documents" && $(man_rule_bin)
+$(srcdir)/infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
+	@name="compile customizations for Info" && $(man_rule_bin)
+$(srcdir)/install-info.1: $(top_srcdir)/install-info/install-info.c $(common_mandeps)
+	@name="update info/dir entries" && $(man_rule_bin)
+
+# Here we need some postprocessing:
+$(srcdir)/makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
+	@name="translate Texinfo documents" && $(man_rule_bin)
+	mv $@ $@.tmp
+	sed '/^\.IP$$/N;/\nAlso/s/I//;/\nThe/s/I//' $@.tmp >$@
+	rm $@.tmp
+
+$(srcdir)/texindex.1: $(util_srcdir)/texindex.c $(common_mandeps)
+	@name="sort Texinfo index files" && $(man_rule_bin)
+
+$(srcdir)/texi2dvi.1: $(common_texi2dvi_deps)
+	$(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to DVI" $(util_srcdir)/texi2dvi >$@
+
+$(srcdir)/texi2pdf.1: $(common_texi2dvi_deps)
+	$(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@
+
+$(srcdir)/pdftexi2dvi.1:  $(common_texi2dvi_deps)
+	$(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@
 
 # Do not create info files for distribution.
 dist-info:
diff --git a/Build/source/utils/texinfo/doc/README b/Build/source/utils/texinfo/doc/README
index 63f1ba29219..1b64f637e47 100644
--- a/Build/source/utils/texinfo/doc/README
+++ b/Build/source/utils/texinfo/doc/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.4 2004/04/11 17:56:45 karl Exp $
+$Id: README,v 1.5 2007/07/02 21:40:32 olegkat Exp $
 texinfo/doc/README
 
   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -17,11 +17,11 @@ vary so widely.  Installing them in the wrong place would give a false
 sense of security.  So, you should simply cp *.tex to the appropriate
 place.  If your installation follows the TeX Directory Structure
 standard (http://tug.org/tds/), this will be the directory
-TEXMF/tex/texinfo/ for texinfo.tex, TEXMF/tex/generic/dvips/ for epsf.tex,
-and TEXMF/pdftex/plain/misc for pdfcolor.tex.  If you use the default
-installation paths, TEXMF will be /usr/local/share/texmf.  On systems
-with TeX preinstalled, as most GNU/Linux distributions offer, TEXMF
-will often be something like /usr/share/texmf.
+TEXMF/tex/texinfo/ for texinfo.tex, and TEXMF/tex/generic/dvips/ for
+epsf.tex.  If you use the default installation paths, TEXMF will be
+/usr/local/share/texmf.  On systems with TeX preinstalled, as most
+GNU/Linux distributions offer, TEXMF will often be something like
+/usr/share/texmf.
 
 It is also possible to put these .tex files in a `local' place instead
 of overwriting existing ones, but this is more complicated.  See your TeX
diff --git a/Build/source/utils/texinfo/doc/epsf.tex b/Build/source/utils/texinfo/doc/epsf.tex
index db2cd2031bd..00b12c81738 100644
--- a/Build/source/utils/texinfo/doc/epsf.tex
+++ b/Build/source/utils/texinfo/doc/epsf.tex
@@ -1,23 +1,27 @@
+%%% -*-TeX-*-
 %%% ====================================================================
-%%%   This file is freely redistributable and placed into the
-%%%   public domain by Tomas Rokicki.
 %%%  @TeX-file{
 %%%     author          = "Tom Rokicki",
-%%%     version         = "2.7k",
-%%%     date            = "19 July 1997",
-%%%     time            = "10:00:05 MDT",
+%%%     version         = "2.7.3",
+%%%     date            = "23 July 2005",
+%%%     time            = "14:32:01 MDT",
 %%%     filename        = "epsf.tex",
 %%%     address         = "Tom Rokicki
 %%%                        Box 2081
 %%%                        Stanford, CA 94309
 %%%                        USA",
 %%%     telephone       = "+1 415 855 9989",
+%%%     checksum        = "20914 644 3054 26594",
 %%%     email           = "rokicki@cs.stanford.edu (Internet)",
 %%%     codetable       = "ISO/ASCII",
+%%%     copyright       = "This file is freely redistributable and
+%%%                        placed into the public domain by Tomas
+%%%                        Rokicki.",
 %%%     keywords        = "PostScript, TeX",
 %%%     supported       = "yes",
-%%%     abstract        = "This file contains macros to support the inclusion
-%%%                        of Encapsulated PostScript files in TeX documents.",
+%%%     abstract        = "This file contains macros to support the
+%%%                        inclusion of Encapsulated PostScript files
+%%%                        in TeX documents.",
 %%%     docstring       = "This file contains TeX macros to include an
 %%%                        Encapsulated PostScript graphic.  It works
 %%%                        by finding the bounding box comment,
@@ -25,7 +29,7 @@
 %%%                        inserting a vbox of the appropriate size at
 %%%                        the current position in the TeX document.
 %%%
-%%%                        To use, simply say
+%%%                        To use, simply use
 %%%
 %%%                        \input epsf % somewhere early on in your TeX file
 %%%
@@ -49,11 +53,11 @@
 %%%                        zero.
 %%%
 %%%                        You can enlarge or reduce the figure by
-%%%                        saying
+%%%                        using
 %%%
-%%%                          \epsfxsize=<dimen> \epsfbox{filename.ps}
+%%%                          \epsfxsize = <dimen> \epsfbox{filename.ps}
 %%%                        or
-%%%                          \epsfysize=<dimen> \epsfbox{filename.ps}
+%%%                          \epsfysize = <dimen> \epsfbox{filename.ps}
 %%%
 %%%                        instead. Then the width of the TeX box will
 %%%                        be \epsfxsize and its height will be scaled
@@ -82,21 +86,21 @@
 %%%                           #1          % use the natural sizes
 %%%                           \hsize      % scale to full width
 %%%                           0.5#1       % scale to 50% of natural size
-%%%                           \ifnum #1>\hsize\hsize\else#1\fi
+%%%                           \ifnum #1 > \hsize \hsize \else #1\fi
 %%%                                       % smaller of natural, hsize
 %%%
 %%%                        If you want TeX to report the size of the
 %%%                        figure (as a message on your terminal when
-%%%                        it processes each figure), say
+%%%                        it processes each figure), use
 %%%                        `\epsfverbosetrue'.
 %%%
 %%%                        If you only want to get the bounding box
 %%%                        extents, without producing any output boxes
-%%%                        or \special{}, then say
-%%%                        \epsfgetbb{filename}.  The extents will be
-%%%                        saved in the macros \epsfllx \epsflly
-%%%                        \epsfurx \epsfury in PostScript units of
-%%%                        big points.
+%%%                        or \special{}, then use \epsfgetbb{filename}.
+%%%                        The bounding box corner coordinates are saved
+%%%                        in the macros \epsfllx, \epsflly, \epsfurx,
+%%%                        and \epsfury in PostScript units of big
+%%%                        points.
 %%%
 %%%                        Revision history:
 %%%
@@ -188,7 +192,6 @@
 %%%                        Add missing initialization \epsfatendfalse;
 %%%                        the lack of this resulted in the wrong
 %%%                        BoundingBox being picked up, mea culpa, sigh...
-%%%                        ---------------------------------------------
 %%%
 %%%                        ---------------------------------------------
 %%%                        Revised by Nelson H. F. Beebe
@@ -197,34 +200,81 @@
 %%%                        distribution: new user-accessible macros:
 %%%                        \epsfclipon, \epsfclipoff, \epsfdrafton,
 %%%                        \epsfdraftoff, change \empty to \epsfempty.
+%%%
+%%%                        ---------------------------------------------
+%%%                        Revised by Nelson H. F. Beebe
+%%%                        <beebe@math.utah.edu>, 18 May 2002 [2.7.1]
+%%%                        Add write statements to echo input file
+%%%                        names.  Prior to that change, an error in
+%%%                        such a file could be quite hard to track
+%%%                        down: a long list of TeX page numbers could
+%%%                        suddenly be followed by ``TeX buffer
+%%%                        capacity'' exceeded, without any indication
+%%%                        of the file that was responsible.
+%%%
 %%%                        ---------------------------------------------
-%%%                        
-%%%                        Modified to avoid verbosity, give help.
-%%%                        --kb@cs.umb.edu, for Texinfo.
+%%%                        Revised by Nelson H. F. Beebe
+%%%                        <beebe@math.utah.edu>, 16 May 2003 [2.7.2]
+%%%                        Supply two critical percent characters that
+%%%                        were mistakenly omitted in version 2.7.1,
+%%%                        and resulted in a small amount of spurious
+%%%                        horizontal space.
+%%%
+%%%                        ---------------------------------------------
+%%%                        Revised by Nelson H. F. Beebe
+%%%                        <beebe@math.utah.edu>, Karl Berry
+%%%                        <karl@freefriends.org>, and Robin Fairbairns
+%%%                        <Robin.Fairbairns@cl.cam.ac.uk>,
+%%%                        23 July 2005 [2.7.3]
+%%%                        Add critical \hbox{} wrapper in \epsfsetgraph
+%%%                        so that \epsfbox{} does not conflict with
+%%%                        LaTeX center environment when \epsfbox{} is
+%%%                        surrounded by other horizonal objects.
+%%%                        Improve macro readability by adding legal,
+%%%                        but invisible-in-typeset-output, spaces.
+%%%                        Ensure that verbose status reports come
+%%%                        inside (filename ...) list.
+%%%
+%%%                        ---------------------------------------------
+%%%                        The checksum field above contains a CRC-16
+%%%                        checksum as the first value, followed by
+%%%                        the equivalent of the standard UNIX wc
+%%%                        (word count) utility output of lines,
+%%%                        words, and characters.  This is produced by
+%%%                        Robert Solovay's checksum utility.",
 %%%  }
 %%% ====================================================================
-%
-\ifx\epsfannounce\undefined \def\epsfannounce{\immediate\write16}\fi
- \epsfannounce{This is `epsf.tex' v2.7k <10 July 1997>}%
-%
-\newread\epsffilein    % file to \read
-\newif\ifepsfatend     % need to scan to LAST %%BoundingBox comment?
-\newif\ifepsfbbfound   % success?
-\newif\ifepsfdraft     % use draft mode?
-\newif\ifepsffileok    % continue looking for the bounding box?
-\newif\ifepsfframe     % frame the bounding box?
-\newif\ifepsfshow      % show PostScript file, or just bounding box?
+
+%\immediate \write16 {This is `epsf.tex' v2.0 <02 Dec 1991>}%
+%\immediate \write16 {This is `epsf.tex' v2.1 <05 May 1992>}%
+%\immediate \write16 {This is `epsf.tex' v2.2 <09 Dec 1992>}%
+%\immediate \write16 {This is `epsf.tex' v2.3 <14 Dec 1992>}%
+%\immediate \write16 {This is `epsf.tex' v2.4 <20 June 1993>}%
+%\immediate \write16 {This is `epsf.tex' v2.5 <13 July 1993>}%
+%\immediate \write16 {This is `epsf.tex' v2.6 <02 July 1996>}%
+%\immediate \write16 {This is `epsf.tex' v2.7 <25 October 1996>}%
+%\immediate \write16 {This is `epsf.tex' v2.7.1 <18 May 2002>}%
+%\immediate \write16 {This is `epsf.tex' v2.7.2 <16 May 2003>}%
+\immediate \write16 {This is `epsf.tex' v2.7.3 <23 July 2005>}%
+%
+\newread \epsffilein    % file to \read
+\newif \ifepsfatend     % need to scan to LAST %%BoundingBox comment?
+\newif \ifepsfbbfound   % success?
+\newif \ifepsfdraft     % use draft mode?
+\newif \ifepsffileok    % continue looking for the bounding box?
+\newif \ifepsfframe     % frame the bounding box?
+\newif \ifepsfshow      % show PostScript file, or just bounding box?
 \epsfshowtrue          % default is to display PostScript file
-\newif\ifepsfshowfilename % show the file name if \epsfshowfalse specified?
-\newif\ifepsfverbose   % report what you're making?
-\newdimen\epsfframemargin % margin between box and frame
-\newdimen\epsfframethickness % thickness of frame rules
-\newdimen\epsfrsize    % vertical size before scaling
-\newdimen\epsftmp      % register for arithmetic manipulation
-\newdimen\epsftsize    % horizontal size before scaling
-\newdimen\epsfxsize    % horizontal size after scaling
-\newdimen\epsfysize    % vertical size after scaling
-\newdimen\pspoints     % conversion factor
+\newif \ifepsfshowfilename % show the file name if \epsfshowfalse specified?
+\newif \ifepsfverbose   % report what you're making?
+\newdimen \epsfframemargin % margin between box and frame
+\newdimen \epsfframethickness % thickness of frame rules
+\newdimen \epsfrsize    % vertical size before scaling
+\newdimen \epsftmp      % register for arithmetic manipulation
+\newdimen \epsftsize    % horizontal size before scaling
+\newdimen \epsfxsize    % horizontal size after scaling
+\newdimen \epsfysize    % vertical size after scaling
+\newdimen \pspoints     % conversion factor
 %
 \pspoints = 1bp        % Adobe points are `big'
 \epsfxsize = 0pt       % default value, means `use natural size'
@@ -232,10 +282,20 @@
 \epsfframemargin = 0pt % default value: frame box flush around picture
 \epsfframethickness = 0.4pt % TeX's default rule thickness
 %
-\def\epsfbox#1{\global\def\epsfllx{72}\global\def\epsflly{72}%
-   \global\def\epsfurx{540}\global\def\epsfury{720}%
-   \def\lbracket{[}\def\testit{#1}\ifx\testit\lbracket
-   \let\next=\epsfgetlitbb\else\let\next=\epsfnormal\fi\next{#1}}%
+\def \epsfbox #1{%
+    \global \def \epsfllx {72}%
+    \global \def \epsflly {72}%
+    \global \def \epsfurx {540}%
+    \global \def \epsfury {720}%
+    \def \lbracket {[}%
+    \def \testit {#1}%
+    \ifx \testit \lbracket
+        \let \next = \epsfgetlitbb
+    \else
+        \let \next = \epsfnormal
+    \fi
+    \next{#1}%
+}%
 %
 % We use \epsfgetlitbb if the user specified an explicit bounding box,
 % and \epsfnormal otherwise.  Because \epsfgetbb can be called
@@ -245,55 +305,52 @@
 % \epsfgetbb will not be called, so we must call \epsfsetsize and
 % \epsfstatus ourselves.
 %
-\def\epsfgetlitbb#1#2 #3 #4 #5]#6{%
+\def \epsfgetlitbb #1#2 #3 #4 #5]#6{%
    \epsfgrab #2 #3 #4 #5 .\\%
    \epsfsetsize
    \epsfstatus{#6}%
    \epsfsetgraph{#6}%
 }%
 %
-\def\epsfnormal#1{%
+\def \epsfnormal #1{%
     \epsfgetbb{#1}%
     \epsfsetgraph{#1}%
 }%
 %
-\newhelp\epsfnoopenhelp{The PostScript image file must be findable by
-TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}%
-%
-\def\epsfgetbb#1{%
+\def \epsfgetbb #1{%
 %
 %   The first thing we need to do is to open the
 %   PostScript file, if possible.
 %
     \openin\epsffilein=#1
-    \ifeof\epsffilein
-        \errhelp = \epsfnoopenhelp
+    \immediate \write16 {(#1}%
+    \ifeof \epsffilein
         \errmessage{Could not open file #1, ignoring it}%
     \else                       %process the file
         {%                      %start a group to contain catcode changes
             % Make all special characters, except space, to be of type
             % `other' so we process the file in almost verbatim mode
             % (TeXbook, p. 344).
-            \chardef\other=12
-            \def\do##1{\catcode`##1=\other}%
+            \chardef \other = 12%
+            \def \do ##1{\catcode`##1=\other}%
             \dospecials
-            \catcode`\ =10
-            \epsffileoktrue         %true while we are looping
-            \epsfatendfalse     %[02-Jul-1996]: add forgotten initialization
-            \loop               %reading lines from the EPS file
-                \read\epsffilein to \epsffileline
-                \ifeof\epsffilein %then no more input
-                \epsffileokfalse %so set completion flag
-            \else                %otherwise process one line
-                \expandafter\epsfaux\epsffileline:. \\%
+            \catcode `\ = 10%
+            \epsffileoktrue        %true while we are looping
+            \epsfatendfalse        %[02-Jul-1996]: add forgotten initialization
+            \loop                  %reading lines from the EPS file
+                \read \epsffilein to \epsffileline
+                \ifeof \epsffilein %then no more input
+                \epsffileokfalse   %so set completion flag
+            \else                  %otherwise process one line
+                \expandafter \epsfaux \epsffileline :. \\%
             \fi
             \ifepsffileok
             \repeat
             \ifepsfbbfound
             \else
                 \ifepsfverbose
-                    \immediate\write16{No BoundingBox comment found in %
-                                    file #1; using defaults}%
+                    \immediate \write16 {No BoundingBox comment found in %
+                                         file #1; using defaults}%
                 \fi
             \fi
         }%                      %end catcode changes
@@ -301,11 +358,12 @@ TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}%
     \fi                         %end of file processing
     \epsfsetsize                %compute size parameters
     \epsfstatus{#1}%
+    \immediate \write16 {)}%
 }%
 %
 % Clipping control:
-\def\epsfclipon{\def\epsfclipstring{ clip}}%
-\def\epsfclipoff{\def\epsfclipstring{\ifepsfdraft\space clip\fi}}%
+\def \epsfclipon  {\def \epsfclipstring { clip}}%
+\def \epsfclipoff {\def \epsfclipstring {\ifepsfdraft \space clip\fi}}%
 \epsfclipoff % default for dvips is OFF
 %
 % The special that is emitted by \epsfsetgraph comes from this macro.
@@ -316,29 +374,30 @@ TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}%
 % from the %%BoundingBox in the EPS file itself.
 %
 % This version is for dvips:
-\def\epsfspecial#1{%
+\def \epsfspecial #1{%
      \epsftmp=10\epsfxsize
-     \divide\epsftmp\pspoints
-     \ifnum\epsfrsize=0\relax
+     \divide \epsftmp by \pspoints
+     \ifnum \epsfrsize = 0%
+       \relax
        \special{PSfile=\ifepsfdraft psdraft.ps\else#1\fi\space
-                llx=\epsfllx\space
-                lly=\epsflly\space
-                urx=\epsfurx\space
-                ury=\epsfury\space
-                rwi=\number\epsftmp
-                \epsfclipstring
+		llx=\epsfllx\space
+		lly=\epsflly\space
+		urx=\epsfurx\space
+		ury=\epsfury\space
+		rwi=\number\epsftmp
+		\epsfclipstring
                }%
      \else
        \epsfrsize=10\epsfysize
-       \divide\epsfrsize\pspoints
+       \divide \epsfrsize by \pspoints
        \special{PSfile=\ifepsfdraft psdraft.ps\else#1\fi\space
-                llx=\epsfllx\space
-                lly=\epsflly\space
-                urx=\epsfurx\space
-                ury=\epsfury\space
-                rwi=\number\epsftmp\space
-                rhi=\number\epsfrsize
-                \epsfclipstring
+		llx=\epsfllx\space
+		lly=\epsflly\space
+		urx=\epsfurx\space
+		ury=\epsfury\space
+		rwi=\number\epsftmp
+		rhi=\number\epsfrsize
+		\epsfclipstring
                }%
      \fi
 }%
@@ -346,32 +405,57 @@ TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}%
 % \epsfframe macro adapted from the TeXbook, exercise 21.3, p. 223, 331.
 % but modified to set the box width to the natural width, rather
 % than the line width, and to include space for margins and rules
-\def\epsfframe#1%
+\def \epsfframe #1%
 {%
-  \leavevmode                   % so we can put this inside
-                                % a centered environment
+ % method for detecting latex suggested by Robin Fairbairns, May 2005.
+  \ifx \documentstyle \epsfundefined
+    \relax
+  \else
+%    \leavevmode                   % so we can put this inside
+                                  % a latex centered environment
+    % The \leavevmode breaks under plain when this is inside a box,
+    % because it forces the figure to be the entire \hsize.  On the
+    % other hand, we need the \leavevmode for it to work in LaTeX,
+    % because the {center} environment works by adjusting TeX's
+    % paragraph parameters.
+    %
+    % Compare the LaTeX sequence
+    % \begin{center}
+    %   \epsfbox{tip.eps}q
+    % \end{center}
+    % (needs the \leavevmode to put the q right next to the image)
+    %
+    % with the plain TeX sequence:
+    % \leftline{\vbox{\epsfbox{tip.eps}}q}
+    % (had the q all the way over to the right, when \leavevmode was used)
+  \fi
+  %
   \setbox0 = \hbox{#1}%
   \dimen0 = \wd0                                % natural width of argument
   \advance \dimen0 by 2\epsfframemargin         % plus width of 2 margins
   \advance \dimen0 by 2\epsfframethickness      % plus width of 2 rule lines
-  \vbox
-  {%
-    \hrule height \epsfframethickness depth 0pt
-    \hbox to \dimen0
+  \relax
+  \hbox{%
+    \vbox
     {%
-      \hss
-      \vrule width \epsfframethickness
-      \kern \epsfframemargin
-      \vbox {\kern \epsfframemargin \box0 \kern \epsfframemargin }%
-      \kern \epsfframemargin
-      \vrule width \epsfframethickness
-      \hss
-    }% end hbox
-    \hrule height 0pt depth \epsfframethickness
-  }% end vbox
+      \hrule height \epsfframethickness depth 0pt
+      \hbox to \dimen0
+      {%
+	\hss
+	\vrule width \epsfframethickness
+	\kern \epsfframemargin
+	\vbox {\kern \epsfframemargin \box0 \kern \epsfframemargin }%
+	\kern \epsfframemargin
+	\vrule width \epsfframethickness
+	\hss
+      }% end hbox
+      \hrule height 0pt depth \epsfframethickness
+    }% end vbox
+  }% end hbox
+  \relax
 }%
 %
-\def\epsfsetgraph#1%
+\def \epsfsetgraph #1%
 {%
    %
    % Make the vbox and stick in a \special that the DVI driver can
@@ -379,9 +463,10 @@ TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}%
    % the lower-left corner of the vbox.  \epsfspecial can be redefined
    % to produce alternate \special syntaxes.
    %
-   \leavevmode
+   \ifvmode \leavevmode \fi
+   \relax
    \hbox{% so we can put this in \begin{center}...\end{center}
-     \ifepsfframe\expandafter\epsfframe\fi
+     \ifepsfframe \expandafter \epsfframe \fi
      {\vbox to\epsfysize
      {%
         \ifepsfshow
@@ -404,88 +489,101 @@ TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}%
         \fi
      }%
    }}%
+   \relax
    %
    % Reset \epsfxsize and \epsfysize, as documented above.
    %
-   \global\epsfxsize=0pt
-   \global\epsfysize=0pt
+   \global \epsfxsize = 0pt
+   \global \epsfysize = 0pt
 }%
 %
 %   Now we have to calculate the scale and offset values to use.
 %   First we compute the natural sizes.
 %
-\def\epsfsetsize
+\def \epsfsetsize
 {%
-   \epsfrsize=\epsfury\pspoints
-   \advance\epsfrsize by-\epsflly\pspoints
-   \epsftsize=\epsfurx\pspoints
-   \advance\epsftsize by-\epsfllx\pspoints
+   \epsfrsize = \epsfury \pspoints
+   \advance \epsfrsize by -\epsflly \pspoints
+   \epsftsize = \epsfurx \pspoints
+   \advance \epsftsize by -\epsfllx \pspoints
 %
 %   If `epsfxsize' is 0, we default to the natural size of the picture.
 %   Otherwise we scale the graph to be \epsfxsize wide.
 %
-   \epsfxsize=\epsfsize{\epsftsize}{\epsfrsize}%
-   \ifnum \epsfxsize=0
-      \ifnum \epsfysize=0
-        \epsfxsize=\epsftsize
-        \epsfysize=\epsfrsize
-        \epsfrsize=0pt
+   \epsfxsize = \epsfsize{\epsftsize}{\epsfrsize}%
+   \ifnum \epsfxsize = 0
+      \ifnum \epsfysize = 0
+	\epsfxsize = \epsftsize
+        \epsfysize = \epsfrsize
+	\epsfrsize = 0pt
 %
 %   We have a sticky problem here:  TeX doesn't do floating point arithmetic!
 %   Our goal is to compute y = rx/t. The following loop does this reasonably
 %   fast, with an error of at most about 16 sp (about 1/4000 pt).
 %
       \else
-        \epsftmp=\epsftsize \divide\epsftmp\epsfrsize
-        \epsfxsize=\epsfysize \multiply\epsfxsize\epsftmp
-        \multiply\epsftmp\epsfrsize \advance\epsftsize-\epsftmp
-        \epsftmp=\epsfysize
-        \loop \advance\epsftsize\epsftsize \divide\epsftmp 2
-        \ifnum \epsftmp>0
-           \ifnum \epsftsize<\epsfrsize
+	\epsftmp = \epsftsize
+        \divide \epsftmp by \epsfrsize
+	\epsfxsize = \epsfysize
+        \multiply \epsfxsize by \epsftmp
+	\multiply \epsftmp by \epsfrsize
+        \advance \epsftsize by -\epsftmp
+	\epsftmp = \epsfysize
+	\loop
+        \advance \epsftsize by \epsftsize
+        \divide \epsftmp by 2
+	\ifnum \epsftmp > 0
+	   \ifnum \epsftsize < \epsfrsize
            \else
-              \advance\epsftsize-\epsfrsize \advance\epsfxsize\epsftmp
+	      \advance \epsftsize -\epsfrsize
+              \advance \epsfxsize \epsftmp
            \fi
-        \repeat
-        \epsfrsize=0pt
+	\repeat
+	\epsfrsize = 0pt
       \fi
    \else
-     \ifnum \epsfysize=0
-       \epsftmp=\epsfrsize \divide\epsftmp\epsftsize
-       \epsfysize=\epsfxsize \multiply\epsfysize\epsftmp
-       \multiply\epsftmp\epsftsize \advance\epsfrsize-\epsftmp
-       \epsftmp=\epsfxsize
-       \loop \advance\epsfrsize\epsfrsize \divide\epsftmp 2
-       \ifnum \epsftmp>0
-          \ifnum \epsfrsize<\epsftsize
+     \ifnum \epsfysize = 0
+       \epsftmp = \epsfrsize
+       \divide \epsftmp by \epsftsize
+       \epsfysize = \epsfxsize
+       \multiply \epsfysize by \epsftmp
+       \multiply \epsftmp by \epsftsize
+       \advance \epsfrsize by -\epsftmp
+       \epsftmp = \epsfxsize
+       \loop
+	 \advance \epsfrsize by \epsfrsize
+	 \divide \epsftmp by 2
+       \ifnum \epsftmp > 0
+	  \ifnum \epsfrsize < \epsftsize
           \else
-             \advance\epsfrsize-\epsftsize \advance\epsfysize\epsftmp
+	     \advance \epsfrsize by -\epsftsize
+             \advance \epsfysize by \epsftmp
           \fi
        \repeat
-       \epsfrsize=0pt
+       \epsfrsize = 0pt
      \else
-       \epsfrsize=\epsfysize
+       \epsfrsize = \epsfysize
      \fi
    \fi
 }%
 %
 % Issue some status messages if the user requested them
 %
-\def\epsfstatus#1{% arg = filename
+\def \epsfstatus #1{% arg = filename
    \ifepsfverbose
-     \immediate\write16{#1: BoundingBox:
-                  llx = \epsfllx\space lly = \epsflly\space
-                  urx = \epsfurx\space ury = \epsfury\space}%
-     \immediate\write16{#1: scaled width = \the\epsfxsize\space
-                  scaled height = \the\epsfysize}%
+     \immediate \write16 {#1: BoundingBox:
+			  llx = \epsfllx \space lly = \epsflly \space
+			  urx = \epsfurx \space ury = \epsfury \space}%
+     \immediate \write16 {#1: scaled width = \the\epsfxsize \space
+			  scaled height = \the\epsfysize}%
    \fi
 }%
 %
 %   We still need to define the tricky \epsfaux macro. This requires
 %   a couple of magic constants for comparison purposes.
 %
-{\catcode`\%=12 \global\let\epsfpercent=%\global\def\epsfbblit{%BoundingBox}}%
-\global\def\epsfatend{(atend)}%
+{\catcode`\%=12 \global \let \epsfpercent=%\global \def \epsfbblit {%BoundingBox}}%
+\global \def \epsfatend{(atend)}%
 %
 %   So we're ready to check for `%BoundingBox:' and to grab the
 %   values if they are found.
@@ -507,20 +605,20 @@ TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}%
 %   Then, if we have not previously parsed an (atend), we flag completion
 %   and can stop reading the file.  Otherwise, we must keep on reading
 %   to end of file so that we find the values on the LAST %%BoundingBox.
-\long\def\epsfaux#1#2:#3\\%
+\long \def \epsfaux#1#2:#3\\%
 {%
-   \def\testit{#2}%             % save second character up to just before colon
+   \def \testit {#2}%           % save second character up to just before colon
    \ifx#1\epsfpercent           % then first char is percent (quick test)
-       \ifx\testit\epsfbblit    % then (slow test) we have %%BoundingBox
+       \ifx \testit \epsfbblit  % then (slow test) we have %%BoundingBox
             \epsfgrab #3 . . . \\%
-            \ifx\epsfllx\epsfatend % then ignore %%BoundingBox: (atend)
-                \global\epsfatendtrue
+            \ifx \epsfllx\epsfatend % then ignore %%BoundingBox: (atend)
+                \global \epsfatendtrue
             \else               % else found %%BoundingBox: llx lly urx ury
                 \ifepsfatend    % then keep parsing ALL %%BoundingBox lines
                 \else           % else stop after first one parsed
                     \epsffileokfalse
                 \fi
-                \global\epsfbbfoundtrue
+                \global \epsfbbfoundtrue
             \fi
        \fi
    \fi
@@ -528,20 +626,19 @@ TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}%
 %
 %   Here we grab the values and stuff them in the appropriate definitions.
 %
-\def\epsfempty{}%
-\def\epsfgrab #1 #2 #3 #4 #5\\{%
-   \global\def\epsfllx{#1}\ifx\epsfllx\epsfempty
+\def \epsfempty {}%
+\def \epsfgrab #1 #2 #3 #4 #5\\{%
+   \global \def \epsfllx {#1}\ifx \epsfllx\epsfempty
       \epsfgrab #2 #3 #4 #5 .\\\else
-   \global\def\epsflly{#2}%
-   \global\def\epsfurx{#3}\global\def\epsfury{#4}\fi
+   \global \def \epsflly {#2}%
+   \global \def \epsfurx {#3}\global \def \epsfury {#4}\fi
 }%
 %
 %   We default the epsfsize macro.
 %
-\def\epsfsize#1#2{\epsfxsize}%
+\def \epsfsize #1#2{\epsfxsize}%
 %
 %   Finally, another definition for compatibility with older macros.
 %
-\let\epsffile=\epsfbox
+\let \epsffile = \epsfbox
 \endinput
-
diff --git a/Build/source/utils/texinfo/doc/fdl.texi b/Build/source/utils/texinfo/doc/fdl.texi
index 11737cc89bd..7b93651f1fa 100644
--- a/Build/source/utils/texinfo/doc/fdl.texi
+++ b/Build/source/utils/texinfo/doc/fdl.texi
@@ -1,13 +1,12 @@
-
-@node GNU Free Documentation License
-@appendixsec GNU Free Documentation License
-
-@cindex FDL, GNU Free Documentation License
+@c The GNU Free Documentation License.
 @center Version 1.2, November 2002
 
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.  
+
 @display
 Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -408,7 +407,7 @@ as a draft) by the Free Software Foundation.
 @end enumerate
 
 @page
-@appendixsubsec ADDENDUM: How to use this License for your documents
+@heading ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of
 the License in the document and put the following copyright and
@@ -427,7 +426,7 @@ license notices just after the title page:
 @end smallexample
 
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with...Texts.'' line with this:
+replace the ``with@dots{}Texts.'' line with this:
 
 @smallexample
 @group
diff --git a/Build/source/utils/texinfo/doc/info-stnd.texi b/Build/source/utils/texinfo/doc/info-stnd.texi
index 1a1df6fb6d8..39292494f7f 100644
--- a/Build/source/utils/texinfo/doc/info-stnd.texi
+++ b/Build/source/utils/texinfo/doc/info-stnd.texi
@@ -1,5 +1,5 @@
-\input texinfo.tex    @c -*-texinfo-*-
-@comment $Id: info-stnd.texi,v 1.9 2004/12/14 16:58:15 karl Exp $
+vb\input texinfo.tex    @c -*-texinfo-*-
+@comment $Id: info-stnd.texi,v 1.21 2008/03/04 09:45:52 gray Exp $
 @c We must \input texinfo.tex instead of texinfo, otherwise make
 @c distcheck in the Texinfo distribution fails, because the texinfo Info
 @c file is made first, and texi2dvi must include . first in the path.
@@ -18,21 +18,26 @@ a program for viewing documents in Info format (usually created from
 Texinfo source files).
 
 Copyright @copyright{} 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002,
-2003, 2004 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
 and with the Back-Cover Texts as in (a) below.  A copy of the
 license is included in the section entitled ``GNU Free Documentation
-License.''
+License' in the Texinfo manual.
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+(a) The FSF's Back-Cover Text is: ``You have the freedom to
+copy and modify this GNU manual.  Buying copies from the FSF
+supports it in developing GNU and promoting software freedom.''
 @end quotation
+
+This document is part of a collection distributed under the GNU Free
+Documentation License.  If you want to distribute this document
+separately from the collection, you can do so by adding a copy of the
+license to the document, as described in section 6 of the license.
 @end copying
 
 @dircategory Texinfo documentation system
@@ -44,7 +49,7 @@ Software Foundation raise funds for GNU development.''
 @titlepage
 @title GNU Info
 @subtitle for version @value{VERSION}, @value{UPDATED}
-@author Brian J. Fox (bfox@@gnu.org)
+@author Brian J. Fox
 @page
 @vskip 0pt plus 1filll
 @insertcopying
@@ -56,12 +61,12 @@ Software Foundation raise funds for GNU development.''
 @node Top
 @top GNU Info
 
-@insertcopying
-
-This documentation is different from the documentation for the Info
-reader that is part of GNU Emacs.  If you do not know how to use Info,
-but have a working Info reader, you should read the Emacs documentation
-first, as it includes more background information and a thorough tutorial.
+If you do not know how to use Info, but have a working Info reader,
+you should read the Info manual before this one (@pxref{Top, Getting
+Started,,info, Info}), as it includes more background information and
+a thorough tutorial.  This documentation describes the standalone Info
+reader that is part of the Texinfo distribution, not the Info reader
+that is part of GNU Emacs.
 @end ifnottex
 
 @menu
@@ -77,23 +82,32 @@ first, as it includes more background information and a thorough tutorial.
 * Miscellaneous Commands::      A few commands that defy categories.
 * Variables::                   How to change the default behavior of Info.
 * Custom Key Bindings::         How to define your own key-to-command bindings.
-* Copying This Manual::         The GNU Free Documentation License.
-* Index::                       Global index containing keystrokes,
-                                  command names, variable names,
-                                  and general concepts.
+* Index::                       Global index with keystrokes, command names,
+                                  variable names, and general concepts.
 @end menu
 
 
 @node What is Info
 @chapter What is Info?
 
-@dfn{Info} is a program which is used to view Info files on an ASCII
-terminal.  @dfn{Info files} are the result of processing Texinfo files
-with the program @code{makeinfo} or with one of the Emacs commands, such
-as @code{M-x texinfo-format-buffer}.  Texinfo itself is a documentation
-system that uses a single source file to produce both on-line
-information and printed output.  You can typeset and print the files
-that you read in Info.
+The @dfn{Info} program is a standalone program, part of the Texinfo
+distribution, which is used to view Info files on an ASCII terminal.
+@dfn{Info files} are typically the result of processing Texinfo files
+with the program @code{makeinfo} (also in the Texinfo distribution)
+
+Texinfo itself is a documentation system that uses a single source
+file to produce both on-line information and printed output.  You can
+typeset and print the files that you read in Info.
+
+GNU Emacs also provides an Info reader (just type @kbd{M-x info} in
+Emacs).  Emacs Info and standalone Info have nearly identical user
+interfaces, although customization and other details are different
+(this manual explains the standalone Info reader).  The Emacs Info
+reader supports the X Window System and other such bitmapped
+interfaces, not just plain ASCII, so if you want the prettiest
+display for Info files, you should try it.  You can use Emacs Info
+without using Emacs for anything else.  (Type @kbd{C-x C-c} to exit;
+this also works in the standalone Info reader.)
 
 
 @node Invoking Info
@@ -118,15 +132,16 @@ The program accepts the following options:
 @table @code
 @anchor{--apropos}
 @item --apropos=@var{string}
+@itemx -k @var{string}
 @cindex Searching all indices
 @cindex Info files@r{, searching all indices}
 @cindex Apropos@r{, in Info files}
 Specify a string to search in every index of every Info file installed
-on your system.  Info looks up the named @var{string} in all the indices
-it can find, prints the results to standard output, and then exits.  If
-you are not sure which Info file explains certain issues, this option is
-your friend.  Note that if your system has a lot of Info files
-installed, searching all of them might take some time.
+on your system.  Info looks up the named @var{string} in all the
+indices it can find, prints the results to standard output, and then
+exits.  If you are not sure which Info file explains certain issues,
+this option is your friend.  (If your system has a lot of Info files
+installed, searching all of them might take some time!)
 
 You can invoke the apropos command from inside Info; see
 @ref{Searching Commands}.
@@ -339,6 +354,10 @@ index or the invocation node is the file where Info finds itself after
 following all the menu items given on the command line.  This is so
 @samp{info emacs --show-options} does what you'd expect.
 
+Finally, Info defines many default key bindings and variables.
+@xref{Custom Key Bindings}, for information on how to customize these
+settings.
+
 @c FIXME: the feature with lowercasing the file name isn't documented
 
 
@@ -354,7 +373,7 @@ the Emacs and standalone versions) have several commands which allow
 you to move the cursor about the screen.  The notation used in this
 manual to describe keystrokes is identical to the notation used within
 the Emacs manual, and the GNU Readline manual.  @xref{User Input,,,
-emacs, the GNU Emacs Manual}, if you are unfamiliar with the
+emacs, The GNU Emacs Manual}, if you are unfamiliar with the
 notation.@footnote{Here's a short summary.  @kbd{C-@var{x}} means
 press the @kbd{CTRL} key and the key @var{x}.  @kbd{M-@var{x}} means
 press the @kbd{META} key and the key @var{x}.  On many terminals th
@@ -366,7 +385,7 @@ The following table lists the basic cursor movement commands in Info.
 Each entry consists of the key sequence you should type to execute the
 cursor movement, the @code{M-x}@footnote{@code{M-x} is also a command; it
 invokes @code{execute-extended-command}.  @xref{M-x, , Executing an
-extended command, emacs, the GNU Emacs Manual}, for more detailed
+extended command, emacs, The GNU Emacs Manual}, for more detailed
 information.} command name (displayed in parentheses), and a short
 description of what the command does.  All of the cursor motion commands
 can take a @dfn{numeric} argument (see @ref{Miscellaneous Commands,
@@ -474,9 +493,11 @@ current paragraph you are reading is visible on the screen.  The
 commands detailed in this section are used to shift which part of the
 current node is visible on the screen.
 
-Scrolling commands are bound differently when @samp{--vi-keys} operation
-is in effect (@pxref{--vi-keys}).  These key bindings are designated
-with ``vi-like operation''.
+Scrolling commands are bound differently when @samp{--vi-keys}
+operation is in effect (@pxref{--vi-keys}).  These key bindings are
+designated with ``vi-like operation''.  @xref{Custom Key Bindings},
+for information on arbitrarily customizing key bindings and variable
+settings.
 
 @table @asis
 @item @key{SPC} (@code{scroll-forward})
@@ -614,8 +635,7 @@ The @code{scroll-forward} and @code{scroll-backward} commands can also
 move forward and backward through the node structure of the file.  If
 you press @key{SPC} while viewing the end of a node, or @key{DEL} while
 viewing the beginning of a node, what happens is controlled by the
-variable @code{scroll-behavior}.  @xref{Variables,
-@code{scroll-behavior}}, for more information.
+variable @code{scroll-behavior} (@pxref{scroll-behavior}).
 
 The @code{scroll-forward-page-only} and @code{scroll-backward-page-only}
 commands never scroll beyond the current node.
@@ -795,8 +815,7 @@ and if it has a menu, the last item in the menu is selected.
 
 You can get the same behavior as @code{global-next-node} and
 @code{global-prev-node} while simply scrolling through the file with
-@key{SPC} and @key{DEL}; @xref{Variables, @code{scroll-behavior}}, for
-more information.
+@key{SPC} and @key{DEL} (@pxref{scroll-behavior}).
 
 @table @asis
 @anchor{goto-node}
@@ -923,11 +942,13 @@ areas within an Info file which discuss a particular topic.
 @kindex s
 @kindex /
 @findex search
-Read a string in the echo area and search for it.  If the string
-includes upper-case characters, the Info file is searched
-case-sensitively; otherwise Info ignores the letter case.  With a
-numeric argument of @var{N}, search for @var{N}th occurrence of the
-string.  Negative arguments search backwards.
+@cindex regular expression search
+Read a string in the echo area and search for it, either as a regular
+expression (by default) or a literal string.  If the string includes
+upper-case characters, the Info file is searched case-sensitively;
+otherwise Info ignores the letter case.  With a numeric argument of
+@var{N}, search for @var{N}th occurrence of the string.  Negative
+arguments search backwards.
 
 @item @key{?} (@code{search-backward}, vi-like operation)
 @kindex ?, vi-like operation
@@ -938,6 +959,14 @@ file is searched case-sensitively; otherwise Info ignores the letter
 case.  With a numeric argument of @var{N}, search for @var{N}th
 occurrence of the string.  Negative arguments search forward.
 
+@item @key{R} (@code{toggle-regexp})
+@kindex R
+@findex toggle-regexp
+Toggle between using regular expressions and literal strings for
+searching.  Info uses so-called `extended' regular expression syntax,
+similar to Emacs (@pxref{Regexps, , Using Regular Expressions, emacs,
+The GNU Emacs Manual}).
+
 @item @key{S} (@code{search-case-sensitively}
 @kindex S
 @findex search-case-sensitively
@@ -1841,6 +1870,13 @@ window.  There are exceptions to the automatic tiling; specifically, the
 windows @samp{*Completions*} and @samp{*Footnotes*} are @emph{not}
 resized through automatic tiling; they remain their original size.
 
+@anchor{cursor-movement-scrolls}
+@item cursor-movement-scrolls
+Normally, cursor movement commands (@pxref{Cursor Commands}) stop when
+top or bottom of a node is reached.  When this variable is set to
+@code{On}, cursor movement commands act as scrolling ones and their
+behavior is controlled by the @code{scroll-behavior} variable (see below).
+
 @item errors-ring-bell
 @vindex errors-ring-bell
 When set to @code{On}, errors cause the bell to ring.  The default
@@ -1870,12 +1906,15 @@ Info that it is running in an environment where the European standard
 character set is in use, and allows you to input such characters to
 Info, as well as display them.
 
+@anchor{scroll-behavior}
 @item scroll-behavior
+@itemx scroll-behaviour
 @vindex scroll-behavior
+@vindex scroll-behaviour
 Control what happens when forward scrolling is requested at the end of
 a node, or when backward scrolling is requested at the beginning of a
-node.  The default value for this variable is @code{Continuous}.  There
-are three possible values for this variable:
+node.  The default value for this variable is @code{Continuous}.
+There are three possible values for this variable:
 
 @table @code
 @item Continuous
@@ -1885,6 +1924,32 @@ This behavior is identical to using the @samp{]}
 (@code{global-next-node}) and @samp{[} (@code{global-prev-node})
 commands.
 
+@item scroll-last-node
+@vindex scroll-last-node
+Control what happens when a scrolling command is issued at the end of
+the last node. Possible values are:
+
+@table @code
+@item Stop
+Do not scroll. Display the @samp{No more nodes within this document.}
+message. This is the default.
+
+@item Scroll
+Scroll as usual. Since the last node is usually an index, this means
+that the very first node from the menu will be selected.
+
+@item Top
+Go to the top node of this document.
+@end table
+
+This variable is in effect only if @code{scroll-behaviour} is set to
+@code{Continuous}.
+
+Notice that the default behavior has changed in version 4.12. Previous
+versions behaved as if @code{scroll-last-node=Scroll} was set. This
+behavior was counter-intuitive, therefore since version 4.12 the
+default is to stop at the last node.
+
 @item Next Only
 Only try to get the @samp{Next} node.
 
@@ -1894,6 +1959,13 @@ Simply give up, changing nothing.  If @code{scroll-behavior} is
 viewed.
 @end table
 
+This variable normally affects only scrolling commands.
+@xref{cursor-movement-scrolls}, for information on how to widen its
+scope.
+
+The two names, @code{scroll-behavior} and @code{scroll-behaviour}, are
+a historical accident.  They are merely synonyms.
+
 @item scroll-step
 @vindex scroll-step
 The number of lines to scroll when the cursor moves out of the window.
@@ -1942,10 +2014,10 @@ effect.  However, you can make Info perform quietly by setting the
 @cindex .infokey
 @cindex _info file (MS-DOS)
 
-For those whose editor/pager of choice is not Emacs and who are not
-entirely satisfied with the --vi-keys option (@pxref{--vi-keys}), GNU
-Info provides a way to define different key-to-command bindings and
-variable settings from the defaults described in this document.
+GNU Info provides a way to define arbitrary key-to-command bindings
+and variable settings, overriding the defaults described in this
+document.  (The @option{--vi-keys} option rebinds many keys at once;
+@pxref{--vi-keys}.)
 
 On startup, GNU Info looks for a configuration file in the invoker's
 HOME directory called @file{.info}@footnote{Due to the limitations of
@@ -2185,16 +2257,6 @@ Some common ways to organize Info files.
 @end ignore
 
 
-@node Copying This Manual
-@appendix Copying This Manual
-
-@menu
-* GNU Free Documentation License::  License for copying this manual.
-@end menu
-
-@include fdl.texi
-
-
 @node Index
 @appendix Index
 
diff --git a/Build/source/utils/texinfo/doc/info.1 b/Build/source/utils/texinfo/doc/info.1
index 39ca1d32ac3..aadae61022c 100644
--- a/Build/source/utils/texinfo/doc/info.1
+++ b/Build/source/utils/texinfo/doc/info.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
-.TH INFO "1" "December 2004" "info 4.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
+.TH INFO "1" "April 2008" "info 4.12" "User Commands"
 .SH NAME
 info \- read Info documents
 .SH SYNOPSIS
@@ -9,7 +9,7 @@ info \- read Info documents
 Read documentation in Info format.
 .SH OPTIONS
 .TP
-\fB\-\-apropos\fR=\fISTRING\fR
+\fB\-k\fR, \fB\-\-apropos\fR=\fISTRING\fR
 look up STRING in all indices of all manuals.
 .TP
 \fB\-d\fR, \fB\-\-directory\fR=\fIDIR\fR
@@ -48,14 +48,14 @@ go to command\-line options node.
 \fB\-\-subnodes\fR
 recursively output menu items.
 .TP
-\fB\-w\fR, \fB\-\-where\fR, \fB\-\-location\fR
-print physical location of Info file.
-.TP
 \fB\-\-vi\-keys\fR
 use vi\-like and less\-like key bindings.
 .TP
 \fB\-\-version\fR
 display version information and exit.
+.TP
+\fB\-w\fR, \fB\-\-where\fR, \fB\-\-location\fR
+print physical location of Info file.
 .PP
 The first non\-option argument, if present, is the menu entry to start from;
 it is searched for in all `dir' files along INFOPATH.
@@ -76,6 +76,9 @@ start at buffers node within emacs manual
 info \fB\-\-show\-options\fR emacs
 start at node with emacs' command line options
 .TP
+info \fB\-\-subnodes\fR \fB\-o\fR out.txt emacs
+dump entire manual to out.txt
+.TP
 info \fB\-f\fR ./foo.info
 show file ./foo.info, not searching dir
 .SH "REPORTING BUGS"
@@ -83,7 +86,8 @@ 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/texinfo/
 .SH COPYRIGHT
-Copyright \(co 2004 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.
+Copyright \(co 2008 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/Build/source/utils/texinfo/doc/info.5 b/Build/source/utils/texinfo/doc/info.5
index 08fd289908f..488d2a107ac 100644
--- a/Build/source/utils/texinfo/doc/info.5
+++ b/Build/source/utils/texinfo/doc/info.5
@@ -1,5 +1,5 @@
 .\" info(5)
-.\" $Id: info.5,v 1.2 2004/04/11 17:56:45 karl Exp $
+.\" $Id: info.5,v 1.3 2005/01/20 22:38:32 karl Exp $
 .\"
 .\" Copyright (C) 1998 Free Software Foundation, Inc.
 .\"
diff --git a/Build/source/utils/texinfo/doc/info.texi b/Build/source/utils/texinfo/doc/info.texi
index 014e9165087..89229d61cd7 100644
--- a/Build/source/utils/texinfo/doc/info.texi
+++ b/Build/source/utils/texinfo/doc/info.texi
@@ -14,21 +14,22 @@
 This file describes how to use Info, the on-line, menu-driven GNU
 documentation system.
 
-Copyright (C) 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
+Manual,'' and with the Back-Cover Texts as in (a) below.  A copy of the
 license is included in the section entitled ``GNU Free Documentation
 License'' in the Emacs manual.
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+(a) The FSF's Back-Cover Text is: ``You have freedom to copy and
+modify this GNU Manual, like GNU software.  Buying copies from GNU
+Press supports the FSF in developing GNU and promoting software
+freedom.''
 
 This document is part of a collection distributed under the GNU Free
 Documentation License.  If you want to distribute this document
@@ -72,28 +73,28 @@ If you are new to the Info reader and want to learn how to use it,
 type the command @kbd{h} now.  It brings you to a programmed
 instruction sequence.
 
-To read about expert-level Info commands, type @kbd{n} twice.  This
-brings you to @cite{Info for Experts}, skipping over the `Getting
+To read about advanced Info commands, type @kbd{n} twice.  This
+brings you to @cite{Advanced Info Commands}, skipping over the `Getting
 Started' chapter.
 @end ifinfo
 @end ifnottex
 
 @menu
 * Getting Started::             Getting started using an Info reader.
+* Advanced::                    Advanced Info commands.
 * Expert Info::                 Info commands for experts.
-* Creating an Info File::       How to make your own Info file.
 * Index::                       An index of topics, commands, and variables.
 @end menu
 
-@node Getting Started, Expert Info, Top, Top
+@node Getting Started, Advanced, Top, Top
 @comment  node-name,  next,  previous,  up
 @chapter Getting Started
 
 This first part of this Info manual describes how to get around inside
 of Info.  The second part of the manual describes various advanced
-Info commands, and how to write an Info as distinct from a Texinfo
-file.  The third part briefly explains how to generate Info files from
-Texinfo files.
+Info commands.  The third part briefly explains how to generate Info
+files from Texinfo files, and describes how to write an Info file
+by hand.
 
 @ifnotinfo
 This manual is primarily designed for browsing with an Info reader
@@ -153,13 +154,15 @@ number of lines; most readers pass by it without seeing it.)
 Since your terminal has a relatively small number of lines on its
 screen, it is necessary to give you special advice at the beginning.
 
-If you see the text @samp{--All----} near the bottom right corner
-of the screen, it means the entire text you are looking at fits on the
-screen.  If you see @samp{--Top----} instead, it means that there is
-more text below that does not fit.  To move forward through the text
-and see another screen full, press @key{SPC}, the Space bar.  To move
-back up, press the key labeled @samp{Backspace} or @samp{DEL} (on some
-keyboards, this key might be labeled @samp{Delete}).
+If the entire text you are looking at fits on the screen, the text
+@samp{All} will be displayed at the bottom of the screen.  In the
+stand-alone Info reader, it is displayed at the bottom right corner of
+the screen; in Emacs, it is displayed on the modeline.  If you see the
+text @samp{Top} instead, it means that there is more text below that
+does not fit.  To move forward through the text and see another screen
+full, press @key{SPC}, the Space bar.  To move back up, press the key
+labeled @samp{Backspace} or @samp{DEL} (on some keyboards, this key
+might be labeled @samp{Delete}).
 
 @ifinfo
 Here are 40 lines of junk, so you can try @key{SPC} and @key{DEL} and
@@ -238,10 +241,10 @@ line says that this is node @samp{Help} in the file @file{info}.
 (look at it now) says that the @samp{Next} node after this one is the
 node called @samp{Help-P}.  An advanced Info command lets you go to
 any node whose name you know.  In the stand-alone Info reader program,
-the header line shows the names of this node and the info file as
-well.  In Emacs, the header line is duplicated in a special typeface,
-and the duplicate remains at the top of the window all the time even
-if you scroll through the node.
+the header line shows the names of this node and the Info file as
+well.  In Emacs, the header line is displayed with a special typeface,
+and remains at the top of the window all the time even if you scroll
+through the node.
 
   Besides a @samp{Next}, a node can have a @samp{Previous} link, or an
 @samp{Up} link, or both.  As you can see, this node has all of these
@@ -260,7 +263,7 @@ links.
 
 @format
 >> If you are in Emacs and have a mouse, and if you already practiced
-   typing @kbd{n} to get to the next node, click now with the middle
+   typing @kbd{n} to get to the next node, click now with the left 
    mouse button on the @samp{Next} link to do the same ``the mouse way''.
 @end format
 
@@ -276,15 +279,14 @@ node, @samp{Help-^L}.
 
 @format
 >> But do not type @kbd{n} yet.  First, try the @kbd{p} command, or
-   (in Emacs) click the middle mouse button on the @samp{Prev} link.
-   That takes you to the @samp{Previous} node.  Then use @kbd{n} to
-   return here.
+   (in Emacs) click on the @samp{Prev} link.  That takes you to
+   the @samp{Previous} node.  Then use @kbd{n} to return here.
 @end format
 
   If you read this in Emacs, you will see an @samp{Info} item in the
 menu bar, close to its right edge.  Clicking the mouse on the
 @samp{Info} menu-bar item opens a menu of commands which include
-@samp{Next} and @samp{Prev} (and also some others which you didn't yet
+@samp{Next} and @samp{Previous} (and also some others which you didn't yet
 learn about).
 
   This all probably seems insultingly simple so far, but @emph{please
@@ -309,8 +311,8 @@ underlined as well; it says what the node is about.
 
   This is a big node and it does not all fit on your display screen.
 You can tell that there is more that is not visible because you
-can see the string @samp{--Top-----} rather than @samp{--All----} near
-the bottom right corner of the screen.
+can see the text @samp{Top} rather than @samp{All} near the bottom of
+the screen.
 
 @kindex SPC @r{(Info mode)}
 @kindex DEL @r{(Info mode)}
@@ -394,17 +396,13 @@ the @key{BACKSPACE} key (or @key{DEL}) many times.  You can also type
    Then come back, by typing @key{SPC} one or more times.
 @end format
 
-  If your screen is very tall, all of this node might fit at once.  In
-that case, @kbd{b} won't do anything.  But you could observe the
-effect of the @kbd{b} key if you use a smaller window.
-
 @kindex ? @r{(Info mode)}
 @findex Info-summary
   You have just learned a considerable number of commands.  If you
 want to use one but have trouble remembering which, you should type
-a @kbd{?} (in Emacs it runs the @code{Info-summary} command) which
-displays a brief list of commands.  When you are finished looking at
-the list, make it go away by typing a @key{SPC} repeatedly.
+@kbd{?}, which displays a brief list of commands.  When you are
+finished looking at the list, make it go away by typing @key{SPC}
+repeatedly.
 
 @format
 >> Type a @key{?} now.  Press @key{SPC} to see consecutive screenfuls of
@@ -597,7 +595,7 @@ line becomes blank again.  Then you can type Info commands again.
   The command to go to a subnode via a menu is @kbd{m}.  After you type
 the @kbd{m}, the line at the bottom of the screen says @samp{Menu item: }.
 You must then type the name of the subtopic you want, and end it with
-a @key{RET}.  In Emacs, @kbd{m} runs the command @code{Info-menu}.
+a @key{RET}.
 
 @cindex abbreviating Info subnodes
   You can abbreviate the subtopic name.  If the abbreviation is not
@@ -671,10 +669,12 @@ mistake.
 
   Another way to move to the menu subtopic lines and between them is
 to type @key{TAB}.  Each time you type a @key{TAB}, you move to the
-next subtopic line.  To move to a previous subtopic line, type
-@kbd{M-@key{TAB}}---that is, press and hold the @key{META} key and then
-press @key{TAB}.  (On some keyboards, the @key{META} key might be labeled
-@samp{Alt}.)
+next subtopic line.  To move to a previous subtopic line in the
+stand-alone reader, type @kbd{M-@key{TAB}}---that is, press and hold
+the @key{META} key and then press @key{TAB}.  (On some keyboards, the
+@key{META} key might be labeled @samp{Alt}.)  In Emacs Info, type
+@kbd{S-@key{TAB}} to move to a previous subtopic line (press and hold
+the @key{Shift} key and then press @key{TAB}).
 
   Once you move cursor to a subtopic line, press @key{RET} to go to
 that subtopic's node.
@@ -688,7 +688,7 @@ ends the subtopic's brief name.  You will see the subtopic's name
 change its appearance (usually, its background color will change), and
 the shape of the mouse pointer will change if your platform supports
 that.  After a while, if you leave the mouse on that spot, a small
-window will pop up, saying ``Mouse-2: go to that node'', or the same
+window will pop up, saying ``Mouse-2: go to that node,'' or the same
 message may appear at the bottom of the screen.
 
   @kbd{Mouse-2} is the second button of your mouse counting from the
@@ -723,11 +723,10 @@ usually used to ``stay on the same level but go backwards''.
 @kindex u @r{(Info mode)}
 @findex Info-up
   You can go back to the node @samp{Help-M} by typing the command
-@kbd{u} for ``Up'' (the Emacs command run by @kbd{u} is
-@code{Info-up}).  That puts you at the @emph{front} of the node---to
-get back to where you were reading you have to type some @key{SPC}s.
-(Some Info readers, such as the one built into Emacs, put you at the
-same place where you were reading in @samp{Help-M}.)
+@kbd{u} for ``Up''.  This puts you at the menu subtopic line pointing
+to the subnode that the @kbd{u} command brought you from.  (Some Info
+readers may put you at the @emph{front} of the node instead---to get
+back to where you were reading, you have to type some @key{SPC}s.)
 
   Another way to go Up is to click @kbd{Mouse-2} on the @samp{Up}
 pointer shown in the header line (provided that you have a mouse).
@@ -749,19 +748,21 @@ in Emacs.  Do @kbd{M-x visible-mode} to show or hide it.)
 
 @kindex f @r{(Info mode)}
 @findex Info-follow-reference
-  There are two ways to follow a cross reference.  You can move the
-cursor to it and press @key{RET}, just as in a menu.  @key{RET}
-follows the cross reference that the cursor is on.  Or you can type
-@kbd{f} and then specify the name of the cross reference (in this
-case, @samp{Cross}) as an argument.  In Emacs Info, @kbd{f} runs
-@code{Info-follow-reference},
-
-  In the @kbd{f} command, you select the cross reference with its
-name, so it does not matter where the cursor was.  If the cursor is on
-or near a cross reference, @kbd{f} suggests that reference name in
-parentheses as the default; typing @key{RET} will follow that
-reference.  However, if you type a different reference name, @kbd{f}
-will follow the other reference which has that name.
+  You can follow a cross reference by moving the cursor to it and
+press @key{RET}, just as in a menu.  In Emacs, you can also click
+@kbd{Mouse-1} on a cross reference to follow it; you can see that the
+cross reference is mouse-sensitive by moving the mouse pointer to the
+reference and watching how the underlying text and the mouse pointer
+change in response.
+
+  Another way to follow a cross reference is to type @kbd{f} and then
+specify the name of the cross reference (in this case, @samp{Cross})
+as an argument.  For this command, it does not matter where the cursor
+was.  If the cursor is on or near a cross reference, @kbd{f} suggests
+that reference name in parentheses as the default; typing @key{RET}
+will follow that reference.  However, if you type a different
+reference name, @kbd{f} will follow the other reference which has that
+name.
 
 @format
 >> Type @kbd{f}, followed by @kbd{Cross}, and then @key{RET}.
@@ -785,8 +786,9 @@ to cancel the @kbd{f}.
    type a @kbd{Control-g} and see how the @samp{f} gives up.
 @end format
 
-  The @key{TAB} and @kbd{M-@key{TAB}} key, which move between menu
-items in a menu, also move between cross references outside of menus.
+  The @key{TAB}, @kbd{M-@key{TAB}} and @kbd{S-@key{TAB}} keys,
+which move between menu items in a menu, also move between cross
+references outside of menus.
 
   Sometimes a cross reference (or a node) can lead to another file (in
 other words another ``manual''), or, on occasion, even a file on a
@@ -795,36 +797,22 @@ stand-alone Info avoid using remote links).  Such a cross reference
 looks like this: @xref{Top,, Overview of Texinfo, texinfo, Texinfo:
 The GNU Documentation Format}.  (After following this link, type
 @kbd{l} to get back to this node.)  Here the name @samp{texinfo}
-between parentheses (shown in the stand-alone version) refers to the
-file name.  This file name appears in cross references and node names
-if it differs from the current file.  In Emacs, the file name is
-hidden (along with other text).  (Use @kbd{M-x visible-mode} to show
-or hide it.)
-
-  The remainder of this node applies only to the Emacs version.  If
-you use the stand-alone version, you can type @kbd{n} immediately.
-
-  To some users, switching manuals is a much bigger switch than
-switching sections.  These users like to know that they are going to
-be switching to another manual (and which one) before actually doing
-so, especially given that, if one does not notice, Info commands like
-@kbd{t} (see the next node) can have confusing results.
-
-  If you put your mouse over the cross reference and if the cross
-reference leads to a different manual, then the information appearing
-in a separate box (tool tip) or in the echo area, will mention the
-file the cross reference will carry you to (between parentheses).
-This is also true for menu subtopic names.  If you have a mouse, just
-leave it over the @samp{Overview} cross reference above and watch what
-happens.
-
-  If you always like to have that information available without having
-to move your mouse over the cross reference, set
-@code{Info-hide-note-references} to a value other than t (@pxref{Emacs
-Info Variables}).  You might also want to do that if you have a lot of
-cross references to files on remote machines and have non-permanent or
-slow access, since otherwise you might not be able to distinguish
-between local and remote links.
+between parentheses refers to the file name.  This file name appears
+in cross references and node names if it differs from the current
+file, so you can always know that you are going to be switching to
+another manual and which one.
+
+However, Emacs normally hides some other text in cross-references.
+If you put your mouse over the cross reference, then the information
+appearing in a separate box (tool tip) or in the echo area will show
+the full cross-reference including the file name and the node name of
+the cross reference.  If you have a mouse, just leave it over the
+cross reference @xref{Top,, Overview of Texinfo, texinfo, Texinfo:
+The GNU Documentation Format}, and watch what happens.  If you
+always like to have that information visible without having to move
+your mouse over the cross reference, use @kbd{M-x visible-mode}, or
+set @code{Info-hide-note-references} to a value other than @code{t}
+(@pxref{Emacs Info Variables}).
 
 @format
 >> Now type @kbd{n} to learn more commands.
@@ -845,17 +833,18 @@ This allows Info readers to go to the exact line of an entry, not just
 the start of the containing node.)
 
   You can get to the index from the main menu of the file with the
-@kbd{m} command; then you can use the @kbd{m} command again in the
-index node to go to the node that describes the topic you want.
+@kbd{m} command and the name of the index node; then you can use the
+@kbd{m} command again in the index node to go to the node that
+describes the topic you want.
 
   There is also a short-cut Info command, @kbd{i}, which does all of
 that for you.  It searches the index for a given topic (a string) and
 goes to the node which is listed in the index for that topic.
-@xref{Info Search}, for a full explanation.
+@xref{Search Index}, for a full explanation.
 
 @kindex l @r{(Info mode)}
-@findex Info-last
-@cindex going back in Info mode
+@findex Info-history-back
+@cindex going back in Info history
   If you have been moving around to different nodes and wish to
 retrace your steps, the @kbd{l} command (@kbd{l} for @dfn{last}) will
 do that, one node-step at a time.  As you move from node to node, Info
@@ -863,8 +852,6 @@ records the nodes where you have been in a special history list.  The
 @kbd{l} command revisits nodes in the history list; each successive
 @kbd{l} command moves one step back through the history.
 
-  In Emacs, @kbd{l} runs the command @code{Info-last}.
-
 @format
 >> Try typing @kbd{p p n} and then three @kbd{l}'s, pausing in between
 to see what each @kbd{l} does.  You should wind up right back here.
@@ -875,6 +862,20 @@ where @emph{you} last were, whereas @kbd{p} always moves to the node
 which the header says is the @samp{Previous} node (from this node, the
 @samp{Prev} link leads to @samp{Help-Xref}).
 
+@kindex r @r{(Info mode)}
+@findex Info-history-forward
+@cindex going forward in Info history
+  You can use the @kbd{r} command (@code{Info-history-forward} in Emacs)
+to revisit nodes in the history list in the forward direction, so that
+@kbd{r} will return you to the node you came from by typing @kbd{l}.
+
+@kindex L @r{(Info mode)}
+@findex Info-history
+@cindex history list of visited nodes
+  The @kbd{L} command (@code{Info-history} in Emacs) creates a virtual
+node that contains a list of all nodes you visited.  You can select
+a previously visited node from this menu to revisit it.
+
 @kindex d @r{(Info mode)}
 @findex Info-directory
 @cindex go to Directory node
@@ -898,54 +899,172 @@ This is useful if you want to browse the manual's main menu, or select
 some specific top-level menu item.  The Emacs command run by @kbd{t}
 is @code{Info-top-node}.
 
-  Clicking @kbd{Mouse-2} on or near a cross reference also follows the
-reference.  You can see that the cross reference is mouse-sensitive by
-moving the mouse pointer to the reference and watching how the
-underlying text and the mouse pointer change in response.
-
 @format
 >> Now type @kbd{n} to see the last node of the course.
 @end format
 
-  @xref{Expert Info}, for more advanced Info features.
+  @xref{Advanced}, for more advanced Info features.
 
 @c If a menu appears at the end of this node, remove it.
 @c It is an accident of the menu updating command.
 
-@node Expert Info
-@chapter Info for Experts
+@node Help-Q,  , Help-Int, Getting Started
+@comment  node-name,  next,  previous,  up
+@section Quitting Info
+
+@kindex q @r{(Info mode)}
+@findex Info-exit
+@cindex quitting Info mode
+  To get out of Info, back to what you were doing before, type @kbd{q}
+for @dfn{Quit}.  This runs @code{Info-exit} in Emacs.
+
+  This is the end of the basic course on using Info.  You have learned
+how to move in an Info document, and how to follow menus and cross
+references.  This makes you ready for reading manuals top to bottom,
+as new users should do when they learn a new package.
+
+  Another set of Info commands is useful when you need to find
+something quickly in a manual---that is, when you need to use a manual
+as a reference rather than as a tutorial.  We urge you to learn
+these search commands as well.  If you want to do that now, follow this
+cross reference to @ref{Advanced}.
+
+Yet another set of commands are meant for experienced users; you can
+find them by looking in the Directory node for documentation on Info.
+Finding them will be a good exercise in using Info in the usual
+manner.
+
+@format
+>> Type @kbd{d} to go to the Info directory node; then type
+   @kbd{mInfo} and Return, to get to the node about Info and
+   see what other help is available.
+@end format
+
+
+@node Advanced
+@chapter Advanced Info Commands
 
-  This chapter describes various Info commands for experts.  (If you
+  This chapter describes various advanced Info commands.  (If you
 are using a stand-alone Info reader, there are additional commands
 specific to it, which are documented in several chapters of @ref{Top,,
 GNU Info, info-stnd, GNU Info}.)
 
-  This chapter also explains how to write an Info as distinct from a
-Texinfo file.  (However, in most cases, writing a Texinfo file is
-better, since you can use it to make a printed manual or produce other
-formats, such as HTML and DocBook, as well as for generating Info
-files.)  @xref{Top,, Overview of Texinfo, texinfo, Texinfo: The GNU
-Documentation Format}.
+@kindex C-q @r{(Info mode)}
+  One advanced command useful with most of the others described here
+is @kbd{C-q}, which ``quotes'' the next character so that it is
+entered literally (@pxref{Inserting Text,,,emacs,The GNU Emacs
+Manual}).  For example, pressing @kbd{?} ordinarily brings up a list
+of completion possibilities.  If you want to (for example) search for
+an actual @samp{?} character, the simplest way is to insert it using
+@kbd{C-q ?}.  This works the same in Emacs and stand-alone Info.
 
 @menu
-* Advanced::             Advanced Info commands: g, e, and 1 - 9.
-* Info Search::          How to search Info documents for specific subjects.
-* Add::                  Describes how to add new nodes to the hierarchy.
-                           Also tells what nodes look like.
-* Menus::                How to add to or create menus in Info nodes.
-* Cross-refs::           How to add cross-references to Info nodes.
-* Tags::                 How to make tags tables for Info files.
-* Checking::             Checking an Info File
+* Search Text::          How to search Info documents.
+* Search Index::         How to search the indices for specific subjects.
+* Go to node::           How to go to a node by name.
+* Choose menu subtopic:: How to choose a menu subtopic by its number.
+* Create Info buffer::   How to create a new Info buffer in Emacs.
 * Emacs Info Variables:: Variables modifying the behavior of Emacs Info.
 @end menu
 
-@node Advanced, Info Search,  , Expert Info
+
+@node Search Text, Search Index,  , Advanced
 @comment  node-name,  next,  previous,  up
-@section Advanced Info Commands
+@section @kbd{s} searches Info documents
+
+@cindex searching Info documents
+@cindex Info document as a reference
+  The commands which move between and inside nodes allow you to read
+the entire manual or its large portions.  But what if you need to find
+some information in the manual as fast as you can, and you don't know
+or don't remember in what node to look for it?  This need arises when
+you use a manual as a @dfn{reference}, or when it is impractical to
+read the entire manual before you start using the programs it
+describes.
+
+  Info has powerful searching facilities that let you find things
+quickly.  You can search either the manual text or its indices.
+
+@kindex s @r{(Info mode)}
+@findex Info-search
+  The @kbd{s} command allows you to search a whole Info file for a string.
+It switches to the next node if and when that is necessary.  You
+type @kbd{s} followed by the string to search for, terminated by
+@key{RET}.  To search for the same string again, just @kbd{s} followed
+by @key{RET} will do.  The file's nodes are scanned in the order
+they are in the file, which has no necessary relationship to the
+order that they may be in the tree structure of menus and @samp{next}
+pointers.  But normally the two orders are not very different.  In any
+case, you can always look at the mode line to find out what node you have
+reached, if the header is not visible (this can happen, because @kbd{s}
+puts your cursor at the occurrence of the string, not at the beginning
+of the node).
+
+@kindex M-s @r{(Info mode)}
+  In Emacs, @kbd{Meta-s} is equivalent to @kbd{s}.  That is for
+compatibility with other GNU packages that use @kbd{M-s} for a similar
+kind of search command.  Both @kbd{s} and @kbd{M-s} run in Emacs the
+command @code{Info-search}.
+
+@kindex C-s @r{(Info mode)}
+@kindex C-r @r{(Info mode)}
+@findex isearch
+  Instead of using @kbd{s} in Emacs Info and in the stand-alone Info,
+you can use an incremental search started with @kbd{C-s} or @kbd{C-r}.
+It can search through multiple Info nodes.  @xref{Incremental Search,,,
+emacs, The GNU Emacs Manual}.  In Emacs, you can disable this behavior
+by setting the variable @code{Info-isearch-search} to @code{nil}
+(@pxref{Emacs Info Variables}).
+
+@node Search Index, Go to node, Search Text, Advanced
+@comment  node-name,  next,  previous,  up
+@section @kbd{i} searches the indices for specific subjects
+
+@cindex searching Info indices
+@kindex i @r{(Info mode)}
+@findex Info-index
+  Since most topics in the manual should be indexed, you should try
+the index search first before the text search.  The @kbd{i} command
+prompts you for a subject and then looks up that subject in the
+indices.  If it finds an index entry with the subject you typed, it
+goes to the node to which that index entry points.  You should browse
+through that node to see whether the issue you are looking for is
+described there.  If it isn't, type @kbd{,} one or more times to go
+through additional index entries which match your subject.
+
+  The @kbd{i} command and subsequent @kbd{,} commands find all index
+entries which include the string you typed @emph{as a substring}.
+For each match, Info shows in the echo area the full index entry it
+found.  Often, the text of the full index entry already gives you
+enough information to decide whether it is relevant to what you are
+looking for, so we recommend that you read what Info shows in the echo
+area before looking at the node it displays.
+
+  Since @kbd{i} looks for a substring, you can search for subjects even
+if you are not sure how they are spelled in the index.  For example,
+suppose you want to find something that is pertinent to commands which
+complete partial input (e.g., when you type @key{TAB}).  If you want
+to catch index entries that refer to ``complete,'' ``completion,'' and
+``completing,'' you could type @kbd{icomplet@key{RET}}.
 
-Here are some more Info commands that make it easier to move around.
+  Info documents which describe programs should index the commands,
+options, and key sequences that the program provides.  If you are
+looking for a description of a command, an option, or a key, just type
+their names when @kbd{i} prompts you for a topic.  For example, if you
+want to read the description of what the @kbd{C-l} key does, type
+@kbd{iC-l@key{RET}} literally.
 
-@subheading @kbd{g} goes to a node by name
+@findex info-apropos
+@findex index-apropos
+If you aren't sure which manual documents the topic you are looking
+for, try the @kbd{M-x info-apropos} command in Emacs, or the @kbd{M-x
+index-apropos} command in the stand-alone reader.  It prompts for
+a string and then looks up that string in all the indices of all the
+Info documents installed on your system.
+
+@node Go to node, Choose menu subtopic, Search Index, Advanced
+@comment  node-name,  next,  previous,  up
+@section @kbd{g} goes to a node by name
 
 @kindex g @r{(Info mode)}
 @findex Info-goto-node
@@ -953,8 +1072,7 @@ Here are some more Info commands that make it easier to move around.
   If you know a node's name, you can go there by typing @kbd{g}, the
 name, and @key{RET}.  Thus, @kbd{gTop@key{RET}} would go to the node
 called @samp{Top} in this file.  (This is equivalent to @kbd{t}, see
-@ref{Help-Int}.)  @kbd{gAdvanced@key{RET}} would come back here.
-@kbd{g} in Emacs runs the command @code{Info-goto-node}.
+@ref{Help-Int}.)  @kbd{gGo to node@key{RET}} would come back here.
 
   Unlike @kbd{m}, @kbd{g} does not allow the use of abbreviations.
 But it does allow completion, so you can type @key{TAB} to complete a
@@ -969,9 +1087,11 @@ the node @samp{Top} in the Info file @file{dir}.  Likewise,
 
   The node name @samp{*} specifies the whole file.  So you can look at
 all of the current file by typing @kbd{g*@key{RET}} or all of any
-other file with @kbd{g(@var{filename})@key{RET}}.
+other file with @kbd{g(@var{filename})*@key{RET}}.
 
-@subheading @kbd{1}--@kbd{9} choose a menu subtopic by its number
+@node Choose menu subtopic, Create Info buffer, Go to node, Advanced
+@comment  node-name,  next,  previous,  up
+@section @kbd{1}--@kbd{9} choose a menu subtopic by its number
 
 @kindex 1 @r{through} 9 @r{(Info mode)}
 @findex Info-nth-menu-item
@@ -982,8 +1102,7 @@ you might like to use the commands @kbd{1}, @kbd{2}, @kbd{3}, @kbd{4},
 with a name of a menu subtopic.  @kbd{1} goes through the first item
 in the current node's menu; @kbd{2} goes through the second item, etc.
 In the stand-alone reader, @kbd{0} goes through the last menu item;
-this is so you need not count how many entries are there.  In Emacs,
-the digit keys run the command @code{Info-nth-menu-item}.
+this is so you need not count how many entries are there.
 
   If your display supports multiple fonts, colors or underlining, and
 you are using Emacs' Info mode to read Info files, the third, sixth
@@ -996,28 +1115,15 @@ underlining.  If you need to actually count items, it is better to use
 @kbd{m} instead, and specify the name, or use @key{TAB} to quickly
 move between menu items.
 
-@subheading @kbd{e} makes Info document editable
-
-@kindex e @r{(Info mode)}
-@findex Info-edit
-@cindex edit Info document
-  The Info command @kbd{e} changes from Info mode to an ordinary
-Emacs editing mode, so that you can edit the text of the current node.
-Type @kbd{C-c C-c} to switch back to Info.  The @kbd{e} command is allowed
-only if the variable @code{Info-enable-edit} is non-@code{nil}.
-
-  The @kbd{e} command only works in Emacs, where it runs the command
-@code{Info-edit}.  The stand-alone Info reader doesn't allow you to
-edit the Info file, so typing @kbd{e} there goes to the end of the
-current node.
-
-@subheading @kbd{M-n} creates a new independent Info buffer in Emacs
+@node Create Info buffer, Emacs Info Variables, Choose menu subtopic, Advanced
+@comment  node-name,  next,  previous,  up
+@section @kbd{M-n} creates a new independent Info buffer in Emacs
 
 @kindex M-n @r{(Info mode)}
 @findex clone-buffer
 @cindex multiple Info buffers
   If you are reading Info in Emacs, you can select a new independent
-Info buffer in another window by typing @kbd{M-n}.  The new buffer
+Info buffer in a new Emacs window by typing @kbd{M-n}.  The new buffer
 starts out as an exact copy of the old one, but you will be able to
 move independently between nodes in the two buffers.  (In Info mode,
 @kbd{M-n} runs the Emacs command @code{clone-buffer}.)
@@ -1028,89 +1134,132 @@ m} and @kbd{C-u g} go to a new node in exactly the same way that
 @kbd{m} and @kbd{g} do, but they do so in a new Info buffer which they
 select in another window.
 
-@node Info Search, Add, Advanced, Expert Info
+  Another way to produce new Info buffers in Emacs is to use a numeric
+prefix argument for the @kbd{C-h i} command (@code{info}) which
+switches to the Info buffer with that number.  Thus, @kbd{C-u 2 C-h i}
+switches to the buffer @samp{*info*<2>}, creating it if necessary.
+
+@node Emacs Info Variables, , Create Info buffer, Advanced
 @comment  node-name,  next,  previous,  up
-@section How to search Info documents for specific subjects
+@section Emacs Info-mode Variables
 
-@cindex searching Info documents
-@cindex Info document as a reference
-  The commands which move between and inside nodes allow you to read
-the entire manual or its large portions.  But what if you need to find
-some information in the manual as fast as you can, and you don't know
-or don't remember in what node to look for it?  This need arises when
-you use a manual as a @dfn{reference}, or when it is impractical to
-read the entire manual before you start using the programs it
-describes.
+The following variables may modify the behavior of Info-mode in Emacs;
+you may wish to set one or several of these variables interactively,
+or in your init file.  @xref{Examining, Examining and Setting
+Variables, Examining and Setting Variables, emacs, The GNU Emacs
+Manual}.  The stand-alone Info reader program has its own set of
+variables, described in @ref{Variables,, Manipulating Variables,
+info-stnd, GNU Info}.
 
-  Info has powerful searching facilities that let you find things
-quickly.  You can search either the manual indices or its text.
+@vtable @code
+@item Info-directory-list
+The list of directories to search for Info files.  Each element is a
+string (directory name) or @code{nil} (try default directory).  If not
+initialized Info uses the environment variable @env{INFOPATH} to
+initialize it, or @code{Info-default-directory-list} if there is no
+@env{INFOPATH} variable in the environment.
 
-@kindex i @r{(Info mode)}
-@findex Info-index
-  Since most subjects related to what the manual describes should be
-indexed, you should try the index search first.  The @kbd{i} command
-prompts you for a subject and then looks up that subject in the
-indices.  If it finds an index entry with the subject you typed, it
-goes to the node to which that index entry points.  You should browse
-through that node to see whether the issue you are looking for is
-described there.  If it isn't, type @kbd{,} one or more times to go
-through additional index entries which match your subject.
+If you wish to customize the Info directory search list for both Emacs
+Info and stand-alone Info, it is best to set the @env{INFOPATH}
+environment variable, since that applies to both programs.
 
-  The @kbd{i} command finds all index entries which include the string
-you typed @emph{as a substring}.  For each match, Info shows in the
-echo area the full index entry it found.  Often, the text of the full
-index entry already gives you enough information to decide whether it
-is relevant to what you are looking for, so we recommend that you read
-what Info shows in the echo area before looking at the node it
-displays.
+@item Info-additional-directory-list
+A list of additional directories to search for Info documentation files.
+These directories are not searched for merging the @file{dir} file.
 
-  Since @kbd{i} looks for a substring, you can search for subjects even
-if you are not sure how they are spelled in the index.  For example,
-suppose you want to find something that is pertinent to commands which
-complete partial input (e.g., when you type @key{TAB}).  If you want
-to catch index entries that refer to ``complete'', ``completion'', and
-``completing'', you could type @kbd{icomplet@key{RET}}.
+@item Info-mode-hook
+Hooks run when @code{Info-mode} is called.  By default, it contains
+the hook @code{turn-on-font-lock} which enables highlighting of Info
+files.  You can change how the highlighting looks by customizing the
+faces @code{info-node}, @code{info-xref}, @code{info-xref-visited},
+@code{info-header-xref}, @code{info-header-node}, @code{info-menu-header},
+@code{info-menu-star}, and @code{info-title-@var{n}} (where @var{n}
+is the level of the section, a number between 1 and 4).  To customize
+a face, type @kbd{M-x customize-face @key{RET} @var{face} @key{RET}},
+where @var{face} is one of the face names listed here.
 
-  Info documents which describe programs should index the commands,
-options, and key sequences that the program provides.  If you are
-looking for a description of a command, an option, or a key, just type
-their names when @kbd{i} prompts you for a topic.  For example, if you
-want to read the description of what the @kbd{C-f} key does, type
-@kbd{i C - f @key{RET}}.  Here @kbd{C-f} are 3 literal characters
-@samp{C}, @samp{-}, and @samp{f}, not the ``Control-f'' command key
-you type inside Emacs to run the command bound to @kbd{C-f}.
+@item Info-fontify-maximum-menu-size
+Maximum size of menu to fontify if @code{font-lock-mode} is non-@code{nil}.
 
-  In Emacs, @kbd{i} runs the command @code{Info-index}.
+@item Info-fontify-visited-nodes
+If non-@code{nil}, menu items and cross-references pointing to visited
+nodes are displayed in the @code{info-xref-visited} face.
 
-@findex info-apropos
-If you don't know what manual documents something, try the @kbd{M-x
-info-apropos} command.  It prompts for a string and then looks up that
-string in all the indices of all the Info documents installed on your
-system.
+@item Info-use-header-line
+If non-@code{nil}, Emacs puts in the Info buffer a header line showing
+the @samp{Next}, @samp{Prev}, and @samp{Up} links.  A header line does
+not scroll with the rest of the buffer, making these links always
+visible.
 
-@kindex s @r{(Info mode)}
-@findex Info-search
-  The @kbd{s} command allows you to search a whole file for a string.
-It switches to the next node if and when that is necessary.  You
-type @kbd{s} followed by the string to search for, terminated by
-@key{RET}.  To search for the same string again, just @kbd{s} followed
-by @key{RET} will do.  The file's nodes are scanned in the order
-they are in in the file, which has no necessary relationship to the
-order that they may be in the tree structure of menus and @samp{next}
-pointers.  But normally the two orders are not very different.  In any
-case, you can always do a @kbd{b} to find out what node you have
-reached, if the header is not visible (this can happen, because @kbd{s}
-puts your cursor at the occurrence of the string, not at the beginning
-of the node).
+@item Info-hide-note-references
+As explained in earlier nodes, the Emacs version of Info normally
+hides some text in menus and cross-references.  You can completely
+disable this feature, by setting this option to @code{nil}.  Setting
+it to a value that is neither @code{nil} nor @code{t} produces an
+intermediate behavior, hiding a limited amount of text, but showing
+all text that could potentially be useful.
+
+@item Info-scroll-prefer-subnodes
+If set to a non-@code{nil} value, @key{SPC} and @key{BACKSPACE} (or
+@key{DEL}) keys in a menu visit subnodes of the current node before
+scrolling to its end or beginning, respectively.  For example, if the
+node's menu appears on the screen, the next @key{SPC} moves to a
+subnode indicated by the following menu item.  Setting this option to
+@code{nil} results in behavior similar to the stand-alone Info reader
+program, which visits the first subnode from the menu only when you
+hit the end of the current node.  The default is @code{nil}.
+
+@item Info-isearch-search
+If non-@code{nil}, isearch in Info searches through multiple nodes.
+
+@item Info-enable-active-nodes
+When set to a non-@code{nil} value, allows Info to execute Lisp code
+associated with nodes.  The Lisp code is executed when the node is
+selected.  The Lisp code to be executed should follow the node
+delimiter (the @samp{DEL} character) and an @samp{execute: } tag, like
+this:
+
+@example
+^_execute: (message "This is an active node!")
+@end example
+@end vtable
 
-@kindex M-s @r{(Info mode)}
-  In Emacs, @kbd{Meta-s} is equivalent to @kbd{s}.  That is for
-compatibility with other GNU packages that use @kbd{M-s} for a similar
-kind of search command.  Both @kbd{s} and @kbd{M-s} run in Emacs the
-command @code{Info-search}.
 
+@node Expert Info
+@chapter Info for Experts
 
-@node Add, Menus, Info Search, Expert Info
+  This chapter explains how to write an Info file by hand.  However,
+in most cases, writing a Texinfo file is better, since you can use it
+to make a printed manual or produce other formats, such as HTML and
+DocBook, as well as for generating Info files.
+
+The @code{makeinfo} command converts a Texinfo file into an Info file;
+@code{texinfo-format-region} and @code{texinfo-format-buffer} are GNU
+Emacs functions that do the same.
+
+@xref{Top,, Overview of Texinfo, texinfo, Texinfo: The GNU
+Documentation Format}, for how to write a Texinfo file.
+
+@xref{Creating an Info File,,, texinfo, Texinfo: The GNU Documentation
+Format}, for how to create an Info file from a Texinfo file.
+
+@xref{Installing an Info File,,, texinfo, Texinfo: The GNU
+Documentation Format}, for how to install an Info file after you
+have created one.
+
+However, if you want to edit an Info file manually and install it manually,
+here is how.
+
+@menu
+* Add::                   Describes how to add new nodes to the hierarchy.
+                            Also tells what nodes look like.
+* Menus::                 How to add to or create menus in Info nodes.
+* Cross-refs::            How to add cross-references to Info nodes.
+* Tags::                  How to make tags tables for Info files.
+* Checking::              Checking an Info File.
+@end menu
+
+@node Add, Menus,  , Expert Info
 @comment  node-name,  next,  previous,  up
 @section Adding a new node to Info
 
@@ -1123,14 +1272,6 @@ Create some nodes, in some file, to document that topic.
 Put that topic in the menu in the directory.  @xref{Menus, Menu}.
 @end enumerate
 
-  Usually, the way to create the nodes is with Texinfo (@pxref{Top,,
-Overview of Texinfo, texinfo, Texinfo: The GNU Documentation Format});
-this has the advantage that you can also make a printed manual or HTML
-from them.  You would use the @samp{@@dircategory} and
-@samp{@@direntry} commands to put the manual into the Info directory.
-However, if you want to edit an Info file manually and install it
-manually, here is how.
-
 @cindex node delimiters
   The new node can live in an existing documentation file, or in a new
 one.  It must have a @samp{^_} character before it (invisible to the
@@ -1165,7 +1306,7 @@ in the names is insignificant.
 what appears after the @samp{Node: } in that node's first line.  For
 example, this node's name is @samp{Add}.  A node in another file is
 named by @samp{(@var{filename})@var{node-within-file}}, as in
-@samp{(info)Add} for this node.  If the file name starts with ``./'',
+@samp{(info)Add} for this node.  If the file name starts with @samp{./},
 then it is relative to the current directory; otherwise, it is
 relative starting from the standard directory for Info files of your
 site.  The name @samp{(@var{filename})Top} can be abbreviated to just
@@ -1223,7 +1364,7 @@ short abbreviations.  In a long menu, it is a good idea to capitalize
 the beginning of each item name which is the minimum acceptable
 abbreviation for it (a long menu is more than 5 or so entries).
 
-  The nodes listed in a node's menu are called its ``subnodes'', and it
+  The nodes listed in a node's menu are called its ``subnodes,'' and it
 is their ``superior''.  They should each have an @samp{Up:} pointing at
 the superior.  It is often useful to arrange all or most of the subnodes
 in a sequence of @samp{Next} and @samp{Previous} pointers so that
@@ -1237,7 +1378,7 @@ Info's files live in that file directory, but they do not have to; and
 files in that directory are not automatically listed in the Info
 Directory node.
 
-  Also, although the Info node graph is claimed to be a ``hierarchy'',
+  Also, although the Info node graph is claimed to be a ``hierarchy,''
 in fact it can be @emph{any} directed graph.  Shared structures and
 pointer cycles are perfectly possible, and can be used if they are
 appropriate to the meaning to be expressed.  There is no need for all
@@ -1245,9 +1386,9 @@ the nodes in a file to form a connected structure.  In fact, this file
 has two connected components.  You are in one of them, which is under
 the node @samp{Top}; the other contains the node @samp{Help} which the
 @kbd{h} command goes to.  In fact, since there is no garbage
-collector, nothing terrible happens if a substructure is not pointed
-to, but such a substructure is rather useless since nobody can
-ever find out that it exists.
+collector on the node graph, nothing terrible happens if a substructure
+is not pointed to, but such a substructure is rather useless since nobody
+can ever find out that it exists.
 
 @node Cross-refs, Tags, Menus, Expert Info
 @comment  node-name,  next,  previous,  up
@@ -1291,44 +1432,11 @@ cannot expect this node to have a @samp{Next}, @samp{Previous} or
 >> Type @kbd{l} to return to the node where the cross reference was.
 @end format
 
-@node Help-Q,  , Help-Int, Getting Started
-@comment  node-name,  next,  previous,  up
-@section Quitting Info
-
-@kindex q @r{(Info mode)}
-@findex Info-exit
-@cindex quitting Info mode
-  To get out of Info, back to what you were doing before, type @kbd{q}
-for @dfn{Quit}.  This runs @code{Info-exit} in Emacs.
-
-  This is the end of the basic course on using Info.  You have learned
-how to move in an Info document, and how to follow menus and cross
-references.  This makes you ready for reading manuals top to bottom,
-as new users should do when they learn a new package.
-
-  Another set of Info commands is useful when you need to find
-something quickly in a manual---that is, when you need to use a manual
-as a reference rather than as a tutorial.  We urge you to learn
-these search commands as well.  If you want to do that now, follow this
-cross reference to @ref{Info Search}.
-
-Yet another set of commands are meant for experienced users; you can
-find them by looking in the Directory node for documentation on Info.
-Finding them will be a good exercise in using Info in the usual
-manner.
-
-@format
->> Type @kbd{d} to go to the Info directory node; then type
-   @kbd{mInfo} and Return, to get to the node about Info and
-   see what other help is available.
-@end format
-
-
 @node Tags, Checking, Cross-refs, Expert Info
 @comment  node-name,  next,  previous,  up
 @section Tags Tables for Info Files
 
-@cindex tags tables in info files
+@cindex tags tables in Info files
   You can speed up the access to nodes of a large Info file by giving
 it a tags table.  Unlike the tags table for a program, the tags table for
 an Info file lives inside the file itself and is used
@@ -1368,8 +1476,7 @@ the beginning of the node's header (ending just after the node name),
 a @samp{DEL} character, and the character position in the file of the
 beginning of the node.
 
-
-@node Checking, Emacs Info Variables, Tags, Expert Info
+@node Checking, , Tags, Expert Info
 @section Checking an Info File
 
 When creating an Info file, it is easy to forget the name of a node when
@@ -1388,101 +1495,6 @@ usually few.
 To check an Info file, do @kbd{M-x Info-validate} while looking at any
 node of the file with Emacs Info mode.
 
-@node Emacs Info Variables, , Checking, Expert Info
-@section Emacs Info-mode Variables
-
-The following variables may modify the behavior of Info-mode in Emacs;
-you may wish to set one or several of these variables interactively, or
-in your @file{~/.emacs} init file.  @xref{Examining, Examining and Setting
-Variables, Examining and Setting Variables, emacs, The GNU Emacs
-Manual}.  The stand-alone Info reader program has its own set of
-variables, described in @ref{Variables,, Manipulating Variables,
-info-stnd, GNU Info}.
-
-@vtable @code
-@item Info-directory-list
-The list of directories to search for Info files.  Each element is a
-string (directory name) or @code{nil} (try default directory).  If not
-initialized Info uses the environment variable @env{INFOPATH} to
-initialize it, or @code{Info-default-directory-list} if there is no
-@env{INFOPATH} variable in the environment.
-
-If you wish to customize the Info directory search list for both Emacs
-info and stand-alone Info, it is best to set the @env{INFOPATH}
-environment variable, since that applies to both programs.
-
-@item Info-additional-directory-list
-A list of additional directories to search for Info documentation files.
-These directories are not searched for merging the @file{dir} file.
-
-@item Info-fontify
-When set to a non-@code{nil} value, enables highlighting of Info
-files.  The default is @code{t}.  You can change how the highlighting
-looks by customizing the faces @code{info-node}, @code{info-xref},
-@code{info-header-xref}, @code{info-header-node}, @code{info-menu-5},
-@code{info-menu-header}, and @code{info-title-@var{n}-face} (where
-@var{n} is the level of the section, a number between 1 and 4).  To
-customize a face, type @kbd{M-x customize-face @key{RET} @var{face}
-@key{RET}}, where @var{face} is one of the face names listed here.
-
-@item Info-use-header-line
-If non-@code{nil}, Emacs puts in the Info buffer a header line showing
-the @samp{Next}, @samp{Prev}, and @samp{Up} links.  A header line does
-not scroll with the rest of the buffer, making these links always
-visible.
-
-@item Info-hide-note-references
-As explained in earlier nodes, the Emacs version of Info normally
-hides some text in menus and cross-references.  You can completely
-disable this feature, by setting this option to @code{nil}.  Setting
-it to a value that is neither @code{nil} nor @code{t} produces an
-intermediate behavior, hiding a limited amount of text, but showing
-all text that could potentially be useful.
-
-@item Info-scroll-prefer-subnodes
-If set to a non-@code{nil} value, @key{SPC} and @key{BACKSPACE} (or
-@key{DEL}) keys in a menu visit subnodes of the current node before
-scrolling to its end or beginning, respectively.  For example, if the
-node's menu appears on the screen, the next @key{SPC} moves to a
-subnode indicated by the following menu item.  Setting this option to
-@code{nil} results in behavior similar to the stand-alone Info reader
-program, which visits the first subnode from the menu only when you
-hit the end of the current node.  The default is @code{nil}.
-
-@item Info-enable-active-nodes
-When set to a non-@code{nil} value, allows Info to execute Lisp code
-associated with nodes.  The Lisp code is executed when the node is
-selected.  The Lisp code to be executed should follow the node
-delimiter (the @samp{DEL} character) and an @samp{execute: } tag, like
-this:
-
-@example
-^_execute: (message "This is an active node!")
-@end example
-
-@item Info-enable-edit
-Set to @code{nil}, disables the @samp{e} (@code{Info-edit}) command.  A
-non-@code{nil} value enables it.  @xref{Add, Edit}.
-@end vtable
-
-
-@node Creating an Info File
-@chapter Creating an Info File from a Texinfo File
-
-@code{makeinfo} is a utility that converts a Texinfo file into an Info
-file; @code{texinfo-format-region} and @code{texinfo-format-buffer} are
-GNU Emacs functions that do the same.
-
-@xref{Top,, Overview of Texinfo, texinfo, Texinfo: The GNU
-Documentation Format}, to learn how to write a Texinfo file.
-
-@xref{Creating an Info File,,, texinfo, Texinfo: The GNU Documentation
-Format}, to learn how to create an Info file from a Texinfo file.
-
-@xref{Installing an Info File,,, texinfo, Texinfo: The GNU
-Documentation Format}, to learn how to install an Info file after you
-have created one.
-
 @node Index
 @unnumbered Index
 
diff --git a/Build/source/utils/texinfo/doc/infokey.1 b/Build/source/utils/texinfo/doc/infokey.1
index fb8f4634f40..f18df20d548 100644
--- a/Build/source/utils/texinfo/doc/infokey.1
+++ b/Build/source/utils/texinfo/doc/infokey.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
-.TH INFOKEY "1" "December 2004" "infokey 4.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
+.TH INFOKEY "1" "April 2008" "infokey 4.12" "User Commands"
 .SH NAME
 infokey \- compile customizations for Info
 .SH SYNOPSIS
@@ -23,10 +23,11 @@ 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/texinfo/
 .SH COPYRIGHT
-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.
+Copyright \(co 2008 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B infokey
diff --git a/Build/source/utils/texinfo/doc/install-info.1 b/Build/source/utils/texinfo/doc/install-info.1
index 004d5d0f97d..c0592b183d0 100644
--- a/Build/source/utils/texinfo/doc/install-info.1
+++ b/Build/source/utils/texinfo/doc/install-info.1
@@ -1,58 +1,108 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
-.TH INSTALL-INFO "1" "December 2004" "install-info 4.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
+.TH INSTALL-INFO "1" "April 2008" "install-info 4.12" "User Commands"
 .SH NAME
 install-info \- update info/dir entries
 .SH SYNOPSIS
 .B install-info
 [\fIOPTION\fR]... [\fIINFO-FILE \fR[\fIDIR-FILE\fR]]
 .SH DESCRIPTION
-Install or delete dir entries from INFO\-FILE in the Info directory file
-DIR\-FILE.
+Add or remove entries in INFO\-FILE from the Info directory DIR\-FILE.
 .SH OPTIONS
 .TP
+\fB\-\-debug\fR
+report what is being done.
+.TP
 \fB\-\-delete\fR
 delete existing entries for INFO\-FILE from DIR\-FILE;
 don't insert any new entries.
 .TP
+\fB\-\-description\fR=\fITEXT\fR
+the description of the entry is TEXT; used with
+the \fB\-\-name\fR option to become synonymous with the
+\fB\-\-entry\fR option.
+.TP
 \fB\-\-dir\-file\fR=\fINAME\fR
-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.
+.TP
+\fB\-\-dry\-run\fR
+same as \fB\-\-test\fR.
 .TP
 \fB\-\-entry\fR=\fITEXT\fR
 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.
+TEXT is written as an Info menu item line followed
+.IP
+by zero or more extra lines starting with whitespace.
+.IP
+If you specify more than one entry, all are added.
 If you don't specify any entries, they are determined
+.IP
 from information in the Info file itself.
+.IP
+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.
 .TP
 \fB\-\-help\fR
 display this help and exit.
 .TP
-\fB\-\-info\-file\fR=\fIFILE\fR
-specify Info file to install in the directory.
-This is equivalent to using the INFO\-FILE argument.
-.TP
 \fB\-\-info\-dir\fR=\fIDIR\fR
 same as \fB\-\-dir\-file\fR=\fIDIR\fR/dir.
 .TP
+\fB\-\-info\-file\fR=\fIFILE\fR
+specify Info file to install in the directory;
+equivalent to using the INFO\-FILE argument.
+.TP
 \fB\-\-item\fR=\fITEXT\fR
-same as \fB\-\-entry\fR TEXT.
-An Info directory entry is actually a menu item.
+same as \fB\-\-entry\fR=\fITEXT\fR.
+.TP
+\fB\-\-keep\-old\fR
+do not replace entries, or remove empty sections.
+.TP
+\fB\-\-menuentry\fR=\fITEXT\fR
+same as \fB\-\-name\fR=\fITEXT\fR.
+.TP
+\fB\-\-name\fR=\fITEXT\fR
+the name of the entry is TEXT; used with \fB\-\-description\fR
+to become synonymous with the \fB\-\-entry\fR option.
+.TP
+\fB\-\-no\-indent\fR
+do not format new entries in the DIR file.
 .TP
 \fB\-\-quiet\fR
 suppress warnings.
 .TP
+\fB\-\-regex\fR=\fIR\fR
+put this file's entries in all sections that match the
+regular expression R (ignoring case).
+.TP
 \fB\-\-remove\fR
 same as \fB\-\-delete\fR.
 .TP
+\fB\-\-remove\-exactly\fR
+only remove if the info file name matches exactly;
+suffixes such as .info and .gz are not ignored.
+.TP
 \fB\-\-section\fR=\fISEC\fR
-put this file's entries in section SEC of the directory.
+put entries in section SEC of the directory.
 If you specify more than one section, all the entries
+.IP
 are added in each of the sections.
+.IP
 If you don't specify any sections, they are determined
+.IP
 from information in the Info file itself.
 .TP
+\fB\-\-section\fR R SEC
+equivalent to \fB\-\-regex\fR=\fIR\fR \fB\-\-section\fR=\fISEC\fR \fB\-\-add\-once\fR.
+.TP
+\fB\-\-silent\fR
+suppress warnings.
+.TP
+\fB\-\-test\fR
+suppress updating of DIR\-FILE.
+.TP
 \fB\-\-version\fR
 display version information and exit.
 .SH "REPORTING BUGS"
@@ -60,10 +110,11 @@ 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/texinfo/
 .SH COPYRIGHT
-Copyright \(co 2004 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.
+Copyright \(co 2008 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B install-info
diff --git a/Build/source/utils/texinfo/doc/makeinfo.1 b/Build/source/utils/texinfo/doc/makeinfo.1
index 7b46491e0a6..0850e5f1b99 100644
--- a/Build/source/utils/texinfo/doc/makeinfo.1
+++ b/Build/source/utils/texinfo/doc/makeinfo.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
-.TH MAKEINFO "1" "December 2004" "makeinfo 4.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
+.TH MAKEINFO "1" "April 2008" "makeinfo 4.12" "User Commands"
 .SH NAME
 makeinfo \- translate Texinfo documents
 .SH SYNOPSIS
@@ -13,6 +13,9 @@ Info files suitable for reading online with Emacs or standalone GNU Info.
 \fB\-\-error\-limit\fR=\fINUM\fR
 quit after NUM errors (default 100).
 .TP
+\fB\-\-document\-language\fR=\fISTR\fR locale to use in translating Texinfo keywords
+for the output document (default C).
+.TP
 \fB\-\-force\fR
 preserve output even if errors.
 .TP
@@ -25,9 +28,6 @@ suppress node cross\-reference validation.
 \fB\-\-no\-warn\fR
 suppress warnings (but not errors).
 .TP
-\fB\-\-reference\-limit\fR=\fINUM\fR
-warn about at most NUM references (default 1000).
-.TP
 \fB\-v\fR, \fB\-\-verbose\fR
 explain what is being done.
 .TP
@@ -48,8 +48,8 @@ output Texinfo XML rather than Info.
 output plain text rather than Info.
 .SS "General output options:"
 .TP
-\fB\-E\fR, \fB\-\-macro\-expand\fR FILE
-output macro\-expanded source to FILE.
+\fB\-E\fR, \fB\-\-macro\-expand\fR=\fIFILE\fR
+output macro\-expanded source to FILE,
 ignoring any @setfilename.
 .TP
 \fB\-\-no\-headers\fR
@@ -59,19 +59,22 @@ or from HTML (thus producing shorter output);
 also, write to standard output by default.
 .TP
 \fB\-\-no\-split\fR
-suppress splitting of Info or HTML output,
+suppress the splitting of Info or HTML output,
 generate only one output file.
 .TP
 \fB\-\-number\-sections\fR
 output chapter and sectioning numbers.
 .TP
 \fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-output to FILE (directory if split HTML),
+output to FILE (or directory if split HTML).
 .SS "Options for Info and plain text:"
 .TP
+\fB\-\-disable\-encoding\fR
+do not output accented and special characters
+in Info output based on @documentencoding.
+.TP
 \fB\-\-enable\-encoding\fR
-output accented and special characters in
-Info output based on @documentencoding.
+override \fB\-\-disable\-encoding\fR (default).
 .TP
 \fB\-\-fill\-column\fR=\fINUM\fR
 break Info lines at NUM characters (default 72).
@@ -79,9 +82,8 @@ break Info lines at NUM characters (default 72).
 \fB\-\-footnote\-style\fR=\fISTYLE\fR
 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
-.IP
-in which they are defined (default).
+`end' to put them at the end of the node, in
+which they are defined (this is the default).
 .TP
 \fB\-\-paragraph\-indent\fR=\fIVAL\fR
 indent Info paragraphs by VAL spaces (default 3).
@@ -95,6 +97,12 @@ split Info files at size NUM (default 300000).
 \fB\-\-css\-include\fR=\fIFILE\fR
 include FILE in HTML <style> output;
 read stdin if FILE is \-.
+.TP
+\fB\-\-css\-ref\fR=\fIURL\fR
+generate reference to a CSS file.
+.TP
+\fB\-\-transliterate\-file\-names\fR
+produce file names in ASCII transliteration.
 .SS "Options for XML and Docbook:"
 .TP
 \fB\-\-output\-indent\fR=\fIVAL\fR
@@ -154,9 +162,9 @@ do not process @iftex and @tex text.
 .TP
 \fB\-\-no\-ifxml\fR
 do not process @ifxml and @xml text.
-.IP
+.P
 Also, for the \fB\-\-no\-ifFORMAT\fR options, do process @ifnotFORMAT text.
-.IP
+.P
 The defaults for the @if... conditionals depend on the output format:
 if generating HTML, \fB\-\-ifhtml\fR is on and the others are off;
 if generating Info, \fB\-\-ifinfo\fR is on and the others are off;
@@ -178,19 +186,25 @@ write DocBook XML to @setfilename
 .TP
 makeinfo \fB\-\-no\-headers\fR foo.texi
 write plain text to standard output
-.IP
-makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi write html without node lines, menus
-makeinfo \fB\-\-number\-sections\fR foo.texi   write Info with numbered sections
-makeinfo \fB\-\-no\-split\fR foo.texi          write one Info file however big
+.TP
+makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi
+write html without node lines, menus
+.TP
+makeinfo \fB\-\-number\-sections\fR foo.texi
+write Info with numbered sections
+.TP
+makeinfo \fB\-\-no\-split\fR foo.texi
+write one Info file however big
 .SH "REPORTING BUGS"
 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/texinfo/
 .SH COPYRIGHT
-Copyright \(co 2004 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.
+Copyright \(co 2008 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B makeinfo
diff --git a/Build/source/utils/texinfo/doc/pdftexi2dvi.1 b/Build/source/utils/texinfo/doc/pdftexi2dvi.1
new file mode 100644
index 00000000000..76d34b6e3da
--- /dev/null
+++ b/Build/source/utils/texinfo/doc/pdftexi2dvi.1
@@ -0,0 +1,184 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
+.TH TEXI2DVI "1" "April 2008" "texi2dvi 1.122" "User Commands"
+.SH NAME
+texi2dvi \- convert Texinfo documents to PDF
+.SH SYNOPSIS
+.B texi2dvi
+[\fIOPTION\fR]... \fIFILE\fR...
+.SH DESCRIPTION
+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 ((La)TeX or Texinfo).  To process
+(e)plain TeX files, set the environment variable LATEX=tex.
+.PP
+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.
+.TP
+`\einput{FILE}'
+the actual file to compile
+.TP
+`\enonstopmode'
+same as \fB\-\-batch\fR
+.PP
+Makeinfo is used to perform Texinfo macro expansion before running TeX
+when needed.
+.SS "General options:"
+.TP
+\fB\-b\fR, \fB\-\-batch\fR
+no interaction
+.TP
+\fB\-D\fR, \fB\-\-debug\fR
+turn on shell debugging (set \fB\-x\fR)
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit successfully
+.TP
+\fB\-o\fR, \fB\-\-output\fR=\fIOFILE\fR
+leave output in OFILE (implies \fB\-\-clean\fR);
+only one input FILE may be specified in this case
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+no output unless errors (implies \fB\-\-batch\fR)
+.TP
+\fB\-s\fR, \fB\-\-silent\fR
+same as \fB\-\-quiet\fR
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+display version information and exit successfully
+.TP
+\fB\-V\fR, \fB\-\-verbose\fR
+report on what is done
+.SS "TeX tuning:"
+.TP
+\-@
+use @input instead of \einput for preloaded Texinfo
+.TP
+\fB\-\-dvi\fR
+output a DVI file [default]
+.TP
+\fB\-e\fR, \fB\-E\fR, \fB\-\-expand\fR
+force macro expansion using makeinfo
+.TP
+\fB\-I\fR DIR
+search DIR for Texinfo files
+.TP
+\fB\-l\fR, \fB\-\-language\fR=\fILANG\fR
+specify the LANG of FILE (LaTeX or Texinfo)
+.TP
+\fB\-\-no\-line\-error\fR
+do not pass \fB\-\-file\-line\-error\fR to TeX
+.TP
+\fB\-p\fR, \fB\-\-pdf\fR
+use pdftex or pdflatex for processing
+.TP
+\fB\-r\fR, \fB\-\-recode\fR
+call recode before TeX to translate input
+.TP
+\fB\-\-recode\-from\fR=\fIENC\fR
+recode from ENC to the @documentencoding
+.TP
+\fB\-\-src\-specials\fR
+pass \fB\-\-src\-specials\fR to TeX
+.TP
+\fB\-t\fR, \fB\-\-command\fR=\fICMD\fR
+insert CMD in copy of input file
+.TP
+or \fB\-\-texinfo\fR=\fICMD\fR
+multiple values accumulate
+.TP
+\fB\-\-translate\-file\fR=\fIFILE\fR
+use given charset translation file for TeX
+.SS "Build modes:"
+.TP
+\fB\-\-build\fR=\fIMODE\fR
+specify the treatment of auxiliary files [local]
+.TP
+\fB\-\-tidy\fR
+same as \fB\-\-build\fR=\fItidy\fR
+.TP
+\fB\-c\fR, \fB\-\-clean\fR
+same as \fB\-\-build\fR=\fIclean\fR
+.TP
+\fB\-\-build\-dir\fR=\fIDIR\fR
+specify where the tidy compilation is performed;
+implies \fB\-\-tidy\fR;
+defaults to TEXI2DVI_BUILD_DIRECTORY [.]
+.TP
+\fB\-\-mostly\-clean\fR
+remove the auxiliary files and directories
+but not the output
+.PP
+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.
+.SS "Valid MODEs are:"
+.TP
+`local'
+compile in the current directory, leaving all the auxiliary
+files around.  This is the traditional TeX use.
+.TP
+`tidy'
+compile in a local *.t2d directory, where the auxiliary files
+are left.  Output files are copied back to the original file.
+.TP
+`clean'
+same as `tidy', but remove the auxiliary directory afterwards.
+Every compilation therefore requires the full cycle.
+.SS "Using the `tidy' mode brings several advantages:"
+.TP
+\-
+the current directory is not cluttered with plethora of temporary files.
+.TP
+\-
+clutter can be even reduced using \fB\-\-build\-dir\fR=\fIdir\fR: all the *.t2d
+directories are stored there.
+.TP
+\-
+clutter can be reduced to zero using, e.g., \fB\-\-build\-dir=\fR/tmp/$USER.t2d
+or \fB\-\-build\-dir=\fR$HOME/.t2d.
+.TP
+\-
+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.
+.TP
+\-
+if the compilation fails, the previous state of the output file
+is preserved.
+.TP
+\-
+PDF and DVI compilation are kept in separate subdirectories
+preventing any possibility of auxiliary file incompatibility.
+.PP
+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 \fB\-I\fR to specify the additional
+directories to consider.
+.PP
+The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO,
+TEX (or 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.
+.SH "REPORTING BUGS"
+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/texinfo/
+.SH COPYRIGHT
+Copyright \(co 2008 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+.SH "SEE ALSO"
+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, the command
+.IP
+.B info texi2dvi
+.PP
+should give you access to the complete manual.
diff --git a/Build/source/utils/texinfo/doc/stamp-1 b/Build/source/utils/texinfo/doc/stamp-1
index 045e1f425a9..a1b0be3185b 100644
--- a/Build/source/utils/texinfo/doc/stamp-1
+++ b/Build/source/utils/texinfo/doc/stamp-1
@@ -1,4 +1,4 @@
-@set UPDATED 17 January 2006
-@set UPDATED-MONTH January 2006
-@set EDITION 4.8
-@set VERSION 4.8
+@set UPDATED 5 March 2008
+@set UPDATED-MONTH March 2008
+@set EDITION 4.12
+@set VERSION 4.12
diff --git a/Build/source/utils/texinfo/doc/stamp-vti b/Build/source/utils/texinfo/doc/stamp-vti
index 045e1f425a9..da6f3285a4c 100644
--- a/Build/source/utils/texinfo/doc/stamp-vti
+++ b/Build/source/utils/texinfo/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 17 January 2006
-@set UPDATED-MONTH January 2006
-@set EDITION 4.8
-@set VERSION 4.8
+@set UPDATED 9 April 2008
+@set UPDATED-MONTH April 2008
+@set EDITION 4.12
+@set VERSION 4.12
diff --git a/Build/source/utils/texinfo/doc/texi2dvi.1 b/Build/source/utils/texinfo/doc/texi2dvi.1
index 41fae2f7d5e..98a889f6c73 100644
--- a/Build/source/utils/texinfo/doc/texi2dvi.1
+++ b/Build/source/utils/texinfo/doc/texi2dvi.1
@@ -1,26 +1,33 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH TEXI2DVI "1" "February 2005" "texi2dvi 1.39" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
+.TH TEXI2DVI "1" "April 2008" "texi2dvi 1.122" "User Commands"
 .SH NAME
-texi2dvi \- print Texinfo documents
+texi2dvi \- convert Texinfo documents to DVI
 .SH SYNOPSIS
 .B texi2dvi
 [\fIOPTION\fR]... \fIFILE\fR...
 .SH DESCRIPTION
-Run each Texinfo or LaTeX FILE through TeX in turn until all
-cross-references are resolved, building all indices.  The directory
+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).
+is used to determine its language ((La)TeX or Texinfo).  To process
+(e)plain TeX files, set the environment variable LATEX=tex.
+.PP
+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.
+.TP
+`\einput{FILE}'
+the actual file to compile
+.TP
+`\enonstopmode'
+same as \fB\-\-batch\fR
 .PP
 Makeinfo is used to perform Texinfo macro expansion before running TeX
 when needed.
-.SS "Operation modes:"
+.SS "General options:"
 .TP
 \fB\-b\fR, \fB\-\-batch\fR
 no interaction
 .TP
-\fB\-c\fR, \fB\-\-clean\fR
-remove all auxiliary files
-.TP
 \fB\-D\fR, \fB\-\-debug\fR
 turn on shell debugging (set \fB\-x\fR)
 .TP
@@ -29,7 +36,7 @@ display this help and exit successfully
 .TP
 \fB\-o\fR, \fB\-\-output\fR=\fIOFILE\fR
 leave output in OFILE (implies \fB\-\-clean\fR);
-Only one input FILE may be specified in this case
+only one input FILE may be specified in this case
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
 no output unless errors (implies \fB\-\-batch\fR)
@@ -44,8 +51,11 @@ display version information and exit successfully
 report on what is done
 .SS "TeX tuning:"
 .TP
--@
-use @input instead of \einput; for preloaded Texinfo
+\-@
+use @input instead of \einput for preloaded Texinfo
+.TP
+\fB\-\-dvi\fR
+output a DVI file [default]
 .TP
 \fB\-e\fR, \fB\-E\fR, \fB\-\-expand\fR
 force macro expansion using makeinfo
@@ -56,31 +66,110 @@ search DIR for Texinfo files
 \fB\-l\fR, \fB\-\-language\fR=\fILANG\fR
 specify the LANG of FILE (LaTeX or Texinfo)
 .TP
+\fB\-\-no\-line\-error\fR
+do not pass \fB\-\-file\-line\-error\fR to TeX
+.TP
 \fB\-p\fR, \fB\-\-pdf\fR
 use pdftex or pdflatex for processing
 .TP
 \fB\-r\fR, \fB\-\-recode\fR
-call recode before TeX to translate input characters
+call recode before TeX to translate input
+.TP
+\fB\-\-recode\-from\fR=\fIENC\fR
+recode from ENC to the @documentencoding
+.TP
+\fB\-\-src\-specials\fR
+pass \fB\-\-src\-specials\fR to TeX
 .TP
 \fB\-t\fR, \fB\-\-command\fR=\fICMD\fR
 insert CMD in copy of input file
 .TP
 or \fB\-\-texinfo\fR=\fICMD\fR
 multiple values accumulate
+.TP
+\fB\-\-translate\-file\fR=\fIFILE\fR
+use given charset translation file for TeX
+.SS "Build modes:"
+.TP
+\fB\-\-build\fR=\fIMODE\fR
+specify the treatment of auxiliary files [local]
+.TP
+\fB\-\-tidy\fR
+same as \fB\-\-build\fR=\fItidy\fR
+.TP
+\fB\-c\fR, \fB\-\-clean\fR
+same as \fB\-\-build\fR=\fIclean\fR
+.TP
+\fB\-\-build\-dir\fR=\fIDIR\fR
+specify where the tidy compilation is performed;
+implies \fB\-\-tidy\fR;
+defaults to TEXI2DVI_BUILD_DIRECTORY [.]
+.TP
+\fB\-\-mostly\-clean\fR
+remove the auxiliary files and directories
+but not the output
+.PP
+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.
+.SS "Valid MODEs are:"
+.TP
+`local'
+compile in the current directory, leaving all the auxiliary
+files around.  This is the traditional TeX use.
+.TP
+`tidy'
+compile in a local *.t2d directory, where the auxiliary files
+are left.  Output files are copied back to the original file.
+.TP
+`clean'
+same as `tidy', but remove the auxiliary directory afterwards.
+Every compilation therefore requires the full cycle.
+.SS "Using the `tidy' mode brings several advantages:"
+.TP
+\-
+the current directory is not cluttered with plethora of temporary files.
+.TP
+\-
+clutter can be even reduced using \fB\-\-build\-dir\fR=\fIdir\fR: all the *.t2d
+directories are stored there.
+.TP
+\-
+clutter can be reduced to zero using, e.g., \fB\-\-build\-dir=\fR/tmp/$USER.t2d
+or \fB\-\-build\-dir=\fR$HOME/.t2d.
+.TP
+\-
+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.
+.TP
+\-
+if the compilation fails, the previous state of the output file
+is preserved.
+.TP
+\-
+PDF and DVI compilation are kept in separate subdirectories
+preventing any possibility of auxiliary file incompatibility.
+.PP
+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 \fB\-I\fR to specify the additional
+directories to consider.
 .PP
 The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO,
 TEX (or 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.
 .SH "REPORTING BUGS"
-Email bug reports to <bug-texinfo@gnu.org>,
-general questions and discussion to <help-texinfo@gnu.org>.
+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/texinfo/
 .SH COPYRIGHT
-Copyright \(co 2005 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.
+Copyright \(co 2008 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B texi2dvi
diff --git a/Build/source/utils/texinfo/doc/texi2pdf.1 b/Build/source/utils/texinfo/doc/texi2pdf.1
new file mode 100644
index 00000000000..76d34b6e3da
--- /dev/null
+++ b/Build/source/utils/texinfo/doc/texi2pdf.1
@@ -0,0 +1,184 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
+.TH TEXI2DVI "1" "April 2008" "texi2dvi 1.122" "User Commands"
+.SH NAME
+texi2dvi \- convert Texinfo documents to PDF
+.SH SYNOPSIS
+.B texi2dvi
+[\fIOPTION\fR]... \fIFILE\fR...
+.SH DESCRIPTION
+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 ((La)TeX or Texinfo).  To process
+(e)plain TeX files, set the environment variable LATEX=tex.
+.PP
+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.
+.TP
+`\einput{FILE}'
+the actual file to compile
+.TP
+`\enonstopmode'
+same as \fB\-\-batch\fR
+.PP
+Makeinfo is used to perform Texinfo macro expansion before running TeX
+when needed.
+.SS "General options:"
+.TP
+\fB\-b\fR, \fB\-\-batch\fR
+no interaction
+.TP
+\fB\-D\fR, \fB\-\-debug\fR
+turn on shell debugging (set \fB\-x\fR)
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit successfully
+.TP
+\fB\-o\fR, \fB\-\-output\fR=\fIOFILE\fR
+leave output in OFILE (implies \fB\-\-clean\fR);
+only one input FILE may be specified in this case
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+no output unless errors (implies \fB\-\-batch\fR)
+.TP
+\fB\-s\fR, \fB\-\-silent\fR
+same as \fB\-\-quiet\fR
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+display version information and exit successfully
+.TP
+\fB\-V\fR, \fB\-\-verbose\fR
+report on what is done
+.SS "TeX tuning:"
+.TP
+\-@
+use @input instead of \einput for preloaded Texinfo
+.TP
+\fB\-\-dvi\fR
+output a DVI file [default]
+.TP
+\fB\-e\fR, \fB\-E\fR, \fB\-\-expand\fR
+force macro expansion using makeinfo
+.TP
+\fB\-I\fR DIR
+search DIR for Texinfo files
+.TP
+\fB\-l\fR, \fB\-\-language\fR=\fILANG\fR
+specify the LANG of FILE (LaTeX or Texinfo)
+.TP
+\fB\-\-no\-line\-error\fR
+do not pass \fB\-\-file\-line\-error\fR to TeX
+.TP
+\fB\-p\fR, \fB\-\-pdf\fR
+use pdftex or pdflatex for processing
+.TP
+\fB\-r\fR, \fB\-\-recode\fR
+call recode before TeX to translate input
+.TP
+\fB\-\-recode\-from\fR=\fIENC\fR
+recode from ENC to the @documentencoding
+.TP
+\fB\-\-src\-specials\fR
+pass \fB\-\-src\-specials\fR to TeX
+.TP
+\fB\-t\fR, \fB\-\-command\fR=\fICMD\fR
+insert CMD in copy of input file
+.TP
+or \fB\-\-texinfo\fR=\fICMD\fR
+multiple values accumulate
+.TP
+\fB\-\-translate\-file\fR=\fIFILE\fR
+use given charset translation file for TeX
+.SS "Build modes:"
+.TP
+\fB\-\-build\fR=\fIMODE\fR
+specify the treatment of auxiliary files [local]
+.TP
+\fB\-\-tidy\fR
+same as \fB\-\-build\fR=\fItidy\fR
+.TP
+\fB\-c\fR, \fB\-\-clean\fR
+same as \fB\-\-build\fR=\fIclean\fR
+.TP
+\fB\-\-build\-dir\fR=\fIDIR\fR
+specify where the tidy compilation is performed;
+implies \fB\-\-tidy\fR;
+defaults to TEXI2DVI_BUILD_DIRECTORY [.]
+.TP
+\fB\-\-mostly\-clean\fR
+remove the auxiliary files and directories
+but not the output
+.PP
+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.
+.SS "Valid MODEs are:"
+.TP
+`local'
+compile in the current directory, leaving all the auxiliary
+files around.  This is the traditional TeX use.
+.TP
+`tidy'
+compile in a local *.t2d directory, where the auxiliary files
+are left.  Output files are copied back to the original file.
+.TP
+`clean'
+same as `tidy', but remove the auxiliary directory afterwards.
+Every compilation therefore requires the full cycle.
+.SS "Using the `tidy' mode brings several advantages:"
+.TP
+\-
+the current directory is not cluttered with plethora of temporary files.
+.TP
+\-
+clutter can be even reduced using \fB\-\-build\-dir\fR=\fIdir\fR: all the *.t2d
+directories are stored there.
+.TP
+\-
+clutter can be reduced to zero using, e.g., \fB\-\-build\-dir=\fR/tmp/$USER.t2d
+or \fB\-\-build\-dir=\fR$HOME/.t2d.
+.TP
+\-
+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.
+.TP
+\-
+if the compilation fails, the previous state of the output file
+is preserved.
+.TP
+\-
+PDF and DVI compilation are kept in separate subdirectories
+preventing any possibility of auxiliary file incompatibility.
+.PP
+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 \fB\-I\fR to specify the additional
+directories to consider.
+.PP
+The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO,
+TEX (or 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.
+.SH "REPORTING BUGS"
+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/texinfo/
+.SH COPYRIGHT
+Copyright \(co 2008 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+.SH "SEE ALSO"
+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, the command
+.IP
+.B info texi2dvi
+.PP
+should give you access to the complete manual.
diff --git a/Build/source/utils/texinfo/doc/texindex.1 b/Build/source/utils/texinfo/doc/texindex.1
index 732e12b8874..bb65fcfe170 100644
--- a/Build/source/utils/texinfo/doc/texindex.1
+++ b/Build/source/utils/texinfo/doc/texindex.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
-.TH TEXINDEX "1" "December 2004" "texindex 4.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
+.TH TEXINDEX "1" "April 2008" "texindex 4.12" "User Commands"
 .SH NAME
 texindex \- sort Texinfo index files
 .SH SYNOPSIS
@@ -13,12 +13,6 @@ Usually FILE... is specified as `foo.??' for a document `foo.texi'.
 \fB\-h\fR, \fB\-\-help\fR
 display this help and exit
 .TP
-\fB\-k\fR, \fB\-\-keep\fR
-keep temporary files around after processing
-.TP
-\fB\-\-no\-keep\fR
-do not keep temporary files around after processing (default)
-.TP
 \fB\-o\fR, \fB\-\-output\fR FILE
 send output to FILE
 .TP
@@ -29,10 +23,11 @@ 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/texinfo/
 .SH COPYRIGHT
-Copyright \(co 2004 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.
+Copyright \(co 2008 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 The full documentation for
 .B texindex
diff --git a/Build/source/utils/texinfo/doc/texinfo.5 b/Build/source/utils/texinfo/doc/texinfo.5
index 0ca35cac0d5..3bdb08afed7 100644
--- a/Build/source/utils/texinfo/doc/texinfo.5
+++ b/Build/source/utils/texinfo/doc/texinfo.5
@@ -1,5 +1,5 @@
 .\" texinfo(5)
-.\" $Id: texinfo.5,v 1.2 2004/04/11 17:56:45 karl Exp $
+.\" $Id: texinfo.5,v 1.3 2005/01/20 22:38:32 karl Exp $
 .\"
 .\" Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
 .\"
diff --git a/Build/source/utils/texinfo/doc/texinfo.tex b/Build/source/utils/texinfo/doc/texinfo.tex
index 8d20e47dee7..bac0726023e 100644
--- a/Build/source/utils/texinfo/doc/texinfo.tex
+++ b/Build/source/utils/texinfo/doc/texinfo.tex
@@ -3,16 +3,16 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2005-03-21.17}
+\def\texinfoversion{2008-04-18.10}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
-% Foundation, Inc.
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+% 2007, 2008 Free Software Foundation, Inc.
 %
-% This texinfo.tex file is free software; you can redistribute it and/or
+% This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
-% published by the Free Software Foundation; either version 2, or (at
-% your option) any later version.
+% published by the Free Software Foundation, either version 3 of the
+% License, or (at your option) any later version.
 %
 % This texinfo.tex file is distributed in the hope that it will be
 % useful, but WITHOUT ANY WARRANTY; without even the implied warranty
@@ -20,9 +20,7 @@
 % General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this texinfo.tex file; see the file COPYING.  If not, write
-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %
 % As a special exception, when this file is read by TeX when processing
 % a Texinfo source document, you may use the result without
@@ -67,7 +65,7 @@
 \everyjob{\message{[Texinfo version \texinfoversion]}%
   \catcode`+=\active \catcode`\_=\active}
 
-\message{Basics,}
+
 \chardef\other=12
 
 % We never want plain's \outer definition of \+ in Texinfo.
@@ -99,6 +97,7 @@
 \let\ptexslash=\/
 \let\ptexstar=\*
 \let\ptext=\t
+\let\ptextop=\top
 
 % If this character appears in an error message or help string, it
 % starts a new line in the output.
@@ -153,28 +152,22 @@
 \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
 \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
 
-% In some macros, we cannot use the `\? notation---the left quote is
-% in some cases the escape char.
-\chardef\backChar  = `\\
+% Since the category of space is not known, we have to be careful.
+\chardef\spacecat = 10
+\def\spaceisspace{\catcode`\ =\spacecat}
+
+% sometimes characters are active, so we need control sequences.
 \chardef\colonChar = `\:
 \chardef\commaChar = `\,
+\chardef\dashChar  = `\-
 \chardef\dotChar   = `\.
 \chardef\exclamChar= `\!
-\chardef\plusChar  = `\+
+\chardef\lquoteChar= `\`
 \chardef\questChar = `\?
+\chardef\rquoteChar= `\'
 \chardef\semiChar  = `\;
 \chardef\underChar = `\_
 
-\chardef\spaceChar = `\ %
-\chardef\spacecat = 10
-\def\spaceisspace{\catcode\spaceChar=\spacecat}
-
-{% for help with debugging.
- % example usage: \expandafter\show\activebackslash
- \catcode`\! = 0 \catcode`\\ = \active
- !global!def!activebackslash{\}
-}
-
 % Ignore a token.
 %
 \def\gobble#1{}
@@ -285,6 +278,50 @@
 \newdimen\cornerthick \cornerthick=.3pt
 \newdimen\topandbottommargin \topandbottommargin=.75in
 
+% Output a mark which sets \thischapter, \thissection and \thiscolor.
+% We dump everything together because we only have one kind of mark.
+% This works because we only use \botmark / \topmark, not \firstmark.
+%
+% A mark contains a subexpression of the \ifcase ... \fi construct.
+% \get*marks macros below extract the needed part using \ifcase.
+%
+% Another complication is to let the user choose whether \thischapter
+% (\thissection) refers to the chapter (section) in effect at the top
+% of a page, or that at the bottom of a page.  The solution is
+% described on page 260 of The TeXbook.  It involves outputting two
+% marks for the sectioning macros, one before the section break, and
+% one after.  I won't pretend I can describe this better than DEK...
+\def\domark{%
+  \toks0=\expandafter{\lastchapterdefs}%
+  \toks2=\expandafter{\lastsectiondefs}%
+  \toks4=\expandafter{\prevchapterdefs}%
+  \toks6=\expandafter{\prevsectiondefs}%
+  \toks8=\expandafter{\lastcolordefs}%
+  \mark{%
+                   \the\toks0 \the\toks2
+      \noexpand\or \the\toks4 \the\toks6
+    \noexpand\else \the\toks8
+  }%
+}
+% \topmark doesn't work for the very first chapter (after the title
+% page or the contents), so we use \firstmark there -- this gets us
+% the mark with the chapter defs, unless the user sneaks in, e.g.,
+% @setcolor (or @url, or @link, etc.) between @contents and the very
+% first @chapter.
+\def\gettopheadingmarks{%
+  \ifcase0\topmark\fi
+  \ifx\thischapter\empty \ifcase0\firstmark\fi \fi
+}
+\def\getbottomheadingmarks{\ifcase1\botmark\fi}
+\def\getcolormarks{\ifcase2\topmark\fi}
+
+% Avoid "undefined control sequence" errors.
+\def\lastchapterdefs{}
+\def\lastsectiondefs{}
+\def\prevchapterdefs{}
+\def\prevsectiondefs{}
+\def\lastcolordefs{}
+
 % Main output routine.
 \chardef\PAGE = 255
 \output = {\onepageout{\pagecontents\PAGE}}
@@ -302,7 +339,9 @@
   %
   % Do this outside of the \shipout so @code etc. will be expanded in
   % the headline as they should be, not taken literally (outputting ''code).
+  \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
   \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
+  \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
   \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
   %
   {%
@@ -310,10 +349,14 @@
     % take effect in \write's, yet the group defined by the \vbox ends
     % before the \shipout runs.
     %
-    \escapechar = `\\     % use backslash in output files.
     \indexdummies         % don't expand commands in the output.
     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
-                   % the page break happens to be in the middle of an example.
+               % the page break happens to be in the middle of an example.
+               % We don't want .vr (or whatever) entries like this:
+               % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
+               % "\acronym" won't work when it's read back in;
+               % it needs to be 
+               % {\code {{\tt \backslashcurfont }acronym}
     \shipout\vbox{%
       % Do this early so pdf references go to the beginning of the page.
       \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
@@ -341,9 +384,9 @@
       \pagebody{#1}%
       \ifdim\ht\footlinebox > 0pt
         % Only leave this space if the footline is nonempty.
-        % (We lessened \vsize for it in \oddfootingxxx.)
+        % (We lessened \vsize for it in \oddfootingyyy.)
         % The \baselineskip=24pt in plain's \makefootline has no effect.
-        \vskip 2\baselineskip
+        \vskip 24pt
         \unvbox\footlinebox
       \fi
       %
@@ -364,7 +407,7 @@
       \egroup % \vbox from first cropmarks clause
       \fi
     }% end of \shipout\vbox
-  }% end of group with \normalturnoffactive
+  }% end of group with \indexdummies
   \advancepageno
   \ifnum\outputpenalty>-20000 \else\dosupereject\fi
 }
@@ -377,7 +420,7 @@
 % marginal hacks, juha@viisa.uucp (Juha Takala)
 \ifvoid\margin\else % marginal info is present
   \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi
-\dimen@=\dp#1 \unvbox#1
+\dimen@=\dp#1\relax \unvbox#1\relax
 \ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
 \ifr@ggedbottom \kern-\dimen@ \vfil \fi}
 }
@@ -399,7 +442,7 @@
 %
 \def\parsearg{\parseargusing{}}
 \def\parseargusing#1#2{%
-  \def\next{#2}%
+  \def\argtorun{#2}%
   \begingroup
     \obeylines
     \spaceisspace
@@ -418,7 +461,7 @@
 \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
 \def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
 
-% Each occurence of `\^^M' or `<space>\^^M' is replaced by a single space.
+% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
 %
 % \argremovec might leave us with trailing space, e.g.,
 %    @end itemize  @c foo
@@ -430,8 +473,7 @@
 \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
   \def\temp{#3}%
   \ifx\temp\empty
-    % We cannot use \next here, as it holds the macro to run;
-    % thus we reuse \temp.
+    % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
     \let\temp\finishparsearg
   \else
     \let\temp\argcheckspaces
@@ -443,14 +485,14 @@
 % If a _delimited_ argument is enclosed in braces, they get stripped; so
 % to get _exactly_ the rest of the line, we had to prevent such situation.
 % We prepended an \empty token at the very beginning and we expand it now,
-% just before passing the control to \next.
-% (Similarily, we have to think about #3 of \argcheckspacesY above: it is
+% just before passing the control to \argtorun.
+% (Similarly, we have to think about #3 of \argcheckspacesY above: it is
 % either the null string, or it ends with \^^M---thus there is no danger
 % that a pair of braces would be stripped.
 %
 % But first, we have to remove the trailing space token.
 %
-\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
+\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
 
 % \parseargdef\foo{...}
 %	is roughly equivalent to
@@ -501,12 +543,12 @@
 % used to check whether the current environment is the one expected.
 %
 % Non-false conditionals (@iftex, @ifset) don't fit into this, so they
-% are not treated as enviroments; they don't open a group.  (The
+% are not treated as environments; they don't open a group.  (The
 % implementation of @end takes care not to call \endgroup in this
 % special case.)
 
 
-% At runtime, environments start with this:
+% At run-time, environments start with this:
 \def\startenvironment#1{\begingroup\def\thisenv{#1}}
 % initialize
 \let\thisenv\empty
@@ -524,7 +566,7 @@
   \fi
 }
 
-% Evironment mismatch, #1 expected:
+% Environment mismatch, #1 expected:
 \def\badenverr{%
   \errhelp = \EMsimple
   \errmessage{This command can appear only \inenvironment\temp,
@@ -608,8 +650,8 @@
 \def\jmacro{j}
 \def\dotless#1{%
   \def\temp{#1}%
-  \ifx\temp\imacro \ptexi
-  \else\ifx\temp\jmacro \j
+  \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi
+  \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi
   \else \errmessage{@dotless can be used only with i or j}%
   \fi\fi
 }
@@ -655,13 +697,13 @@
 \let\/=\allowbreak
 
 % @. is an end-of-sentence period.
-\def\.{.\spacefactor=\endofsentencespacefactor}
+\def\.{.\spacefactor=\endofsentencespacefactor\space}
 
 % @! is an end-of-sentence bang.
-\def\!{!\spacefactor=\endofsentencespacefactor}
+\def\!{!\spacefactor=\endofsentencespacefactor\space}
 
 % @? is an end-of-sentence query.
-\def\?{?\spacefactor=\endofsentencespacefactor}
+\def\?{?\spacefactor=\endofsentencespacefactor\space}
 
 % @frenchspacing on|off  says whether to put extra space after punctuation.
 % 
@@ -875,15 +917,19 @@ where each line of input produces a line of output.}
   \temp
 }
 
-% @include file    insert text of that file as input.
+% @include FILE -- \input text of FILE.
 %
 \def\include{\parseargusing\filenamecatcodes\includezzz}
 \def\includezzz#1{%
   \pushthisfilestack
   \def\thisfile{#1}%
   {%
-    \makevalueexpandable
-    \def\temp{\input #1 }%
+    \makevalueexpandable  % we want to expand any @value in FILE.
+    \turnoffactive        % and allow special characters in the expansion
+    \edef\temp{\noexpand\input #1 }%
+    %
+    % This trickery is to read FILE outside of a group, in case it makes
+    % definitions, etc.
     \expandafter
   }\temp
   \popthisfilestack
@@ -1054,9 +1100,9 @@ where each line of input produces a line of output.}
 % _ active, and distinguish by seeing if the current family is \slfam,
 % which is what @var uses.
 {
-  \catcode\underChar = \active
+  \catcode`\_ = \active
   \gdef\mathunderscore{%
-    \catcode\underChar=\active
+    \catcode`\_=\active
     \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
   }
 }
@@ -1073,6 +1119,16 @@ where each line of input produces a line of output.}
   \mathunderscore
   \let\\ = \mathbackslash
   \mathactive
+  % make the texinfo accent commands work in math mode
+  \let\"=\ddot
+  \let\'=\acute
+  \let\==\bar
+  \let\^=\hat
+  \let\`=\grave
+  \let\u=\breve
+  \let\v=\check
+  \let\~=\tilde
+  \let\dotaccent=\dot
   $\finishmath
 }
 \def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
@@ -1094,20 +1150,31 @@ where each line of input produces a line of output.}
   }
 }
 
-% @bullet and @minus need the same treatment as @math, just above.
+% Some math mode symbols.
 \def\bullet{$\ptexbullet$}
-\def\minus{$-$}
+\def\geq{\ifmmode \ge\else $\ge$\fi}
+\def\leq{\ifmmode \le\else $\le$\fi}
+\def\minus{\ifmmode -\else $-$\fi}
 
 % @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in a typewriter
-% font as three actual period characters.
+% We do .5em per period so that it has the same spacing in the cm
+% typewriter fonts as three actual period characters; on the other hand,
+% in other typewriter fonts three periods are wider than 1.5em.  So do
+% whichever is larger.
 %
 \def\dots{%
   \leavevmode
-  \hbox to 1.5em{%
-    \hskip 0pt plus 0.25fil
-    .\hfil.\hfil.%
-    \hskip 0pt plus 0.5fil
+  \setbox0=\hbox{...}% get width of three periods
+  \ifdim\wd0 > 1.5em
+    \dimen0 = \wd0
+  \else
+    \dimen0 = 1.5em
+  \fi
+  \hbox to \dimen0{%
+    \hskip 0pt plus.25fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus.5fil
   }%
 }
 
@@ -1200,28 +1267,28 @@ where each line of input produces a line of output.}
   \fi
 \fi
 
-% PDF uses PostScript string constants for the names of xref targets, to
+% PDF uses PostScript string constants for the names of xref targets,
 % for display in the outlines, and in other places.  Thus, we have to
 % double any backslashes.  Otherwise, a name like "\node" will be
 % interpreted as a newline (\n), followed by o, d, e.  Not good.
 % http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
 % (and related messages, the final outcome is that it is up to the TeX
 % user to double the backslashes and otherwise make the string valid, so
-% that's we do).
+% that's what we do).
 
 % double active backslashes.
 % 
 {\catcode`\@=0 \catcode`\\=\active
- @gdef@activebackslash{@catcode`@\=@active @otherbackslash}
  @gdef@activebackslashdouble{%
-   @catcode@backChar=@active
+   @catcode`@\=@active
    @let\=@doublebackslash}
 }
 
 % To handle parens, we must adopt a different approach, since parens are
 % not active characters.  hyperref.dtx (which has the same problem as
-% us) handles it with this amazing macro to replace tokens.  I've
-% tinkered with it a little for texinfo, but it's definitely from there.
+% us) handles it with this amazing macro to replace tokens, with minor
+% changes for Texinfo.  It is included here under the GPL by permission
+% from the author, Heiko Oberdiek.
 % 
 % #1 is the tokens to replace.
 % #2 is the replacement.
@@ -1246,54 +1313,129 @@ where each line of input produces a line of output.}
 \def\backslashparens#1{%
   \xdef#1{#1}% redefine it as its expansion; the definition is simply
              % \lastnode when called from \setref -> \pdfmkdest.
-  \HyPsdSubst{(}{\backslashlparen}{#1}%
-  \HyPsdSubst{)}{\backslashrparen}{#1}%
+  \HyPsdSubst{(}{\realbackslash(}{#1}%
+  \HyPsdSubst{)}{\realbackslash)}{#1}%
 }
 
-{\catcode\exclamChar = 0 \catcode\backChar = \other
- !gdef!backslashlparen{\(}%
- !gdef!backslashrparen{\)}%
-}
+\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
+with PDF output, and none of those formats could be found.  (.eps cannot
+be supported due to the design of the PDF format; use regular TeX (DVI
+output) for that.)}
 
 \ifpdf
-  \input pdfcolor
-  \pdfcatalog{/PageMode /UseOutlines}%
+  %
+  % Color manipulation macros based on pdfcolor.tex.
+  \def\cmykDarkRed{0.28 1 1 0.35}
+  \def\cmykBlack{0 0 0 1}
+  %
+  \def\pdfsetcolor#1{\pdfliteral{#1 k}}
+  % Set color, and create a mark which defines \thiscolor accordingly,
+  % so that \makeheadline knows which color to restore.
+  \def\setcolor#1{%
+    \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+    \domark
+    \pdfsetcolor{#1}%
+  }
+  %
+  \def\maincolor{\cmykBlack}
+  \pdfsetcolor{\maincolor}
+  \edef\thiscolor{\maincolor}
+  \def\lastcolordefs{}
+  %
+  \def\makefootline{%
+    \baselineskip24pt
+    \line{\pdfsetcolor{\maincolor}\the\footline}%
+  }
+  %
+  \def\makeheadline{%
+    \vbox to 0pt{%
+      \vskip-22.5pt
+      \line{%
+        \vbox to8.5pt{}%
+        % Extract \thiscolor definition from the marks.
+        \getcolormarks
+        % Typeset the headline with \maincolor, then restore the color.
+        \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
+      }%
+      \vss
+    }%
+    \nointerlineskip
+  }
+  %
+  %
+  \pdfcatalog{/PageMode /UseOutlines}
+  %
+  % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
   \def\dopdfimage#1#2#3{%
-    \def\imagewidth{#2}%
-    \def\imageheight{#3}%
-    % without \immediate, pdftex seg faults when the same image is
+    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+    %
+    % pdftex (and the PDF format) support .png, .jpg, .pdf (among
+    % others).  Let's try in that order.
+    \let\pdfimgext=\empty
+    \begingroup
+      \openin 1 #1.png \ifeof 1
+        \openin 1 #1.jpg \ifeof 1
+          \openin 1 #1.jpeg \ifeof 1
+            \openin 1 #1.JPG \ifeof 1
+              \openin 1 #1.pdf \ifeof 1
+                \openin 1 #1.PDF \ifeof 1
+                  \errhelp = \nopdfimagehelp
+                  \errmessage{Could not find image file #1 for pdf}%
+                \else \gdef\pdfimgext{PDF}%
+                \fi
+              \else \gdef\pdfimgext{pdf}%
+              \fi
+            \else \gdef\pdfimgext{JPG}%
+            \fi
+          \else \gdef\pdfimgext{jpeg}%
+          \fi
+        \else \gdef\pdfimgext{jpg}%
+        \fi
+      \else \gdef\pdfimgext{png}%
+      \fi
+      \closein 1
+    \endgroup
+    %
+    % without \immediate, ancient pdftex seg faults when the same image is
     % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
     \ifnum\pdftexversion < 14
       \immediate\pdfimage
     \else
       \immediate\pdfximage
     \fi
-      \ifx\empty\imagewidth\else width \imagewidth \fi
-      \ifx\empty\imageheight\else height \imageheight \fi
+      \ifdim \wd0 >0pt width \imagewidth \fi
+      \ifdim \wd2 >0pt height \imageheight \fi
       \ifnum\pdftexversion<13
-         #1.pdf%
+         #1.\pdfimgext
        \else
-         {#1.pdf}%
+         {#1.\pdfimgext}%
        \fi
     \ifnum\pdftexversion < 14 \else
       \pdfrefximage \pdflastximage
     \fi}
+  %
   \def\pdfmkdest#1{{%
     % We have to set dummies so commands such as @code, and characters
     % such as \, aren't expanded when present in a section title.
-    \atdummies
+    \indexnofonts
     \turnoffactive
     \activebackslashdouble
+    \makevalueexpandable
     \def\pdfdestname{#1}%
     \backslashparens\pdfdestname
-    \pdfdest name{\pdfdestname} xyz%
-  }}%
+    \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
+  }}
   %
   % used to mark target names; must be expandable.
-  \def\pdfmkpgn#1{#1}%
+  \def\pdfmkpgn#1{#1}
+  %
+  % by default, use a color that is dark enough to print on paper as
+  % nearly black, but still distinguishable for online viewing.
+  \def\urlcolor{\cmykDarkRed}
+  \def\linkcolor{\cmykDarkRed}
+  \def\endlink{\setcolor{\maincolor}\pdfendlink}
   %
-  \let\linkcolor = \Blue  % was Cyan, but that seems light?
-  \def\endlink{\Black\pdfendlink}
   % Adding outlines to PDF; macros for calculating structure of outlines
   % come from Petr Olsak
   \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
@@ -1394,8 +1536,8 @@ where each line of input produces a line of output.}
       % now, I guess we'll just let the pdf reader have its way.
       \indexnofonts
       \setupdatafile
-      \activebackslash
-      \input \jobname.toc
+      \catcode`\\=\active \otherbackslash
+      \input \tocreadfilename
     \endgroup
   }
   %
@@ -1413,11 +1555,19 @@ where each line of input produces a line of output.}
   \else
     \let \startlink \pdfstartlink
   \fi
+  % make a live url in pdf output.
   \def\pdfurl#1{%
     \begingroup
-      \normalturnoffactive\def\@{@}%
+      % it seems we really need yet another set of dummies; have not
+      % tried to figure out what each command should do in the context
+      % of @url.  for now, just make @/ a no-op, that's the only one
+      % people have actually reported a problem with.
+      % 
+      \normalturnoffactive
+      \def\@{@}%
+      \let\/=\empty
       \makevalueexpandable
-      \leavevmode\Red
+      \leavevmode\setcolor{\urlcolor}%
       \startlink attr{/Border [0 0 0]}%
         user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
     \endgroup}
@@ -1444,13 +1594,14 @@ where each line of input produces a line of output.}
     {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
   \def\pdflink#1{%
     \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
-    \linkcolor #1\endlink}
+    \setcolor{\linkcolor}#1\endlink}
   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
 \else
   \let\pdfmkdest = \gobble
   \let\pdfurl = \gobble
   \let\endlink = \relax
-  \let\linkcolor = \relax
+  \let\setcolor = \gobble
+  \let\pdfsetcolor = \gobble
   \let\pdfmakeoutlines = \relax
 \fi  % \ifx\pdfoutput
 
@@ -1485,6 +1636,7 @@ where each line of input produces a line of output.}
 % We don't need math for this font style.
 \def\ttsl{\setfontstyle{ttsl}}
 
+
 % Default leading.
 \newdimen\textleading  \textleading = 13.2pt
 
@@ -1496,8 +1648,12 @@ where each line of input produces a line of output.}
 \def\strutheightpercent{.70833}
 \def\strutdepthpercent {.29167}
 %
+% can get a sort of poor man's double spacing by redefining this.
+\def\baselinefactor{1}
+%
 \def\setleading#1{%
-  \normalbaselineskip = #1\relax
+  \dimen0 = #1\relax
+  \normalbaselineskip = \baselinefactor\dimen0
   \normallineskip = \lineskipfactor\normalbaselineskip
   \normalbaselines
   \setbox\strutbox =\hbox{%
@@ -1506,10 +1662,279 @@ where each line of input produces a line of output.}
   }%
 }
 
+% PDF CMaps.  See also LaTeX's t1.cmap.
+%
+% do nothing with this by default.
+\expandafter\let\csname cmapOT1\endcsname\gobble
+\expandafter\let\csname cmapOT1IT\endcsname\gobble
+\expandafter\let\csname cmapOT1TT\endcsname\gobble
+
+% if we are producing pdf, and we have \pdffontattr, then define cmaps.
+% (\pdffontattr was introduced many years ago, but people still run
+% older pdftex's; it's easy to conditionalize, so we do.)
+\ifpdf \ifx\pdffontattr\undefined \else
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1-0)
+%%Title: (TeX-OT1-0 TeX OT1 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+8 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<23> <26> <0023>
+<28> <3B> <0028>
+<3F> <5B> <003F>
+<5D> <5E> <005D>
+<61> <7A> <0061>
+<7B> <7C> <2013>
+endbfrange
+40 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <00660066>
+<0C> <00660069>
+<0D> <0066006C>
+<0E> <006600660069>
+<0F> <00660066006C>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<21> <0021>
+<22> <201D>
+<27> <2019>
+<3C> <00A1>
+<3D> <003D>
+<3E> <00BF>
+<5C> <201C>
+<5F> <02D9>
+<60> <2018>
+<7D> <02DD>
+<7E> <007E>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+%
+% \cmapOT1IT
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1IT-0)
+%%Title: (TeX-OT1IT-0 TeX OT1IT 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1IT)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1IT-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+8 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<25> <26> <0025>
+<28> <3B> <0028>
+<3F> <5B> <003F>
+<5D> <5E> <005D>
+<61> <7A> <0061>
+<7B> <7C> <2013>
+endbfrange
+42 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <00660066>
+<0C> <00660069>
+<0D> <0066006C>
+<0E> <006600660069>
+<0F> <00660066006C>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<21> <0021>
+<22> <201D>
+<23> <0023>
+<24> <00A3>
+<27> <2019>
+<3C> <00A1>
+<3D> <003D>
+<3E> <00BF>
+<5C> <201C>
+<5F> <02D9>
+<60> <2018>
+<7D> <02DD>
+<7E> <007E>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1IT\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+%
+% \cmapOT1TT
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1TT-0)
+%%Title: (TeX-OT1TT-0 TeX OT1TT 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1TT)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1TT-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+5 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<21> <26> <0021>
+<28> <5F> <0028>
+<61> <7E> <0061>
+endbfrange
+32 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <2191>
+<0C> <2193>
+<0D> <0027>
+<0E> <00A1>
+<0F> <00BF>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<20> <2423>
+<27> <2019>
+<60> <2018>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1TT\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+\fi\fi
+
+
 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
-% #3 is the font's design size, #4 is a scale factor
-\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
+% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
+% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
+% empty to omit).
+\def\setfont#1#2#3#4#5{%
+  \font#1=\fontprefix#2#3 scaled #4
+  \csname cmap#5\endcsname#1%
+}
+% This is what gets called when #5 of \setfont is empty.
+\let\cmap\gobble
+% emacs-page end of cmaps
 
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
@@ -1534,118 +1959,297 @@ where each line of input produces a line of output.}
 \def\scshape{csc}
 \def\scbshape{csc}
 
+% Definitions for a main text size of 11pt.  This is the default in
+% Texinfo.
+% 
+\def\definetextfontsizexi{%
 % Text fonts (11.2pt, magstep1).
 \def\textnominalsize{11pt}
 \edef\mainmagstep{\magstephalf}
-\setfont\textrm\rmshape{10}{\mainmagstep}
-\setfont\texttt\ttshape{10}{\mainmagstep}
-\setfont\textbf\bfshape{10}{\mainmagstep}
-\setfont\textit\itshape{10}{\mainmagstep}
-\setfont\textsl\slshape{10}{\mainmagstep}
-\setfont\textsf\sfshape{10}{\mainmagstep}
-\setfont\textsc\scshape{10}{\mainmagstep}
-\setfont\textttsl\ttslshape{10}{\mainmagstep}
+\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
+\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
+\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
+\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
+\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
+\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
+\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
 \font\texti=cmmi10 scaled \mainmagstep
 \font\textsy=cmsy10 scaled \mainmagstep
+\def\textecsize{1095}
 
 % A few fonts for @defun names and args.
-\setfont\defbf\bfshape{10}{\magstep1}
-\setfont\deftt\ttshape{10}{\magstep1}
-\setfont\defttsl\ttslshape{10}{\magstep1}
+\setfont\defbf\bfshape{10}{\magstep1}{OT1}
+\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
+\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
 \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
 
 % Fonts for indices, footnotes, small examples (9pt).
 \def\smallnominalsize{9pt}
-\setfont\smallrm\rmshape{9}{1000}
-\setfont\smalltt\ttshape{9}{1000}
-\setfont\smallbf\bfshape{10}{900}
-\setfont\smallit\itshape{9}{1000}
-\setfont\smallsl\slshape{9}{1000}
-\setfont\smallsf\sfshape{9}{1000}
-\setfont\smallsc\scshape{10}{900}
-\setfont\smallttsl\ttslshape{10}{900}
+\setfont\smallrm\rmshape{9}{1000}{OT1}
+\setfont\smalltt\ttshape{9}{1000}{OT1TT}
+\setfont\smallbf\bfshape{10}{900}{OT1}
+\setfont\smallit\itshape{9}{1000}{OT1IT}
+\setfont\smallsl\slshape{9}{1000}{OT1}
+\setfont\smallsf\sfshape{9}{1000}{OT1}
+\setfont\smallsc\scshape{10}{900}{OT1}
+\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
 \font\smalli=cmmi9
 \font\smallsy=cmsy9
+\def\smallecsize{0900}
 
 % Fonts for small examples (8pt).
 \def\smallernominalsize{8pt}
-\setfont\smallerrm\rmshape{8}{1000}
-\setfont\smallertt\ttshape{8}{1000}
-\setfont\smallerbf\bfshape{10}{800}
-\setfont\smallerit\itshape{8}{1000}
-\setfont\smallersl\slshape{8}{1000}
-\setfont\smallersf\sfshape{8}{1000}
-\setfont\smallersc\scshape{10}{800}
-\setfont\smallerttsl\ttslshape{10}{800}
+\setfont\smallerrm\rmshape{8}{1000}{OT1}
+\setfont\smallertt\ttshape{8}{1000}{OT1TT}
+\setfont\smallerbf\bfshape{10}{800}{OT1}
+\setfont\smallerit\itshape{8}{1000}{OT1IT}
+\setfont\smallersl\slshape{8}{1000}{OT1}
+\setfont\smallersf\sfshape{8}{1000}{OT1}
+\setfont\smallersc\scshape{10}{800}{OT1}
+\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
 \font\smalleri=cmmi8
 \font\smallersy=cmsy8
+\def\smallerecsize{0800}
 
 % Fonts for title page (20.4pt):
 \def\titlenominalsize{20pt}
-\setfont\titlerm\rmbshape{12}{\magstep3}
-\setfont\titleit\itbshape{10}{\magstep4}
-\setfont\titlesl\slbshape{10}{\magstep4}
-\setfont\titlett\ttbshape{12}{\magstep3}
-\setfont\titlettsl\ttslshape{10}{\magstep4}
-\setfont\titlesf\sfbshape{17}{\magstep1}
+\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
+\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
+\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
+\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
+\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
 \let\titlebf=\titlerm
-\setfont\titlesc\scbshape{10}{\magstep4}
+\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
 \font\titlei=cmmi12 scaled \magstep3
 \font\titlesy=cmsy10 scaled \magstep4
 \def\authorrm{\secrm}
 \def\authortt{\sectt}
+\def\titleecsize{2074}
 
 % Chapter (and unnumbered) fonts (17.28pt).
 \def\chapnominalsize{17pt}
-\setfont\chaprm\rmbshape{12}{\magstep2}
-\setfont\chapit\itbshape{10}{\magstep3}
-\setfont\chapsl\slbshape{10}{\magstep3}
-\setfont\chaptt\ttbshape{12}{\magstep2}
-\setfont\chapttsl\ttslshape{10}{\magstep3}
-\setfont\chapsf\sfbshape{17}{1000}
+\setfont\chaprm\rmbshape{12}{\magstep2}{OT1}
+\setfont\chapit\itbshape{10}{\magstep3}{OT1IT}
+\setfont\chapsl\slbshape{10}{\magstep3}{OT1}
+\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT}
+\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT}
+\setfont\chapsf\sfbshape{17}{1000}{OT1}
 \let\chapbf=\chaprm
-\setfont\chapsc\scbshape{10}{\magstep3}
+\setfont\chapsc\scbshape{10}{\magstep3}{OT1}
 \font\chapi=cmmi12 scaled \magstep2
 \font\chapsy=cmsy10 scaled \magstep3
+\def\chapecsize{1728}
 
 % Section fonts (14.4pt).
 \def\secnominalsize{14pt}
-\setfont\secrm\rmbshape{12}{\magstep1}
-\setfont\secit\itbshape{10}{\magstep2}
-\setfont\secsl\slbshape{10}{\magstep2}
-\setfont\sectt\ttbshape{12}{\magstep1}
-\setfont\secttsl\ttslshape{10}{\magstep2}
-\setfont\secsf\sfbshape{12}{\magstep1}
+\setfont\secrm\rmbshape{12}{\magstep1}{OT1}
+\setfont\secit\itbshape{10}{\magstep2}{OT1IT}
+\setfont\secsl\slbshape{10}{\magstep2}{OT1}
+\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT}
+\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT}
+\setfont\secsf\sfbshape{12}{\magstep1}{OT1}
 \let\secbf\secrm
-\setfont\secsc\scbshape{10}{\magstep2}
+\setfont\secsc\scbshape{10}{\magstep2}{OT1}
 \font\seci=cmmi12 scaled \magstep1
 \font\secsy=cmsy10 scaled \magstep2
+\def\sececsize{1440}
 
 % Subsection fonts (13.15pt).
 \def\ssecnominalsize{13pt}
-\setfont\ssecrm\rmbshape{12}{\magstephalf}
-\setfont\ssecit\itbshape{10}{1315}
-\setfont\ssecsl\slbshape{10}{1315}
-\setfont\ssectt\ttbshape{12}{\magstephalf}
-\setfont\ssecttsl\ttslshape{10}{1315}
-\setfont\ssecsf\sfbshape{12}{\magstephalf}
+\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1}
+\setfont\ssecit\itbshape{10}{1315}{OT1IT}
+\setfont\ssecsl\slbshape{10}{1315}{OT1}
+\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT}
+\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT}
+\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1}
 \let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{1315}
+\setfont\ssecsc\scbshape{10}{1315}{OT1}
 \font\sseci=cmmi12 scaled \magstephalf
 \font\ssecsy=cmsy10 scaled 1315
+\def\ssececsize{1200}
 
 % Reduced fonts for @acro in text (10pt).
 \def\reducednominalsize{10pt}
-\setfont\reducedrm\rmshape{10}{1000}
-\setfont\reducedtt\ttshape{10}{1000}
-\setfont\reducedbf\bfshape{10}{1000}
-\setfont\reducedit\itshape{10}{1000}
-\setfont\reducedsl\slshape{10}{1000}
-\setfont\reducedsf\sfshape{10}{1000}
-\setfont\reducedsc\scshape{10}{1000}
-\setfont\reducedttsl\ttslshape{10}{1000}
+\setfont\reducedrm\rmshape{10}{1000}{OT1}
+\setfont\reducedtt\ttshape{10}{1000}{OT1TT}
+\setfont\reducedbf\bfshape{10}{1000}{OT1}
+\setfont\reducedit\itshape{10}{1000}{OT1IT}
+\setfont\reducedsl\slshape{10}{1000}{OT1}
+\setfont\reducedsf\sfshape{10}{1000}{OT1}
+\setfont\reducedsc\scshape{10}{1000}{OT1}
+\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT}
 \font\reducedi=cmmi10
 \font\reducedsy=cmsy10
+\def\reducedecsize{1000}
+
+% reset the current fonts
+\textfonts
+\rm
+} % end of 11pt text font size definitions
+
+
+% Definitions to make the main text be 10pt Computer Modern, with
+% section, chapter, etc., sizes following suit.  This is for the GNU
+% Press printing of the Emacs 22 manual.  Maybe other manuals in the
+% future.  Used with @smallbook, which sets the leading to 12pt.
+% 
+\def\definetextfontsizex{%
+% Text fonts (10pt).
+\def\textnominalsize{10pt}
+\edef\mainmagstep{1000}
+\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
+\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
+\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
+\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
+\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
+\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
+\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
+\font\texti=cmmi10 scaled \mainmagstep
+\font\textsy=cmsy10 scaled \mainmagstep
+\def\textecsize{1000}
+
+% A few fonts for @defun names and args.
+\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
+\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
+\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
+
+% Fonts for indices, footnotes, small examples (9pt).
+\def\smallnominalsize{9pt}
+\setfont\smallrm\rmshape{9}{1000}{OT1}
+\setfont\smalltt\ttshape{9}{1000}{OT1TT}
+\setfont\smallbf\bfshape{10}{900}{OT1}
+\setfont\smallit\itshape{9}{1000}{OT1IT}
+\setfont\smallsl\slshape{9}{1000}{OT1}
+\setfont\smallsf\sfshape{9}{1000}{OT1}
+\setfont\smallsc\scshape{10}{900}{OT1}
+\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
+\font\smalli=cmmi9
+\font\smallsy=cmsy9
+\def\smallecsize{0900}
+
+% Fonts for small examples (8pt).
+\def\smallernominalsize{8pt}
+\setfont\smallerrm\rmshape{8}{1000}{OT1}
+\setfont\smallertt\ttshape{8}{1000}{OT1TT}
+\setfont\smallerbf\bfshape{10}{800}{OT1}
+\setfont\smallerit\itshape{8}{1000}{OT1IT}
+\setfont\smallersl\slshape{8}{1000}{OT1}
+\setfont\smallersf\sfshape{8}{1000}{OT1}
+\setfont\smallersc\scshape{10}{800}{OT1}
+\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
+\font\smalleri=cmmi8
+\font\smallersy=cmsy8
+\def\smallerecsize{0800}
+
+% Fonts for title page (20.4pt):
+\def\titlenominalsize{20pt}
+\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
+\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
+\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
+\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
+\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
+\let\titlebf=\titlerm
+\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
+\font\titlei=cmmi12 scaled \magstep3
+\font\titlesy=cmsy10 scaled \magstep4
+\def\authorrm{\secrm}
+\def\authortt{\sectt}
+\def\titleecsize{2074}
+
+% Chapter fonts (14.4pt).
+\def\chapnominalsize{14pt}
+\setfont\chaprm\rmbshape{12}{\magstep1}{OT1}
+\setfont\chapit\itbshape{10}{\magstep2}{OT1IT}
+\setfont\chapsl\slbshape{10}{\magstep2}{OT1}
+\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT}
+\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT}
+\setfont\chapsf\sfbshape{12}{\magstep1}{OT1}
+\let\chapbf\chaprm
+\setfont\chapsc\scbshape{10}{\magstep2}{OT1}
+\font\chapi=cmmi12 scaled \magstep1
+\font\chapsy=cmsy10 scaled \magstep2
+\def\chapecsize{1440}
+
+% Section fonts (12pt).
+\def\secnominalsize{12pt}
+\setfont\secrm\rmbshape{12}{1000}{OT1}
+\setfont\secit\itbshape{10}{\magstep1}{OT1IT}
+\setfont\secsl\slbshape{10}{\magstep1}{OT1}
+\setfont\sectt\ttbshape{12}{1000}{OT1TT}
+\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT}
+\setfont\secsf\sfbshape{12}{1000}{OT1}
+\let\secbf\secrm
+\setfont\secsc\scbshape{10}{\magstep1}{OT1}
+\font\seci=cmmi12 
+\font\secsy=cmsy10 scaled \magstep1
+\def\sececsize{1200}
+
+% Subsection fonts (10pt).
+\def\ssecnominalsize{10pt}
+\setfont\ssecrm\rmbshape{10}{1000}{OT1}
+\setfont\ssecit\itbshape{10}{1000}{OT1IT}
+\setfont\ssecsl\slbshape{10}{1000}{OT1}
+\setfont\ssectt\ttbshape{10}{1000}{OT1TT}
+\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT}
+\setfont\ssecsf\sfbshape{10}{1000}{OT1}
+\let\ssecbf\ssecrm
+\setfont\ssecsc\scbshape{10}{1000}{OT1}
+\font\sseci=cmmi10
+\font\ssecsy=cmsy10
+\def\ssececsize{1000}
+
+% Reduced fonts for @acro in text (9pt).
+\def\reducednominalsize{9pt}
+\setfont\reducedrm\rmshape{9}{1000}{OT1}
+\setfont\reducedtt\ttshape{9}{1000}{OT1TT}
+\setfont\reducedbf\bfshape{10}{900}{OT1}
+\setfont\reducedit\itshape{9}{1000}{OT1IT}
+\setfont\reducedsl\slshape{9}{1000}{OT1}
+\setfont\reducedsf\sfshape{9}{1000}{OT1}
+\setfont\reducedsc\scshape{10}{900}{OT1}
+\setfont\reducedttsl\ttslshape{10}{900}{OT1TT}
+\font\reducedi=cmmi9
+\font\reducedsy=cmsy9
+\def\reducedecsize{0900}
+
+% reduce space between paragraphs
+\divide\parskip by 2
+
+% reset the current fonts
+\textfonts
+\rm
+} % end of 10pt text font size definitions
+
+
+% We provide the user-level command
+%   @fonttextsize 10
+% (or 11) to redefine the text font size.  pt is assumed.
+% 
+\def\xword{10}
+\def\xiword{11}
+%
+\parseargdef\fonttextsize{%
+  \def\textsizearg{#1}%
+  \wlog{doing @fonttextsize \textsizearg}%
+  %
+  % Set \globaldefs so that documents can use this inside @tex, since
+  % makeinfo 4.8 does not support it, but we need it nonetheless.
+  % 
+ \begingroup \globaldefs=1
+  \ifx\textsizearg\xword \definetextfontsizex
+  \else \ifx\textsizearg\xiword \definetextfontsizexi
+  \else
+    \errhelp=\EMsimple
+    \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
+  \fi\fi
+ \endgroup
+}
+
 
 % In order for the font changes to affect most math symbols and letters,
 % we have to define the \textfont of the standard families.  Since
@@ -1757,7 +2361,7 @@ where each line of input produces a line of output.}
 
 % Set up the default fonts, so we can use them for creating boxes.
 %
-\textfonts \rm
+\definetextfontsizexi
 
 % Define these so they can be easily changed for other fonts.
 \def\angleleft{$\langle$}
@@ -1767,10 +2371,10 @@ where each line of input produces a line of output.}
 \newcount\fontdepth \fontdepth=0
 
 % Fonts for short table of contents.
-\setfont\shortcontrm\rmshape{12}{1000}
-\setfont\shortcontbf\bfshape{10}{\magstep1}  % no cmb12
-\setfont\shortcontsl\slshape{12}{1000}
-\setfont\shortconttt\ttshape{12}{1000}
+\setfont\shortcontrm\rmshape{12}{1000}{OT1}
+\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1}  % no cmb12
+\setfont\shortcontsl\slshape{12}{1000}{OT1}
+\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
 
 %% Add scribe-like font environments, plus @l for inline lisp (usually sans
 %% serif) and @ii for TeX italic
@@ -1833,7 +2437,7 @@ where each line of input produces a line of output.}
   \null
 }
 \def\samp#1{`\tclose{#1}'\null}
-\setfont\keyrm\rmshape{8}{1000}
+\setfont\keyrm\rmshape{8}{1000}{OT1}
 \font\keysy=cmsy9
 \def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
   \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
@@ -1841,6 +2445,7 @@ where each line of input produces a line of output.}
      \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
     \kern-0.4pt\hrule}%
   \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+\def\key #1{{\nohyphenation \uppercase{#1}}\null}
 % The old definition, with no lozenge:
 %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}
@@ -1882,11 +2487,14 @@ where each line of input produces a line of output.}
 % and arrange explicitly to hyphenate at a dash.
 %  -- rms.
 {
-  \catcode`\-=\active
-  \catcode`\_=\active
+  \catcode`\-=\active \catcode`\_=\active
+  \catcode`\'=\active \catcode`\`=\active
   %
   \global\def\code{\begingroup
-    \catcode`\-=\active  \catcode`\_=\active
+    \catcode\rquoteChar=\active \catcode\lquoteChar=\active
+    \let'\codequoteright \let`\codequoteleft
+    %
+    \catcode\dashChar=\active  \catcode\underChar=\active
     \ifallowcodebreaks
      \let-\codedash
      \let_\codeunder
@@ -1924,14 +2532,14 @@ where each line of input produces a line of output.}
 \def\keywordfalse{false}
 
 \parseargdef\allowcodebreaks{%
-  \def\arg{#1}%
-  \ifx\arg\keywordtrue
+  \def\txiarg{#1}%
+  \ifx\txiarg\keywordtrue
     \allowcodebreakstrue
-  \else\ifx\arg\keywordfalse
+  \else\ifx\txiarg\keywordfalse
     \allowcodebreaksfalse
   \else
     \errhelp = \EMsimple
-    \errmessage{Unknown @allowcodebreaks option `\arg'}%
+    \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
   \fi\fi
 }
 
@@ -1942,16 +2550,16 @@ where each line of input produces a line of output.}
 %   `example' (@kbd uses ttsl only inside of @example and friends),
 %   or `code' (@kbd uses normal tty font always).
 \parseargdef\kbdinputstyle{%
-  \def\arg{#1}%
-  \ifx\arg\worddistinct
+  \def\txiarg{#1}%
+  \ifx\txiarg\worddistinct
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-  \else\ifx\arg\wordexample
+  \else\ifx\txiarg\wordexample
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-  \else\ifx\arg\wordcode
+  \else\ifx\txiarg\wordcode
     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
   \else
     \errhelp = \EMsimple
-    \errmessage{Unknown @kbdinputstyle option `\arg'}%
+    \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
   \fi\fi\fi
 }
 \def\worddistinct{distinct}
@@ -1972,6 +2580,13 @@ where each line of input produces a line of output.}
 \let\env=\code
 \let\command=\code
 
+% @clicksequence{File @click{} Open ...}
+\def\clicksequence#1{\begingroup #1\endgroup}
+
+% @clickstyle @arrow   (by default)
+\parseargdef\clickstyle{\def\click{#1}}
+\def\click{\arrow}
+
 % @uref (abbreviation for `urlref') takes an optional (comma-separated)
 % second argument specifying the text to display and an optional third
 % arg as text to display instead of (rather than in addition to) the url
@@ -2122,6 +2737,35 @@ where each line of input produces a line of output.}
   \thiseurofont
 }
 
+% Hacks for glyphs from the EC fonts similar to \euro.  We don't
+% use \let for the aliases, because sometimes we redefine the original
+% macro, and the alias should reflect the redefinition.
+\def\guillemetleft{{\ecfont \char"13}}
+\def\guillemotleft{\guillemetleft}
+\def\guillemetright{{\ecfont \char"14}}
+\def\guillemotright{\guillemetright}
+\def\guilsinglleft{{\ecfont \char"0E}}
+\def\guilsinglright{{\ecfont \char"0F}}
+\def\quotedblbase{{\ecfont \char"12}}
+\def\quotesinglbase{{\ecfont \char"0D}}
+%
+\def\ecfont{%
+  % We can't distinguish serif/sanserif and italic/slanted, but this
+  % is used for crude hacks anyway (like adding French and German
+  % quotes to documents typeset with CM, where we lose kerning), so
+  % hopefully nobody will notice/care.
+  \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
+  \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
+  \ifx\curfontstyle\bfstylename
+    % bold:
+    \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+  \else
+    % regular:
+    \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+  \fi
+  \thisecfont
+}
+
 % @registeredsymbol - R in a circle.  The font for the R should really
 % be smaller yet, but lllsize is the best we can do for now.
 % Adapted from the plain.tex definition of \copyright.
@@ -2132,6 +2776,10 @@ where each line of input produces a line of output.}
     }$%
 }
 
+% @textdegree - the normal degrees sign.
+%
+\def\textdegree{$^\circ$}
+
 % Laurent Siebenmann reports \Orb undefined with:
 %  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
 % so we'll define it if necessary.
@@ -2140,6 +2788,12 @@ where each line of input produces a line of output.}
 \def\Orb{\mathhexbox20D}
 \fi
 
+% Quotes.
+\chardef\quotedblleft="5C
+\chardef\quotedblright=`\"
+\chardef\quoteleft=`\`
+\chardef\quoteright=`\'
+
 
 \message{page headings,}
 
@@ -2303,12 +2957,39 @@ where each line of input produces a line of output.}
   %
   % Leave some space for the footline.  Hopefully ok to assume
   % @evenfooting will not be used by itself.
-  \global\advance\pageheight by -\baselineskip
-  \global\advance\vsize by -\baselineskip
+  \global\advance\pageheight by -12pt
+  \global\advance\vsize by -12pt
 }
 
 \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
 
+% @evenheadingmarks top     \thischapter <- chapter at the top of a page
+% @evenheadingmarks bottom  \thischapter <- chapter at the bottom of a page
+%
+% The same set of arguments for:
+%
+% @oddheadingmarks
+% @evenfootingmarks
+% @oddfootingmarks
+% @everyheadingmarks
+% @everyfootingmarks
+
+\def\evenheadingmarks{\headingmarks{even}{heading}}
+\def\oddheadingmarks{\headingmarks{odd}{heading}}
+\def\evenfootingmarks{\headingmarks{even}{footing}}
+\def\oddfootingmarks{\headingmarks{odd}{footing}}
+\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1}
+                          \headingmarks{odd}{heading}{#1} }
+\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1}
+                          \headingmarks{odd}{footing}{#1} }
+% #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
+\def\headingmarks#1#2#3 {%
+  \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname
+  \global\expandafter\let\csname get#1#2marks\endcsname \temp
+}
+
+\everyheadingmarks bottom
+\everyfootingmarks bottom
 
 % @headings double      turns headings on for double-sided printing.
 % @headings single      turns headings on for single-sided printing.
@@ -2963,6 +3644,7 @@ where each line of input produces a line of output.}
 
 \def\doignore#1{\begingroup
   % Scan in ``verbatim'' mode:
+  \obeylines
   \catcode`\@ = \other
   \catcode`\{ = \other
   \catcode`\} = \other
@@ -2983,16 +3665,16 @@ where each line of input produces a line of output.}
   \gdef\dodoignore#1{%
     % #1 contains the command name as a string, e.g., `ifinfo'.
     %
-    % Define a command to find the next `@end #1', which must be on a line
-    % by itself.
-    \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}%
+    % Define a command to find the next `@end #1'.
+    \long\def\doignoretext##1^^M@end #1{%
+      \doignoretextyyy##1^^M@#1\_STOP_}%
+    %
     % And this command to find another #1 command, at the beginning of a
     % line.  (Otherwise, we would consider a line `@c @ifset', for
     % example, to count as an @ifset for nesting.)
     \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
     %
     % And now expand that command.
-    \obeylines %
     \doignoretext ^^M%
   }%
 }
@@ -3022,7 +3704,12 @@ where each line of input produces a line of output.}
 }
 
 % Finish off ignored text.
-\def\enddoignore{\endgroup\ignorespaces}
+{ \obeylines%
+  % Ignore anything after the last `@end #1'; this matters in verbatim
+  % environments, where otherwise the newline after an ignored conditional
+  % would result in a blank line in the output.
+  \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
+}
 
 
 % @set VAR sets the variable VAR to an empty value.
@@ -3222,34 +3909,41 @@ where each line of input produces a line of output.}
 % we have to laboriously prevent expansion for those that we don't.
 %
 \def\indexdummies{%
+  \escapechar = `\\     % use backslash in output files.
   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
   \def\ {\realbackslash\space }%
+  %
   % Need these in case \tex is in effect and \{ is a \delimiter again.
   % But can't use \lbracecmd and \rbracecmd because texindex assumes
   % braces and backslashes are used only as delimiters.
   \let\{ = \mylbrace
   \let\} = \myrbrace
   %
-  % \definedummyword defines \#1 as \realbackslash #1\space, thus
-  % effectively preventing its expansion.  This is used only for control
-  % words, not control letters, because the \space would be incorrect
-  % for control characters, but is needed to separate the control word
-  % from whatever follows.
-  %
-  % For control letters, we have \definedummyletter, which omits the
-  % space.
-  %
-  % These can be used both for control words that take an argument and
-  % those that do not.  If it is followed by {arg} in the input, then
-  % that will dutifully get written to the index (or wherever).
-  %
-  \def\definedummyword##1{%
-    \expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}%
-  }%
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{\realbackslash ##1}%
-  }%
-  \let\definedummyaccent\definedummyletter
+  % I don't entirely understand this, but when an index entry is
+  % generated from a macro call, the \endinput which \scanmacro inserts
+  % causes processing to be prematurely terminated.  This is,
+  % apparently, because \indexsorttmp is fully expanded, and \endinput
+  % is an expandable command.  The redefinition below makes \endinput
+  % disappear altogether for that purpose -- although logging shows that
+  % processing continues to some further point.  On the other hand, it
+  % seems \endinput does not hurt in the printed index arg, since that
+  % is still getting written without apparent harm.
+  % 
+  % Sample source (mac-idx3.tex, reported by Graham Percival to
+  % help-texinfo, 22may06):
+  % @macro funindex {WORD}
+  % @findex xyz
+  % @end macro
+  % ...
+  % @funindex commtest
+  % 
+  % The above is not enough to reproduce the bug, but it gives the flavor.
+  % 
+  % Sample whatsit resulting:
+  % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
+  % 
+  % So:
+  \let\endinput = \empty
   %
   % Do the redefinitions.
   \commondummies
@@ -3266,147 +3960,162 @@ where each line of input produces a line of output.}
   \let\{ = \lbraceatcmd
   \let\} = \rbraceatcmd
   %
-  % (See comments in \indexdummies.)
-  \def\definedummyword##1{%
-    \expandafter\def\csname ##1\endcsname{@##1\space}%
-  }%
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{@##1}%
-  }%
-  \let\definedummyaccent\definedummyletter
-  %
   % Do the redefinitions.
   \commondummies
+  \otherbackslash
 }
 
-% Called from \indexdummies and \atdummies.  \definedummyword and
-% \definedummyletter must be defined first.
+% Called from \indexdummies and \atdummies.
 %
 \def\commondummies{%
   %
-  \normalturnoffactive
+  % \definedummyword defines \#1 as \string\#1\space, thus effectively
+  % preventing its expansion.  This is used only for control% words,
+  % not control letters, because the \space would be incorrect for
+  % control characters, but is needed to separate the control word
+  % from whatever follows.
+  %
+  % For control letters, we have \definedummyletter, which omits the
+  % space.
+  %
+  % These can be used both for control words that take an argument and
+  % those that do not.  If it is followed by {arg} in the input, then
+  % that will dutifully get written to the index (or wherever).
+  %
+  \def\definedummyword  ##1{\def##1{\string##1\space}}%
+  \def\definedummyletter##1{\def##1{\string##1}}%
+  \let\definedummyaccent\definedummyletter
   %
   \commondummiesnofonts
   %
-  \definedummyletter{_}%
+  \definedummyletter\_%
   %
   % Non-English letters.
-  \definedummyword{AA}%
-  \definedummyword{AE}%
-  \definedummyword{L}%
-  \definedummyword{OE}%
-  \definedummyword{O}%
-  \definedummyword{aa}%
-  \definedummyword{ae}%
-  \definedummyword{l}%
-  \definedummyword{oe}%
-  \definedummyword{o}%
-  \definedummyword{ss}%
-  \definedummyword{exclamdown}%
-  \definedummyword{questiondown}%
-  \definedummyword{ordf}%
-  \definedummyword{ordm}%
+  \definedummyword\AA
+  \definedummyword\AE
+  \definedummyword\L
+  \definedummyword\OE
+  \definedummyword\O
+  \definedummyword\aa
+  \definedummyword\ae
+  \definedummyword\l
+  \definedummyword\oe
+  \definedummyword\o
+  \definedummyword\ss
+  \definedummyword\exclamdown
+  \definedummyword\questiondown
+  \definedummyword\ordf
+  \definedummyword\ordm
   %
   % Although these internal commands shouldn't show up, sometimes they do.
-  \definedummyword{bf}%
-  \definedummyword{gtr}%
-  \definedummyword{hat}%
-  \definedummyword{less}%
-  \definedummyword{sf}%
-  \definedummyword{sl}%
-  \definedummyword{tclose}%
-  \definedummyword{tt}%
-  %
-  \definedummyword{LaTeX}%
-  \definedummyword{TeX}%
+  \definedummyword\bf
+  \definedummyword\gtr
+  \definedummyword\hat
+  \definedummyword\less
+  \definedummyword\sf
+  \definedummyword\sl
+  \definedummyword\tclose
+  \definedummyword\tt
+  %
+  \definedummyword\LaTeX
+  \definedummyword\TeX
   %
   % Assorted special characters.
-  \definedummyword{bullet}%
-  \definedummyword{comma}%
-  \definedummyword{copyright}%
-  \definedummyword{registeredsymbol}%
-  \definedummyword{dots}%
-  \definedummyword{enddots}%
-  \definedummyword{equiv}%
-  \definedummyword{error}%
-  \definedummyword{euro}%
-  \definedummyword{expansion}%
-  \definedummyword{minus}%
-  \definedummyword{pounds}%
-  \definedummyword{point}%
-  \definedummyword{print}%
-  \definedummyword{result}%
+  \definedummyword\bullet
+  \definedummyword\comma
+  \definedummyword\copyright
+  \definedummyword\registeredsymbol
+  \definedummyword\dots
+  \definedummyword\enddots
+  \definedummyword\equiv
+  \definedummyword\error
+  \definedummyword\euro
+  \definedummyword\guillemetleft
+  \definedummyword\guillemetright
+  \definedummyword\guilsinglleft
+  \definedummyword\guilsinglright
+  \definedummyword\expansion
+  \definedummyword\minus
+  \definedummyword\pounds
+  \definedummyword\point
+  \definedummyword\print
+  \definedummyword\quotedblbase
+  \definedummyword\quotedblleft
+  \definedummyword\quotedblright
+  \definedummyword\quoteleft
+  \definedummyword\quoteright
+  \definedummyword\quotesinglbase
+  \definedummyword\result
+  \definedummyword\textdegree
+  %
+  % We want to disable all macros so that they are not expanded by \write.
+  \macrolist
+  %
+  \normalturnoffactive
   %
   % Handle some cases of @value -- where it does not contain any
   % (non-fully-expandable) commands.
   \makevalueexpandable
-  %
-  % Normal spaces, not active ones.
-  \unsepspaces
-  %
-  % No macro expansion.
-  \turnoffmacros
 }
 
 % \commondummiesnofonts: common to \commondummies and \indexnofonts.
 %
-% Better have this without active chars.
-{
-  \catcode`\~=\other
-  \gdef\commondummiesnofonts{%
-    % Control letters and accents.
-    \definedummyletter{!}%
-    \definedummyaccent{"}%
-    \definedummyaccent{'}%
-    \definedummyletter{*}%
-    \definedummyaccent{,}%
-    \definedummyletter{.}%
-    \definedummyletter{/}%
-    \definedummyletter{:}%
-    \definedummyaccent{=}%
-    \definedummyletter{?}%
-    \definedummyaccent{^}%
-    \definedummyaccent{`}%
-    \definedummyaccent{~}%
-    \definedummyword{u}%
-    \definedummyword{v}%
-    \definedummyword{H}%
-    \definedummyword{dotaccent}%
-    \definedummyword{ringaccent}%
-    \definedummyword{tieaccent}%
-    \definedummyword{ubaraccent}%
-    \definedummyword{udotaccent}%
-    \definedummyword{dotless}%
-    %
-    % Texinfo font commands.
-    \definedummyword{b}%
-    \definedummyword{i}%
-    \definedummyword{r}%
-    \definedummyword{sc}%
-    \definedummyword{t}%
-    %
-    % Commands that take arguments.
-    \definedummyword{acronym}%
-    \definedummyword{cite}%
-    \definedummyword{code}%
-    \definedummyword{command}%
-    \definedummyword{dfn}%
-    \definedummyword{emph}%
-    \definedummyword{env}%
-    \definedummyword{file}%
-    \definedummyword{kbd}%
-    \definedummyword{key}%
-    \definedummyword{math}%
-    \definedummyword{option}%
-    \definedummyword{samp}%
-    \definedummyword{strong}%
-    \definedummyword{tie}%
-    \definedummyword{uref}%
-    \definedummyword{url}%
-    \definedummyword{var}%
-    \definedummyword{verb}%
-    \definedummyword{w}%
-  }
+\def\commondummiesnofonts{%
+  % Control letters and accents.
+  \definedummyletter\!%
+  \definedummyaccent\"%
+  \definedummyaccent\'%
+  \definedummyletter\*%
+  \definedummyaccent\,%
+  \definedummyletter\.%
+  \definedummyletter\/%
+  \definedummyletter\:%
+  \definedummyaccent\=%
+  \definedummyletter\?%
+  \definedummyaccent\^%
+  \definedummyaccent\`%
+  \definedummyaccent\~%
+  \definedummyword\u
+  \definedummyword\v
+  \definedummyword\H
+  \definedummyword\dotaccent
+  \definedummyword\ringaccent
+  \definedummyword\tieaccent
+  \definedummyword\ubaraccent
+  \definedummyword\udotaccent
+  \definedummyword\dotless
+  %
+  % Texinfo font commands.
+  \definedummyword\b
+  \definedummyword\i
+  \definedummyword\r
+  \definedummyword\sc
+  \definedummyword\t
+  %
+  % Commands that take arguments.
+  \definedummyword\acronym
+  \definedummyword\cite
+  \definedummyword\code
+  \definedummyword\command
+  \definedummyword\dfn
+  \definedummyword\emph
+  \definedummyword\env
+  \definedummyword\file
+  \definedummyword\kbd
+  \definedummyword\key
+  \definedummyword\math
+  \definedummyword\option
+  \definedummyword\pxref
+  \definedummyword\ref
+  \definedummyword\samp
+  \definedummyword\strong
+  \definedummyword\tie
+  \definedummyword\uref
+  \definedummyword\url
+  \definedummyword\var
+  \definedummyword\verb
+  \definedummyword\w
+  \definedummyword\xref
 }
 
 % \indexnofonts is used when outputting the strings to sort the index
@@ -3416,13 +4125,9 @@ where each line of input produces a line of output.}
 %
 \def\indexnofonts{%
   % Accent commands should become @asis.
-  \def\definedummyaccent##1{%
-    \expandafter\let\csname ##1\endcsname\asis
-  }%
+  \def\definedummyaccent##1{\let##1\asis}%
   % We can just ignore other control letters.
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{}%
-  }%
+  \def\definedummyletter##1{\let##1\empty}%
   % Hopefully, all control words can become @asis.
   \let\definedummyword\definedummyaccent
   %
@@ -3469,15 +4174,35 @@ where each line of input produces a line of output.}
   \def\equiv{==}%
   \def\error{error}%
   \def\euro{euro}%
+  \def\guillemetleft{<<}%
+  \def\guillemetright{>>}%
+  \def\guilsinglleft{<}%
+  \def\guilsinglright{>}%
   \def\expansion{==>}%
   \def\minus{-}%
   \def\pounds{pounds}%
   \def\point{.}%
   \def\print{-|}%
+  \def\quotedblbase{"}%
+  \def\quotedblleft{"}%
+  \def\quotedblright{"}%
+  \def\quoteleft{`}%
+  \def\quoteright{'}%
+  \def\quotesinglbase{,}%
   \def\result{=>}%
+  \def\textdegree{degrees}%
   %
-  % Don't write macro names.
-  \emptyusermacros
+  % We need to get rid of all macros, leaving only the arguments (if present).
+  % Of course this is not nearly correct, but it is the best we can do for now.
+  % makeinfo does not expand macros in the argument to @deffn, which ends up
+  % writing an index entry, and texindex isn't prepared for an index sort entry
+  % that starts with \.
+  % 
+  % Since macro invocations are followed by braces, we can just redefine them
+  % to take a single TeX argument.  The case of a macro invocation that
+  % goes to end-of-line is not handled.
+  % 
+  \macrolist
 }
 
 \let\indexbackslash=0  %overridden during \printindex.
@@ -3505,11 +4230,7 @@ where each line of input produces a line of output.}
     %
     \edef\writeto{\csname#1indfile\endcsname}%
     %
-    \ifvmode
-      \dosubindsanitize
-    \else
-      \dosubindwrite
-    \fi
+    \safewhatsit\dosubindwrite
   }%
   \fi
 }
@@ -3524,7 +4245,6 @@ where each line of input produces a line of output.}
   %
   % Remember, we are within a group.
   \indexdummies % Must do this here, since \bf, etc expand at this stage
-  \escapechar=`\\
   \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
       % so it will be output as is; and it will print as backslash.
   %
@@ -3547,13 +4267,13 @@ where each line of input produces a line of output.}
   \temp
 }
 
-% Take care of unwanted page breaks:
+% Take care of unwanted page breaks/skips around a whatsit:
 %
 % If a skip is the last thing on the list now, preserve it
 % by backing up by \lastskip, doing the \write, then inserting
 % the skip again.  Otherwise, the whatsit generated by the
-% \write will make \lastskip zero.  The result is that sequences
-% like this:
+% \write or \pdfdest will make \lastskip zero.  The result is that
+% sequences like this:
 % @end defun
 % @tindex whatever
 % @defun ...
@@ -3577,25 +4297,31 @@ where each line of input produces a line of output.}
 %
 \edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname}
 %
+\newskip\whatsitskip
+\newcount\whatsitpenalty
+%
 % ..., ready, GO:
 %
-\def\dosubindsanitize{%
+\def\safewhatsit#1{%
+\ifhmode
+  #1%
+\else
   % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
-  \skip0 = \lastskip
+  \whatsitskip = \lastskip
   \edef\lastskipmacro{\the\lastskip}%
-  \count255 = \lastpenalty
+  \whatsitpenalty = \lastpenalty
   %
   % If \lastskip is nonzero, that means the last item was a
   % skip.  And since a skip is discardable, that means this
-  % -\skip0 glue we're inserting is preceded by a
+  % -\whatsitskip glue we're inserting is preceded by a
   % non-discardable item, therefore it is not a potential
   % breakpoint, therefore no \nobreak needed.
   \ifx\lastskipmacro\zeroskipmacro
   \else
-    \vskip-\skip0
+    \vskip-\whatsitskip
   \fi
   %
-  \dosubindwrite
+  #1%
   %
   \ifx\lastskipmacro\zeroskipmacro
     % If \lastskip was zero, perhaps the last item was a penalty, and
@@ -3609,13 +4335,14 @@ where each line of input produces a line of output.}
     %   Description.
     % would allow a break between the index-whatever whatsit
     % and the "Description." paragraph.
-    \ifnum\count255>9999 \penalty\count255 \fi
+    \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
   \else
     % On the other hand, if we had a nonzero \lastskip,
     % this make-up glue would be preceded by a non-discardable item
     % (the whatsit from the \write), so we must insert a \nobreak.
-    \nobreak\vskip\skip0
+    \nobreak\vskip\whatsitskip
   \fi
+\fi
 }
 
 % The index entry written in the file actually looks like
@@ -3658,6 +4385,7 @@ where each line of input produces a line of output.}
   %
   \smallfonts \rm
   \tolerance = 9500
+  \plainfrenchspacing
   \everypar = {}% don't want the \kern\-parindent from indentation suppression.
   %
   % See if the index file exists and is nonempty.
@@ -3731,7 +4459,7 @@ where each line of input produces a line of output.}
 %
 % A straightforward implementation would start like this:
 %	\def\entry#1#2{...
-% But this frozes the catcodes in the argument, and can cause problems to
+% But this freezes the catcodes in the argument, and can cause problems to
 % @code, which sets - active.  This problem was fixed by a kludge---
 % ``-'' was active throughout whole index, but this isn't really right.
 %
@@ -3787,11 +4515,8 @@ where each line of input produces a line of output.}
     % The following is kludged to not output a line of dots in the index if
     % there are no page numbers.  The next person who breaks this will be
     % cursed by a Unix daemon.
-    \def\tempa{{\rm }}%
-    \def\tempb{#1}%
-    \edef\tempc{\tempa}%
-    \edef\tempd{\tempb}%
-    \ifx\tempc\tempd
+    \setbox\boxA = \hbox{#1}%
+    \ifdim\wd\boxA = 0pt
       \ %
     \else
       %
@@ -3815,9 +4540,9 @@ where each line of input produces a line of output.}
   \endgroup
 }
 
-% Like \dotfill except takes at least 1 em.
+% Like plain.tex's \dotfill, except uses up at least 1 em.
 \def\indexdotfill{\cleaders
-  \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
+  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
 
 \def\primary #1{\line{#1\hfil}}
 
@@ -3927,6 +4652,34 @@ where each line of input produces a line of output.}
 %
 % All done with double columns.
 \def\enddoublecolumns{%
+  % The following penalty ensures that the page builder is exercised
+  % _before_ we change the output routine.  This is necessary in the
+  % following situation:
+  %
+  % The last section of the index consists only of a single entry.
+  % Before this section, \pagetotal is less than \pagegoal, so no
+  % break occurs before the last section starts.  However, the last
+  % section, consisting of \initial and the single \entry, does not
+  % fit on the page and has to be broken off.  Without the following
+  % penalty the page builder will not be exercised until \eject
+  % below, and by that time we'll already have changed the output
+  % routine to the \balancecolumns version, so the next-to-last
+  % double-column page will be processed with \balancecolumns, which
+  % is wrong:  The two columns will go to the main vertical list, with
+  % the broken-off section in the recent contributions.  As soon as
+  % the output routine finishes, TeX starts reconsidering the page
+  % break.  The two columns and the broken-off section both fit on the
+  % page, because the two columns now take up only half of the page
+  % goal.  When TeX sees \eject from below which follows the final
+  % section, it invokes the new output routine that we've set after
+  % \balancecolumns below; \onepageout will try to fit the two columns
+  % and the final section into the vbox of \pageheight (see
+  % \pagebody), causing an overfull box.
+  %
+  % Note that glue won't work here, because glue does not exercise the
+  % page builder, unlike penalties (see The TeXbook, pp. 280-281).
+  \penalty0
+  %
   \output = {%
     % Split the last of the double-column material.  Leave it on the
     % current page, no automatic page break.
@@ -4036,11 +4789,15 @@ where each line of input produces a line of output.}
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
 
-% Each @chapter defines this as the name of the chapter.
-% page headings and footings can use it.  @section does likewise.
-% However, they are not reliable, because we don't use marks.
+% Each @chapter defines these (using marks) as the number+name, number
+% and name of the chapter.  Page headings and footings can use
+% these.  @section does likewise.
 \def\thischapter{}
+\def\thischapternum{}
+\def\thischaptername{}
 \def\thissection{}
+\def\thissectionnum{}
+\def\thissectionname{}
 
 \newcount\absseclevel % used to calculate proper heading level
 \newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
@@ -4341,7 +5098,20 @@ where each line of input produces a line of output.}
 
 \def\chapbreak{\dobreak \chapheadingskip {-4000}}
 \def\chappager{\par\vfill\supereject}
-\def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi}
+% Because \domark is called before \chapoddpage, the filler page will
+% get the headings for the next chapter, which is wrong.  But we don't
+% care -- we just disable all headings on the filler page.
+\def\chapoddpage{%
+  \chappager
+  \ifodd\pageno \else
+    \begingroup
+      \evenheadline={\hfil}\evenfootline={\hfil}%
+      \oddheadline={\hfil}\oddfootline={\hfil}%
+      \hbox to 0pt{}%
+      \chappager
+    \endgroup
+  \fi
+}
 
 \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
 
@@ -4375,41 +5145,72 @@ where each line of input produces a line of output.}
 \def\Yappendixkeyword{Yappendix}
 %
 \def\chapmacro#1#2#3{%
+  % Insert the first mark before the heading break (see notes for \domark).
+  \let\prevchapterdefs=\lastchapterdefs
+  \let\prevsectiondefs=\lastsectiondefs
+  \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
+                        \gdef\thissection{}}%
+  %
+  \def\temptype{#2}%
+  \ifx\temptype\Ynothingkeyword
+    \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+                          \gdef\thischapter{\thischaptername}}%
+  \else\ifx\temptype\Yomitfromtockeyword
+    \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+                          \gdef\thischapter{}}%
+  \else\ifx\temptype\Yappendixkeyword
+    \toks0={#1}%
+    \xdef\lastchapterdefs{%
+      \gdef\noexpand\thischaptername{\the\toks0}%
+      \gdef\noexpand\thischapternum{\appendixletter}%
+      \gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum:
+                                 \noexpand\thischaptername}%
+    }%
+  \else
+    \toks0={#1}%
+    \xdef\lastchapterdefs{%
+      \gdef\noexpand\thischaptername{\the\toks0}%
+      \gdef\noexpand\thischapternum{\the\chapno}%
+      \gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum:
+                                 \noexpand\thischaptername}%
+    }%
+  \fi\fi\fi
+  %
+  % Output the mark.  Pass it through \safewhatsit, to take care of
+  % the preceding space.
+  \safewhatsit\domark
+  %
+  % Insert the chapter heading break.
   \pchapsepmacro
+  %
+  % Now the second mark, after the heading break.  No break points
+  % between here and the heading.
+  \let\prevchapterdefs=\lastchapterdefs
+  \let\prevsectiondefs=\lastsectiondefs
+  \domark
+  %
   {%
     \chapfonts \rm
     %
-    % Have to define \thissection before calling \donoderef, because the
+    % Have to define \lastsection before calling \donoderef, because the
     % xref code eventually uses it.  On the other hand, it has to be called
     % after \pchapsepmacro, or the headline will change too soon.
-    \gdef\thissection{#1}%
-    \gdef\thischaptername{#1}%
+    \gdef\lastsection{#1}%
     %
     % Only insert the separating space if we have a chapter/appendix
     % number, and don't print the unnumbered ``number''.
-    \def\temptype{#2}%
     \ifx\temptype\Ynothingkeyword
       \setbox0 = \hbox{}%
       \def\toctype{unnchap}%
-      \gdef\thischapter{#1}%
     \else\ifx\temptype\Yomitfromtockeyword
       \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
       \def\toctype{omit}%
-      \gdef\thischapter{}%
     \else\ifx\temptype\Yappendixkeyword
       \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
       \def\toctype{app}%
-      % We don't substitute the actual chapter name into \thischapter
-      % because we don't want its macros evaluated now.  And we don't
-      % use \thissection because that changes with each section.
-      %
-      \xdef\thischapter{\putwordAppendix{} \appendixletter:
-                        \noexpand\thischaptername}%
     \else
       \setbox0 = \hbox{#3\enspace}%
       \def\toctype{numchap}%
-      \xdef\thischapter{\putwordChapter{} \the\chapno:
-                        \noexpand\thischaptername}%
     \fi\fi\fi
     %
     % Write the toc entry for this chapter.  Must come before the
@@ -4425,6 +5226,7 @@ where each line of input produces a line of output.}
     \donoderef{#2}%
     %
     % Typeset the actual heading.
+    \nobreak % Avoid page breaks at the interline glue.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
           \hangindent=\wd0 \centerparametersmaybe
           \unhbox0 #1\par}%
@@ -4487,45 +5289,95 @@ where each line of input produces a line of output.}
 % the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
 % section number.
 %
+\def\seckeyword{sec}
+%
 \def\sectionheading#1#2#3#4{%
   {%
     % Switch to the right set of fonts.
     \csname #2fonts\endcsname \rm
     %
+    \def\sectionlevel{#2}%
+    \def\temptype{#3}%
+    %
+    % Insert first mark before the heading break (see notes for \domark).
+    \let\prevsectiondefs=\lastsectiondefs
+    \ifx\temptype\Ynothingkeyword
+      \ifx\sectionlevel\seckeyword
+        \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
+                              \gdef\thissection{\thissectionname}}%
+      \fi
+    \else\ifx\temptype\Yomitfromtockeyword
+      % Don't redefine \thissection.
+    \else\ifx\temptype\Yappendixkeyword
+      \ifx\sectionlevel\seckeyword
+        \toks0={#1}%
+        \xdef\lastsectiondefs{%
+          \gdef\noexpand\thissectionname{\the\toks0}%
+          \gdef\noexpand\thissectionnum{#4}%
+          \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
+                                     \noexpand\thissectionname}%
+        }%
+      \fi
+    \else
+      \ifx\sectionlevel\seckeyword
+        \toks0={#1}%
+        \xdef\lastsectiondefs{%
+          \gdef\noexpand\thissectionname{\the\toks0}%
+          \gdef\noexpand\thissectionnum{#4}%
+          \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
+                                     \noexpand\thissectionname}%
+        }%
+      \fi
+    \fi\fi\fi
+    %
+    % Output the mark.  Pass it through \safewhatsit, to take care of
+    % the preceding space.
+    \safewhatsit\domark
+    %
     % Insert space above the heading.
     \csname #2headingbreak\endcsname
     %
-    % Only insert the space after the number if we have a section number.
-    \def\sectionlevel{#2}%
-    \def\temptype{#3}%
+    % Now the second mark, after the heading break.  No break points
+    % between here and the heading.
+    \let\prevsectiondefs=\lastsectiondefs
+    \domark
     %
+    % Only insert the space after the number if we have a section number.
     \ifx\temptype\Ynothingkeyword
       \setbox0 = \hbox{}%
       \def\toctype{unn}%
-      \gdef\thissection{#1}%
+      \gdef\lastsection{#1}%
     \else\ifx\temptype\Yomitfromtockeyword
       % for @headings -- no section number, don't include in toc,
-      % and don't redefine \thissection.
+      % and don't redefine \lastsection.
       \setbox0 = \hbox{}%
       \def\toctype{omit}%
       \let\sectionlevel=\empty
     \else\ifx\temptype\Yappendixkeyword
       \setbox0 = \hbox{#4\enspace}%
       \def\toctype{app}%
-      \gdef\thissection{#1}%
+      \gdef\lastsection{#1}%
     \else
       \setbox0 = \hbox{#4\enspace}%
       \def\toctype{num}%
-      \gdef\thissection{#1}%
+      \gdef\lastsection{#1}%
     \fi\fi\fi
     %
-    % Write the toc entry (before \donoderef).  See comments in \chfplain.
+    % Write the toc entry (before \donoderef).  See comments in \chapmacro.
     \writetocentry{\toctype\sectionlevel}{#1}{#4}%
     %
     % Write the node reference (= pdf destination for pdftex).
-    % Again, see comments in \chfplain.
+    % Again, see comments in \chapmacro.
     \donoderef{#3}%
     %
+    % Interline glue will be inserted when the vbox is completed.
+    % That glue will be a valid breakpoint for the page, since it'll be
+    % preceded by a whatsit (usually from the \donoderef, or from the
+    % \writetocentry if there was no node).  We don't want to allow that
+    % break, since then the whatsits could end up on page n while the
+    % section is on page n+1, thus toc/etc. are wrong.  Debian bug 276000.
+    \nobreak
+    %
     % Output the actual section heading.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
           \hangindent=\wd0  % zero if no section number
@@ -4584,11 +5436,11 @@ where each line of input produces a line of output.}
     \fi
     %
     \iflinks
-      {\atdummies \turnoffactive
+      {\atdummies
        \edef\temp{%
          \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
        \temp
-      }
+      }%
     \fi
   \fi
   %
@@ -4623,7 +5475,7 @@ where each line of input produces a line of output.}
 \def\readtocfile{%
   \setupdatafile
   \activecatcodes
-  \input \jobname.toc
+  \input \tocreadfilename
 }
 
 \newskip\contentsrightmargin \contentsrightmargin=1in
@@ -4642,7 +5494,6 @@ where each line of input produces a line of output.}
   %
   % Don't need to put `Contents' or `Short Contents' in the headline.
   % It is abundantly clear what they are.
-  \def\thischapter{}%
   \chapmacro{#1}{Yomitfromtoc}{}%
   %
   \savepageno = \pageno
@@ -4654,11 +5505,16 @@ where each line of input produces a line of output.}
     \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
 }
 
+% redefined for the two-volume lispref.  We always output on
+% \jobname.toc even if this is redefined.
+% 
+\def\tocreadfilename{\jobname.toc}
 
 % Normal (long) toc.
+%
 \def\contents{%
   \startcontents{\putwordTOC}%
-    \openin 1 \jobname.toc
+    \openin 1 \tocreadfilename\space
     \ifeof 1 \else
       \readtocfile
     \fi
@@ -4696,7 +5552,7 @@ where each line of input produces a line of output.}
     \let\numsubsubsecentry = \numsecentry
     \let\appsubsubsecentry = \numsecentry
     \let\unnsubsubsecentry = \numsecentry
-    \openin 1 \jobname.toc
+    \openin 1 \tocreadfilename\space
     \ifeof 1 \else
       \readtocfile
     \fi
@@ -4823,14 +5679,15 @@ where each line of input produces a line of output.}
 
 % @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
 %
-% Since these characters are used in examples, it should be an even number of
+% Since these characters are used in examples, they should be an even number of
 % \tt widths. Each \tt character is 1en, so two makes it 1em.
 %
 \def\point{$\star$}
-\def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
-\def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
+\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
+\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
+\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
 \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
-\def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
+\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
 
 % The @error{} command.
 % Adapted from the TeXbook's \boxit.
@@ -4840,7 +5697,7 @@ where each line of input produces a line of output.}
 {\tentt \global\dimen0 = 3em}% Width of the box.
 \dimen2 = .55pt % Thickness of rules
 % The text. (`r' is open on the right, `e' somewhat less so on the left.)
-\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
+\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
 %
 \setbox\errorbox=\hbox to \dimen0{\hfil
    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
@@ -4888,6 +5745,7 @@ where each line of input produces a line of output.}
   \let\/=\ptexslash
   \let\*=\ptexstar
   \let\t=\ptext
+  \expandafter \let\csname top\endcsname=\ptextop  % outer
   \let\frenchspacing=\plainfrenchspacing
   %
   \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
@@ -4934,7 +5792,8 @@ where each line of input produces a line of output.}
 
 \let\afterenvbreak = \aboveenvbreak
 
-% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins.
+% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins; it will
+% also clear it, so that its embedded environments do the narrowing again.
 \let\nonarrowing=\relax
 
 % @cartouche ... @end cartouche: draw rectangle w/rounded corners around
@@ -4971,7 +5830,7 @@ where each line of input produces a line of output.}
 				% each corner char, and rule thickness
   \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
   % Flag to tell @lisp, etc., not to narrow margin.
-  \let\nonarrowing=\comment
+  \let\nonarrowing = t%
   \vbox\bgroup
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop
@@ -5011,11 +5870,11 @@ where each line of input produces a line of output.}
   \parskip = 0pt
   \parindent = 0pt
   \emergencystretch = 0pt % don't try to avoid overfull boxes
-  % @cartouche defines \nonarrowing to inhibit narrowing
-  % at next level down.
   \ifx\nonarrowing\relax
     \advance \leftskip by \lispnarrowing
     \exdentamount=\lispnarrowing
+  \else
+    \let\nonarrowing = \relax
   \fi
   \let\exdent=\nofillexdent
 }
@@ -5030,12 +5889,18 @@ where each line of input produces a line of output.}
 \let\SETdispenvsize\relax
 \def\setnormaldispenv{%
   \ifx\SETdispenvsize\smallword
+    % end paragraph for sake of leading, in case document has no blank
+    % line.  This is redundant with what happens in \aboveenvbreak, but
+    % we need to do it before changing the fonts, and it's inconvenient
+    % to change the fonts afterward.
+    \ifnum \lastpenalty=10000 \else \endgraf \fi
     \smallexamplefonts \rm
   \fi
 }
 \def\setsmalldispenv{%
   \ifx\SETdispenvsize\nosmallword
   \else
+    \ifnum \lastpenalty=10000 \else \endgraf \fi
     \smallexamplefonts \rm
   \fi
 }
@@ -5062,11 +5927,10 @@ where each line of input produces a line of output.}
 %
 \maketwodispenvs {lisp}{example}{%
   \nonfillstart
-  \tt
+  \tt\quoteexpand
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
   \gobble       % eat return
 }
-
 % @display/@smalldisplay: same as @lisp except keep current font.
 %
 \makedispenv {display}{%
@@ -5115,6 +5979,7 @@ where each line of input produces a line of output.}
     \advance\leftskip by \lispnarrowing
     \advance\rightskip by \lispnarrowing
     \exdentamount = \lispnarrowing
+  \else
     \let\nonarrowing = \relax
   \fi
   \parsearg\quotationlabel
@@ -5193,6 +6058,34 @@ where each line of input produces a line of output.}
 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %
 \def\starttabbox{\setbox0=\hbox\bgroup}
+
+% Allow an option to not replace quotes with a regular directed right
+% quote/apostrophe (char 0x27), but instead use the undirected quote
+% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
+% the default, but it works for pasting with more pdf viewers (at least
+% evince), the lilypond developers report.  xpdf does work with the
+% regular 0x27.  
+% 
+\def\codequoteright{%
+  \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
+    \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+      '%
+    \else \char'15 \fi
+  \else \char'15 \fi
+}
+%
+% and a similar option for the left quote char vs. a grave accent.
+% Modern fonts display ASCII 0x60 as a grave accent, so some people like
+% the code environments to do likewise.
+% 
+\def\codequoteleft{%
+  \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
+    \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
+      `%
+    \else \char'22 \fi
+  \else \char'22 \fi
+}
+%
 \begingroup
   \catcode`\^^I=\active
   \gdef\tabexpand{%
@@ -5205,15 +6098,25 @@ where each line of input produces a line of output.}
       \wd0=\dimen0 \box0 \starttabbox
     }%
   }
+  \catcode`\'=\active
+  \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
+  %
+  \catcode`\`=\active
+  \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
+  %
+  \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
 \endgroup
+
+% start the verbatim environment.
 \def\setupverbatim{%
+  \let\nonarrowing = t%
   \nonfillstart
-  \advance\leftskip by -\defbodyindent
   % Easiest (and conventionally used) font for verbatim
   \tt
   \def\par{\leavevmode\egroup\box0\endgraf}%
   \catcode`\`=\active
   \tabexpand
+  \quoteexpand
   % Respect line breaks,
   % print special symbols as themselves, and
   % make each space count
@@ -5298,27 +6201,35 @@ where each line of input produces a line of output.}
   \endgroup
 }
 
+
 \message{defuns,}
 % @defun etc.
 
 \newskip\defbodyindent \defbodyindent=.4in
 \newskip\defargsindent \defargsindent=50pt
 \newskip\deflastargmargin \deflastargmargin=18pt
+\newcount\defunpenalty
 
 % Start the processing of @deffn:
 \def\startdefun{%
   \ifnum\lastpenalty<10000
     \medbreak
+    \defunpenalty=10003 % Will keep this @deffn together with the
+                        % following @def command, see below.
   \else
     % If there are two @def commands in a row, we'll have a \nobreak,
     % which is there to keep the function description together with its
     % header.  But if there's nothing but headers, we need to allow a
     % break somewhere.  Check specifically for penalty 10002, inserted
-    % by \defargscommonending, instead of 10000, since the sectioning
+    % by \printdefunline, instead of 10000, since the sectioning
     % commands also insert a nobreak penalty, and we don't want to allow
     % a break between a section heading and a defun.
-    % 
-    \ifnum\lastpenalty=10002 \penalty2000 \fi
+    %
+    % As a minor refinement, we avoid "club" headers by signalling
+    % with penalty of 10003 after the very first @deffn in the
+    % sequence (see above), and penalty of 10002 after any following
+    % @def command.
+    \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi
     %
     % Similarly, after a section heading, do not allow a break.
     % But do insert the glue.
@@ -5336,7 +6247,7 @@ where each line of input produces a line of output.}
   %
   % As above, allow line break if we have multiple x headers in a row.
   % It's not a great place, though.
-  \ifnum\lastpenalty=10002 \penalty3000 \fi
+  \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
   %
   % And now, it's time to reuse the body of the original defun:
   \expandafter\gobbledefun#1%
@@ -5354,7 +6265,7 @@ where each line of input produces a line of output.}
     \advance\rightskip by 0pt plus 1fil
     \endgraf
     \nobreak\vskip -\parskip
-    \penalty 10002  % signal to \startdefun and \dodefunx
+    \penalty\defunpenalty  % signal to \startdefun and \dodefunx
     % Some of the @defun-type tags do not enable magic parentheses,
     % rendering the following check redundant.  But we don't optimize.
     \checkparencounts
@@ -5364,7 +6275,7 @@ where each line of input produces a line of output.}
 \def\Edefun{\endgraf\medbreak}
 
 % \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
-% the only thing remainnig is to define \deffnheader.
+% the only thing remaining is to define \deffnheader.
 %
 \def\makedefun#1{%
   \expandafter\let\csname E#1\endcsname = \Edefun
@@ -5623,12 +6534,14 @@ where each line of input produces a line of output.}
   \ifnum\parencount=0 \else \badparencount \fi
   \ifnum\brackcount=0 \else \badbrackcount \fi
 }
+% these should not use \errmessage; the glibc manual, at least, actually
+% has such constructs (when documenting function pointers).
 \def\badparencount{%
-  \errmessage{Unbalanced parentheses in @def}%
+  \message{Warning: unbalanced parentheses in @def...}%
   \global\parencount=0
 }
 \def\badbrackcount{%
-  \errmessage{Unbalanced square braces in @def}%
+  \message{Warning: unbalanced square brackets in @def...}%
   \global\brackcount=0
 }
 
@@ -5663,7 +6576,6 @@ where each line of input produces a line of output.}
     \spaceisspace
     %
     % Append \endinput to make sure that TeX does not see the ending newline.
-    %
     % I've verified that it is necessary both for e-TeX and for ordinary TeX
     %							--kasal, 29nov03
     \scantokens{#1\endinput}%
@@ -5678,8 +6590,19 @@ where each line of input produces a line of output.}
 \newcount\paramno   % Count of parameters
 \newtoks\macname    % Macro name
 \newif\ifrecursive  % Is it recursive?
-\def\macrolist{}    % List of all defined macros in the form
-                    % \do\macro1\do\macro2...
+
+% List of all defined macros in the form
+%    \definedummyword\macro1\definedummyword\macro2...
+% Currently is also contains all @aliases; the list can be split
+% if there is a need.
+\def\macrolist{}
+
+% Add the macro to \macrolist
+\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
+\def\addtomacrolistxxx#1{%
+     \toks0 = \expandafter{\macrolist\definedummyword#1}%
+     \xdef\macrolist{\the\toks0}%
+}
 
 % Utility routines.
 % This does \let #1 = #2, with \csnames; that is,
@@ -5713,6 +6636,10 @@ where each line of input produces a line of output.}
 % all characters are catcode 10, 11 or 12, except \ which is active
 % (as in normal texinfo). It is necessary to change the definition of \.
 
+% Non-ASCII encodings make 8-bit characters active, so un-activate
+% them to avoid their expansion.  Must do this non-globally, to
+% confine the change to the current group.
+
 % It's necessary to have hard CRs when the macro is executed. This is
 % done by  making ^^M (\endlinechar) catcode 12 when reading the macro
 % body, and then making it the \newlinechar in \scanmacro.
@@ -5727,6 +6654,7 @@ where each line of input produces a line of output.}
   \catcode`\_=\other
   \catcode`\|=\other
   \catcode`\~=\other
+  \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
 }
 
 \def\scanargctxt{%
@@ -5777,10 +6705,7 @@ where each line of input produces a line of output.}
      \else \errmessage{Macro name \the\macname\space already defined}\fi
      \global\cslet{macsave.\the\macname}{\the\macname}%
      \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
-     % Add the macroname to \macrolist
-     \toks0 = \expandafter{\macrolist\do}%
-     \xdef\macrolist{\the\toks0
-       \expandafter\noexpand\csname\the\macname\endcsname}%
+     \addtomacrolist{\the\macname}%
   \fi
   \begingroup \macrobodyctxt
   \ifrecursive \expandafter\parsermacbody
@@ -5794,7 +6719,7 @@ where each line of input produces a line of output.}
     % Remove the macro name from \macrolist:
     \begingroup
       \expandafter\let\csname#1\endcsname \relax
-      \let\do\unmacrodo
+      \let\definedummyword\unmacrodo
       \xdef\macrolist{\macrolist}%
     \endgroup
   \else
@@ -5806,10 +6731,10 @@ where each line of input produces a line of output.}
 % macro definitions that have been changed to \relax.
 %
 \def\unmacrodo#1{%
-  \ifx#1\relax
+  \ifx #1\relax
     % remove this
   \else
-    \noexpand\do \noexpand #1%
+    \noexpand\definedummyword \noexpand#1%
   \fi
 }
 
@@ -5922,30 +6847,11 @@ where each line of input produces a line of output.}
 % {.  If so it reads up to the closing }, if not, it reads the whole
 % line.  Whatever was read is then fed to the next control sequence
 % as an argument (by \parsebrace or \parsearg)
-\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
+\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
   \ifx\nchar\bgroup\else
     \expandafter\parsearg
-  \fi \next}
-
-% We want to disable all macros during \shipout so that they are not
-% expanded by \write.
-\def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}%
-  \edef\next{\macrolist}\expandafter\endgroup\next}
-
-% For \indexnofonts, we need to get rid of all macros, leaving only the
-% arguments (if present).  Of course this is not nearly correct, but it
-% is the best we can do for now.  makeinfo does not expand macros in the
-% argument to @deffn, which ends up writing an index entry, and texindex
-% isn't prepared for an index sort entry that starts with \.
-% 
-% Since macro invocations are followed by braces, we can just redefine them
-% to take a single TeX argument.  The case of a macro invocation that
-% goes to end-of-line is not handled.
-% 
-\def\emptyusermacros{\begingroup
-  \def\do##1{\let\noexpand##1=\noexpand\asis}%
-  \edef\next{\macrolist}\expandafter\endgroup\next}
+  \fi \macnamexxx}
 
 
 % @alias.
@@ -5956,6 +6862,7 @@ where each line of input produces a line of output.}
 \def\aliasyyy #1=#2\relax{%
   {%
     \expandafter\let\obeyedspace=\empty
+    \addtomacrolist{#1}%
     \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
   }%
   \next
@@ -5965,7 +6872,6 @@ where each line of input produces a line of output.}
 \message{cross references,}
 
 \newwrite\auxfile
-
 \newif\ifhavexrefs    % True if xref values are known.
 \newif\ifwarnedxrefs  % True if we warned once that they aren't known.
 
@@ -6010,7 +6916,7 @@ where each line of input produces a line of output.}
 
 % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
 % anchor), which consists of three parts:
-% 1) NAME-title - the current sectioning name taken from \thissection,
+% 1) NAME-title - the current sectioning name taken from \lastsection,
 %                 or the anchor name.
 % 2) NAME-snt   - section number and type, passed as the SNT arg, or
 %                 empty for anchors.
@@ -6025,15 +6931,14 @@ where each line of input produces a line of output.}
   \iflinks
     {%
       \atdummies  % preserve commands, but don't expand them
-      \turnoffactive
       \edef\writexrdef##1##2{%
 	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
 	  ##1}{##2}}% these are parameters of \writexrdef
       }%
-      \toks0 = \expandafter{\thissection}%
+      \toks0 = \expandafter{\lastsection}%
       \immediate \writexrdef{title}{\the\toks0 }%
       \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
-      \writexrdef{pg}{\folio}% will be written later, during \shipout
+      \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout
     }%
   \fi
 }
@@ -6077,22 +6982,25 @@ where each line of input produces a line of output.}
   %
   % Make link in pdf output.
   \ifpdf
-    \leavevmode
-    \getfilename{#4}%
-    {\turnoffactive
+    {\indexnofonts
+     \turnoffactive
+     % This expands tokens, so do it after making catcode changes, so _
+     % etc. don't get their TeX definitions.
+     \getfilename{#4}%
+     %
      % See comments at \activebackslashdouble.
      {\activebackslashdouble \xdef\pdfxrefdest{#1}%
       \backslashparens\pdfxrefdest}%
      %
+     \leavevmode
+     \startlink attr{/Border [0 0 0]}%
      \ifnum\filenamelength>0
-       \startlink attr{/Border [0 0 0]}%
-         goto file{\the\filename.pdf} name{\pdfxrefdest}%
+       goto file{\the\filename.pdf} name{\pdfxrefdest}%
      \else
-       \startlink attr{/Border [0 0 0]}%
-         goto name{\pdfmkpgn{\pdfxrefdest}}%
+       goto name{\pdfmkpgn{\pdfxrefdest}}%
      \fi
     }%
-    \linkcolor
+    \setcolor{\linkcolor}%
   \fi
   %
   % Float references are printed completely differently: "Figure 1.2"
@@ -6110,7 +7018,7 @@ where each line of input produces a line of output.}
     % If the user specified the print name (third arg) to the ref,
     % print it instead of our usual "Figure 1.2".
     \ifdim\wd0 = 0pt
-      \refx{#1-snt}%
+      \refx{#1-snt}{}%
     \else
       \printedrefname
     \fi
@@ -6130,7 +7038,7 @@ where each line of input produces a line of output.}
     % is a loss.  Therefore, we give the text of the node name again, so it
     % is as if TeX is seeing it for the first time.
     \ifdim \wd1 > 0pt
-      \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
+      \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
     \else
       % _ (for example) has to be the character _ for the purposes of the
       % control sequence corresponding to the node, but it has to expand
@@ -6226,10 +7134,18 @@ where each line of input produces a line of output.}
 % collisions).  But if this is a float type, we have more work to do.
 %
 \def\xrdef#1#2{%
-  \expandafter\gdef\csname XR#1\endcsname{#2}% remember this xref value.
+  {% The node name might contain 8-bit characters, which in our current
+   % implementation are changed to commands like @'e.  Don't let these
+   % mess up the control sequence name.
+    \indexnofonts
+    \turnoffactive
+    \xdef\safexrefname{#1}%
+  }%
+  %
+  \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref
   %
   % Was that xref control sequence that we just defined for a float?
-  \expandafter\iffloat\csname XR#1\endcsname
+  \expandafter\iffloat\csname XR\safexrefname\endcsname
     % it was a float, and we have the (safe) float type in \iffloattype.
     \expandafter\let\expandafter\floatlist
       \csname floatlist\iffloattype\endcsname
@@ -6244,7 +7160,8 @@ where each line of input produces a line of output.}
     %
     % Remember this xref in the control sequence \floatlistFLOATTYPE,
     % for later use in \listoffloats.
-    \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0{#1}}%
+    \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0
+      {\safexrefname}}%
   \fi
 }
 
@@ -6348,6 +7265,7 @@ where each line of input produces a line of output.}
   \input\jobname.#1
 \endgroup}
 
+
 \message{insertions,}
 % including footnotes.
 
@@ -6430,7 +7348,7 @@ where each line of input produces a line of output.}
 % In case a @footnote appears in a vbox, save the footnote text and create
 % the real \insert just after the vbox finished.  Otherwise, the insertion
 % would be lost.
-% Similarily, if a @footnote appears inside an alignment, save the footnote
+% Similarly, if a @footnote appears inside an alignment, save the footnote
 % text to a box and make the \insert when a row of the table is finished.
 % And the same can be done for other insert classes.  --kasal, 16nov03.
 
@@ -6534,15 +7452,19 @@ where each line of input produces a line of output.}
   % If the image is by itself, center it.
   \ifvmode
     \imagevmodetrue
-    \nobreak\bigskip
+    \nobreak\medskip
     % Usually we'll have text after the image which will insert
     % \parskip glue, so insert it here too to equalize the space
     % above and below.
     \nobreak\vskip\parskip
     \nobreak
-    \line\bgroup\hss
   \fi
   %
+  % Leave vertical mode so that indentation from an enclosing
+  % environment such as @quotation is respected.  On the other hand, if
+  % it's at the top level, we don't want the normal paragraph indentation.
+  \noindent
+  %
   % Output the image.
   \ifpdf
     \dopdfimage{#1}{#2}{#3}%
@@ -6553,7 +7475,7 @@ where each line of input produces a line of output.}
     \epsfbox{#1.eps}%
   \fi
   %
-  \ifimagevmode \hss \egroup \bigbreak \fi  % space after the image
+  \ifimagevmode \medskip \fi  % space after the standalone image
 \endgroup}
 
 
@@ -6620,13 +7542,13 @@ where each line of input produces a line of output.}
       \global\advance\floatno by 1
       %
       {%
-        % This magic value for \thissection is output by \setref as the
+        % This magic value for \lastsection is output by \setref as the
         % XREFLABEL-title value.  \xrefX uses it to distinguish float
         % labels (which have a completely different output format) from
         % node and anchor labels.  And \xrdef uses it to construct the
         % lists of floats.
         %
-        \edef\thissection{\floatmagic=\safefloattype}%
+        \edef\lastsection{\floatmagic=\safefloattype}%
         \setref{\floatlabel}{Yfloat}%
       }%
     \fi
@@ -6693,7 +7615,8 @@ where each line of input produces a line of output.}
       % \floatlabel-lof.  Besides \floatident, we include the short
       % caption if specified, else the full caption if specified, else nothing.
       {%
-        \atdummies \turnoffactive
+        \atdummies
+        %
         % since we read the caption text in the macro world, where ^^M
         % is turned into a normal character, we have to scan it back, so
         % we don't write the literal three characters "^^M" into the aux file.
@@ -6714,8 +7637,9 @@ where each line of input produces a line of output.}
   %
   % place the captured inserts
   %
-  % BEWARE: when the floats start float, we have to issue warning whenever an
-  % insert appears inside a float which could possibly float. --kasal, 26may04
+  % BEWARE: when the floats start floating, we have to issue warning
+  % whenever an insert appears inside a float which could possibly
+  % float. --kasal, 26may04
   %
   \checkinserts
 }
@@ -6759,7 +7683,7 @@ where each line of input produces a line of output.}
 
 % #1 is the control sequence we are passed; we expand into a conditional
 % which is true if #1 represents a float ref.  That is, the magic
-% \thissection value which we \setref above.
+% \lastsection value which we \setref above.
 %
 \def\iffloat#1{\expandafter\doiffloat#1==\finish}
 %
@@ -6820,39 +7744,871 @@ where each line of input produces a line of output.}
   \writeentry
 }}
 
+
 \message{localization,}
-% and i18n.
 
 % @documentlanguage is usually given very early, just after
 % @setfilename.  If done too late, it may not override everything
-% properly.  Single argument is the language abbreviation.
-% It would be nice if we could set up a hyphenation file here.
+% properly.  Single argument is the language (de) or locale (de_DE)
+% abbreviation.  It would be nice if we could set up a hyphenation file.
 %
-\parseargdef\documentlanguage{%
+{
+  \catcode`\_ = \active
+  \globaldefs=1
+\parseargdef\documentlanguage{\begingroup
+  \let_=\normalunderscore  % normal _ character for filenames
   \tex % read txi-??.tex file in plain TeX.
-    % Read the file if it exists.
+    % Read the file by the name they passed if it exists.
     \openin 1 txi-#1.tex
     \ifeof 1
-      \errhelp = \nolanghelp
-      \errmessage{Cannot read language file txi-#1.tex}%
+      \documentlanguagetrywithoutunderscore{#1_\finish}%
     \else
       \input txi-#1.tex
     \fi
     \closein 1
   \endgroup
+\endgroup}
 }
+%
+% If they passed de_DE, and txi-de_DE.tex doesn't exist,
+% try txi-de.tex.
+% 
+\def\documentlanguagetrywithoutunderscore#1_#2\finish{%
+  \openin 1 txi-#1.tex
+  \ifeof 1
+    \errhelp = \nolanghelp
+    \errmessage{Cannot read language file txi-#1.tex}%
+  \else
+    \input txi-#1.tex
+  \fi
+  \closein 1
+}
+%
 \newhelp\nolanghelp{The given language definition file cannot be found or
 is empty.  Maybe you need to install it?  In the current directory
 should work if nowhere else does.}
 
+% Set the catcode of characters 128 through 255 to the specified number.
+%
+\def\setnonasciicharscatcode#1{%
+   \count255=128
+   \loop\ifnum\count255<256
+      \global\catcode\count255=#1\relax
+      \advance\count255 by 1
+   \repeat
+}
 
-% @documentencoding should change something in TeX eventually, most
-% likely, but for now just recognize it.
-\let\documentencoding = \comment
+\def\setnonasciicharscatcodenonglobal#1{%
+   \count255=128
+   \loop\ifnum\count255<256
+      \catcode\count255=#1\relax
+      \advance\count255 by 1
+   \repeat
+}
 
+% @documentencoding sets the definition of non-ASCII characters
+% according to the specified encoding.
+%
+\parseargdef\documentencoding{%
+  % Encoding being declared for the document.
+  \def\declaredencoding{\csname #1.enc\endcsname}%
+  %
+  % Supported encodings: names converted to tokens in order to be able
+  % to compare them with \ifx.
+  \def\ascii{\csname US-ASCII.enc\endcsname}%
+  \def\latnine{\csname ISO-8859-15.enc\endcsname}%
+  \def\latone{\csname ISO-8859-1.enc\endcsname}%
+  \def\lattwo{\csname ISO-8859-2.enc\endcsname}%
+  \def\utfeight{\csname UTF-8.enc\endcsname}%
+  %
+  \ifx \declaredencoding \ascii
+     \asciichardefs
+  %
+  \else \ifx \declaredencoding \lattwo
+     \setnonasciicharscatcode\active
+     \lattwochardefs
+  %
+  \else \ifx \declaredencoding \latone 
+     \setnonasciicharscatcode\active
+     \latonechardefs
+  %
+  \else \ifx \declaredencoding \latnine
+     \setnonasciicharscatcode\active
+     \latninechardefs
+  %
+  \else \ifx \declaredencoding \utfeight
+     \setnonasciicharscatcode\active
+     \utfeightchardefs
+  %
+  \else 
+    \message{Unknown document encoding #1, ignoring.}%
+  %
+  \fi % utfeight
+  \fi % latnine
+  \fi % latone
+  \fi % lattwo
+  \fi % ascii
+}
+
+% A message to be logged when using a character that isn't available
+% the default font encoding (OT1).
+% 
+\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
+
+% Take account of \c (plain) vs. \, (Texinfo) difference.
+\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
+
+% First, make active non-ASCII characters in order for them to be
+% correctly categorized when TeX reads the replacement text of
+% macros containing the character definitions.
+\setnonasciicharscatcode\active
+%
+% Latin1 (ISO-8859-1) character definitions.
+\def\latonechardefs{%
+  \gdef^^a0{~} 
+  \gdef^^a1{\exclamdown}
+  \gdef^^a2{\missingcharmsg{CENT SIGN}} 
+  \gdef^^a3{{\pounds}}
+  \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
+  \gdef^^a5{\missingcharmsg{YEN SIGN}}
+  \gdef^^a6{\missingcharmsg{BROKEN BAR}} 
+  \gdef^^a7{\S}
+  \gdef^^a8{\"{}} 
+  \gdef^^a9{\copyright} 
+  \gdef^^aa{\ordf}
+  \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} 
+  \gdef^^ac{$\lnot$}
+  \gdef^^ad{\-} 
+  \gdef^^ae{\registeredsymbol} 
+  \gdef^^af{\={}}
+  %
+  \gdef^^b0{\textdegree}
+  \gdef^^b1{$\pm$}
+  \gdef^^b2{$^2$}
+  \gdef^^b3{$^3$}
+  \gdef^^b4{\'{}}
+  \gdef^^b5{$\mu$}
+  \gdef^^b6{\P}
+  %
+  \gdef^^b7{$^.$}
+  \gdef^^b8{\cedilla\ }
+  \gdef^^b9{$^1$}
+  \gdef^^ba{\ordm}
+  %
+  \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}}
+  \gdef^^bc{$1\over4$}
+  \gdef^^bd{$1\over2$}
+  \gdef^^be{$3\over4$}
+  \gdef^^bf{\questiondown}
+  %
+  \gdef^^c0{\`A}
+  \gdef^^c1{\'A}
+  \gdef^^c2{\^A}
+  \gdef^^c3{\~A}
+  \gdef^^c4{\"A}
+  \gdef^^c5{\ringaccent A} 
+  \gdef^^c6{\AE}
+  \gdef^^c7{\cedilla C}
+  \gdef^^c8{\`E}
+  \gdef^^c9{\'E}
+  \gdef^^ca{\^E}
+  \gdef^^cb{\"E}
+  \gdef^^cc{\`I}
+  \gdef^^cd{\'I}
+  \gdef^^ce{\^I}
+  \gdef^^cf{\"I}
+  %
+  \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}}
+  \gdef^^d1{\~N}
+  \gdef^^d2{\`O}
+  \gdef^^d3{\'O}
+  \gdef^^d4{\^O}
+  \gdef^^d5{\~O}
+  \gdef^^d6{\"O}
+  \gdef^^d7{$\times$}
+  \gdef^^d8{\O}
+  \gdef^^d9{\`U}
+  \gdef^^da{\'U}
+  \gdef^^db{\^U}
+  \gdef^^dc{\"U}
+  \gdef^^dd{\'Y}
+  \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}}
+  \gdef^^df{\ss}
+  %
+  \gdef^^e0{\`a}
+  \gdef^^e1{\'a}
+  \gdef^^e2{\^a}
+  \gdef^^e3{\~a}
+  \gdef^^e4{\"a}
+  \gdef^^e5{\ringaccent a}
+  \gdef^^e6{\ae}
+  \gdef^^e7{\cedilla c}
+  \gdef^^e8{\`e}
+  \gdef^^e9{\'e}
+  \gdef^^ea{\^e}
+  \gdef^^eb{\"e}
+  \gdef^^ec{\`{\dotless i}}
+  \gdef^^ed{\'{\dotless i}}
+  \gdef^^ee{\^{\dotless i}}
+  \gdef^^ef{\"{\dotless i}}
+  %
+  \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}}
+  \gdef^^f1{\~n}
+  \gdef^^f2{\`o}
+  \gdef^^f3{\'o}
+  \gdef^^f4{\^o}
+  \gdef^^f5{\~o}
+  \gdef^^f6{\"o}
+  \gdef^^f7{$\div$}
+  \gdef^^f8{\o}
+  \gdef^^f9{\`u}
+  \gdef^^fa{\'u}
+  \gdef^^fb{\^u}
+  \gdef^^fc{\"u}
+  \gdef^^fd{\'y}
+  \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}}
+  \gdef^^ff{\"y}
+}
+
+% Latin9 (ISO-8859-15) encoding character definitions.
+\def\latninechardefs{%
+  % Encoding is almost identical to Latin1.
+  \latonechardefs
+  %
+  \gdef^^a4{\euro}
+  \gdef^^a6{\v S}
+  \gdef^^a8{\v s}
+  \gdef^^b4{\v Z}
+  \gdef^^b8{\v z}
+  \gdef^^bc{\OE}
+  \gdef^^bd{\oe}
+  \gdef^^be{\"Y}
+}
+
+% Latin2 (ISO-8859-2) character definitions.
+\def\lattwochardefs{%
+  \gdef^^a0{~}
+  \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}}
+  \gdef^^a2{\u{}}
+  \gdef^^a3{\L}
+  \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
+  \gdef^^a5{\v L}
+  \gdef^^a6{\'S}
+  \gdef^^a7{\S}
+  \gdef^^a8{\"{}}
+  \gdef^^a9{\v S}
+  \gdef^^aa{\cedilla S}
+  \gdef^^ab{\v T}
+  \gdef^^ac{\'Z}
+  \gdef^^ad{\-}
+  \gdef^^ae{\v Z}
+  \gdef^^af{\dotaccent Z}
+  %
+  \gdef^^b0{\textdegree}
+  \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}}
+  \gdef^^b2{\missingcharmsg{OGONEK}}
+  \gdef^^b3{\l}
+  \gdef^^b4{\'{}}
+  \gdef^^b5{\v l}
+  \gdef^^b6{\'s}
+  \gdef^^b7{\v{}}
+  \gdef^^b8{\cedilla\ }
+  \gdef^^b9{\v s}
+  \gdef^^ba{\cedilla s}
+  \gdef^^bb{\v t}
+  \gdef^^bc{\'z}
+  \gdef^^bd{\H{}}
+  \gdef^^be{\v z}
+  \gdef^^bf{\dotaccent z}
+  %
+  \gdef^^c0{\'R}
+  \gdef^^c1{\'A}
+  \gdef^^c2{\^A}
+  \gdef^^c3{\u A}
+  \gdef^^c4{\"A}
+  \gdef^^c5{\'L}
+  \gdef^^c6{\'C}
+  \gdef^^c7{\cedilla C}
+  \gdef^^c8{\v C}
+  \gdef^^c9{\'E}
+  \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}}
+  \gdef^^cb{\"E}
+  \gdef^^cc{\v E}
+  \gdef^^cd{\'I}
+  \gdef^^ce{\^I}
+  \gdef^^cf{\v D}
+  %
+  \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}}
+  \gdef^^d1{\'N}
+  \gdef^^d2{\v N}
+  \gdef^^d3{\'O}
+  \gdef^^d4{\^O}
+  \gdef^^d5{\H O}
+  \gdef^^d6{\"O}
+  \gdef^^d7{$\times$}
+  \gdef^^d8{\v R}
+  \gdef^^d9{\ringaccent U} 
+  \gdef^^da{\'U}
+  \gdef^^db{\H U}
+  \gdef^^dc{\"U}
+  \gdef^^dd{\'Y}
+  \gdef^^de{\cedilla T}
+  \gdef^^df{\ss}
+  %
+  \gdef^^e0{\'r}
+  \gdef^^e1{\'a}
+  \gdef^^e2{\^a}
+  \gdef^^e3{\u a}
+  \gdef^^e4{\"a}
+  \gdef^^e5{\'l}
+  \gdef^^e6{\'c}
+  \gdef^^e7{\cedilla c}
+  \gdef^^e8{\v c}
+  \gdef^^e9{\'e}
+  \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}}
+  \gdef^^eb{\"e}
+  \gdef^^ec{\v e}
+  \gdef^^ed{\'\i}
+  \gdef^^ee{\^\i}
+  \gdef^^ef{\v d}
+  %
+  \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}}
+  \gdef^^f1{\'n}
+  \gdef^^f2{\v n}
+  \gdef^^f3{\'o}
+  \gdef^^f4{\^o}
+  \gdef^^f5{\H o}
+  \gdef^^f6{\"o}
+  \gdef^^f7{$\div$}
+  \gdef^^f8{\v r}
+  \gdef^^f9{\ringaccent u}
+  \gdef^^fa{\'u}
+  \gdef^^fb{\H u}
+  \gdef^^fc{\"u}
+  \gdef^^fd{\'y}
+  \gdef^^fe{\cedilla t}
+  \gdef^^ff{\dotaccent{}}
+}
+
+% UTF-8 character definitions.
+% 
+% This code to support UTF-8 is based on LaTeX's utf8.def, with some
+% changes for Texinfo conventions.  It is included here under the GPL by
+% permission from Frank Mittelbach and the LaTeX team.
+% 
+\newcount\countUTFx
+\newcount\countUTFy
+\newcount\countUTFz
 
-% Page size parameters.
+\gdef\UTFviiiTwoOctets#1#2{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\endcsname}
+%
+\gdef\UTFviiiThreeOctets#1#2#3{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname}
 %
+\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname}
+
+\gdef\UTFviiiDefined#1{%
+  \ifx #1\relax
+    \message{\linenumber Unicode char \string #1 not defined for Texinfo}%
+  \else
+    \expandafter #1%
+  \fi
+}
+
+\begingroup
+  \catcode`\~13
+  \catcode`\"12
+
+  \def\UTFviiiLoop{%
+    \global\catcode\countUTFx\active
+    \uccode`\~\countUTFx
+    \uppercase\expandafter{\UTFviiiTmp}%
+    \advance\countUTFx by 1
+    \ifnum\countUTFx < \countUTFy
+      \expandafter\UTFviiiLoop
+    \fi}
+
+  \countUTFx = "C2
+  \countUTFy = "E0
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
+  \UTFviiiLoop
+
+  \countUTFx = "E0
+  \countUTFy = "F0
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
+  \UTFviiiLoop
+
+  \countUTFx = "F0
+  \countUTFy = "F4
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiFourOctets\string~}}
+  \UTFviiiLoop
+\endgroup
+
+\begingroup
+  \catcode`\"=12
+  \catcode`\<=12
+  \catcode`\.=12
+  \catcode`\,=12
+  \catcode`\;=12
+  \catcode`\!=12
+  \catcode`\~=13
+
+  \gdef\DeclareUnicodeCharacter#1#2{%
+    \countUTFz = "#1\relax
+    \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
+    \begingroup
+      \parseXMLCharref
+      \def\UTFviiiTwoOctets##1##2{%
+        \csname u8:##1\string ##2\endcsname}%
+      \def\UTFviiiThreeOctets##1##2##3{%
+        \csname u8:##1\string ##2\string ##3\endcsname}%
+      \def\UTFviiiFourOctets##1##2##3##4{%
+        \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
+      \expandafter\expandafter\expandafter\expandafter
+       \expandafter\expandafter\expandafter
+       \gdef\UTFviiiTmp{#2}%
+    \endgroup}
+
+  \gdef\parseXMLCharref{%
+    \ifnum\countUTFz < "A0\relax
+      \errhelp = \EMsimple
+      \errmessage{Cannot define Unicode char value < 00A0}%
+    \else\ifnum\countUTFz < "800\relax
+      \parseUTFviiiA,%
+      \parseUTFviiiB C\UTFviiiTwoOctets.,%
+    \else\ifnum\countUTFz < "10000\relax
+      \parseUTFviiiA;%
+      \parseUTFviiiA,%
+      \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
+    \else
+      \parseUTFviiiA;%
+      \parseUTFviiiA,%
+      \parseUTFviiiA!%
+      \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
+    \fi\fi\fi
+  }
+
+  \gdef\parseUTFviiiA#1{%
+    \countUTFx = \countUTFz
+    \divide\countUTFz by 64
+    \countUTFy = \countUTFz
+    \multiply\countUTFz by 64
+    \advance\countUTFx by -\countUTFz
+    \advance\countUTFx by 128
+    \uccode `#1\countUTFx
+    \countUTFz = \countUTFy}
+
+  \gdef\parseUTFviiiB#1#2#3#4{%
+    \advance\countUTFz by "#10\relax
+    \uccode `#3\countUTFz
+    \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
+\endgroup
+
+\def\utfeightchardefs{%
+  \DeclareUnicodeCharacter{00A0}{\tie}
+  \DeclareUnicodeCharacter{00A1}{\exclamdown}
+  \DeclareUnicodeCharacter{00A3}{\pounds}
+  \DeclareUnicodeCharacter{00A8}{\"{ }}
+  \DeclareUnicodeCharacter{00A9}{\copyright}
+  \DeclareUnicodeCharacter{00AA}{\ordf}
+  \DeclareUnicodeCharacter{00AB}{\guillemetleft}
+  \DeclareUnicodeCharacter{00AD}{\-}
+  \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
+  \DeclareUnicodeCharacter{00AF}{\={ }}
+
+  \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
+  \DeclareUnicodeCharacter{00B4}{\'{ }}
+  \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
+  \DeclareUnicodeCharacter{00BA}{\ordm}
+  \DeclareUnicodeCharacter{00BB}{\guillemetright}
+  \DeclareUnicodeCharacter{00BF}{\questiondown}
+
+  \DeclareUnicodeCharacter{00C0}{\`A}
+  \DeclareUnicodeCharacter{00C1}{\'A}
+  \DeclareUnicodeCharacter{00C2}{\^A}
+  \DeclareUnicodeCharacter{00C3}{\~A}
+  \DeclareUnicodeCharacter{00C4}{\"A}
+  \DeclareUnicodeCharacter{00C5}{\AA}
+  \DeclareUnicodeCharacter{00C6}{\AE}
+  \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
+  \DeclareUnicodeCharacter{00C8}{\`E}
+  \DeclareUnicodeCharacter{00C9}{\'E}
+  \DeclareUnicodeCharacter{00CA}{\^E}
+  \DeclareUnicodeCharacter{00CB}{\"E}
+  \DeclareUnicodeCharacter{00CC}{\`I}
+  \DeclareUnicodeCharacter{00CD}{\'I}
+  \DeclareUnicodeCharacter{00CE}{\^I}
+  \DeclareUnicodeCharacter{00CF}{\"I}
+
+  \DeclareUnicodeCharacter{00D1}{\~N}
+  \DeclareUnicodeCharacter{00D2}{\`O}
+  \DeclareUnicodeCharacter{00D3}{\'O}
+  \DeclareUnicodeCharacter{00D4}{\^O}
+  \DeclareUnicodeCharacter{00D5}{\~O}
+  \DeclareUnicodeCharacter{00D6}{\"O}
+  \DeclareUnicodeCharacter{00D8}{\O}
+  \DeclareUnicodeCharacter{00D9}{\`U}
+  \DeclareUnicodeCharacter{00DA}{\'U}
+  \DeclareUnicodeCharacter{00DB}{\^U}
+  \DeclareUnicodeCharacter{00DC}{\"U}
+  \DeclareUnicodeCharacter{00DD}{\'Y}
+  \DeclareUnicodeCharacter{00DF}{\ss}
+
+  \DeclareUnicodeCharacter{00E0}{\`a}
+  \DeclareUnicodeCharacter{00E1}{\'a}
+  \DeclareUnicodeCharacter{00E2}{\^a}
+  \DeclareUnicodeCharacter{00E3}{\~a}
+  \DeclareUnicodeCharacter{00E4}{\"a}
+  \DeclareUnicodeCharacter{00E5}{\aa}
+  \DeclareUnicodeCharacter{00E6}{\ae}
+  \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
+  \DeclareUnicodeCharacter{00E8}{\`e}
+  \DeclareUnicodeCharacter{00E9}{\'e}
+  \DeclareUnicodeCharacter{00EA}{\^e}
+  \DeclareUnicodeCharacter{00EB}{\"e}
+  \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
+  \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
+  \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
+  \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
+
+  \DeclareUnicodeCharacter{00F1}{\~n}
+  \DeclareUnicodeCharacter{00F2}{\`o}
+  \DeclareUnicodeCharacter{00F3}{\'o}
+  \DeclareUnicodeCharacter{00F4}{\^o}
+  \DeclareUnicodeCharacter{00F5}{\~o}
+  \DeclareUnicodeCharacter{00F6}{\"o}
+  \DeclareUnicodeCharacter{00F8}{\o}
+  \DeclareUnicodeCharacter{00F9}{\`u}
+  \DeclareUnicodeCharacter{00FA}{\'u}
+  \DeclareUnicodeCharacter{00FB}{\^u}
+  \DeclareUnicodeCharacter{00FC}{\"u}
+  \DeclareUnicodeCharacter{00FD}{\'y}
+  \DeclareUnicodeCharacter{00FF}{\"y}
+
+  \DeclareUnicodeCharacter{0100}{\=A}
+  \DeclareUnicodeCharacter{0101}{\=a}
+  \DeclareUnicodeCharacter{0102}{\u{A}}
+  \DeclareUnicodeCharacter{0103}{\u{a}}
+  \DeclareUnicodeCharacter{0106}{\'C}
+  \DeclareUnicodeCharacter{0107}{\'c}
+  \DeclareUnicodeCharacter{0108}{\^C}
+  \DeclareUnicodeCharacter{0109}{\^c}
+  \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
+  \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
+  \DeclareUnicodeCharacter{010C}{\v{C}}
+  \DeclareUnicodeCharacter{010D}{\v{c}}
+  \DeclareUnicodeCharacter{010E}{\v{D}}
+
+  \DeclareUnicodeCharacter{0112}{\=E}
+  \DeclareUnicodeCharacter{0113}{\=e}
+  \DeclareUnicodeCharacter{0114}{\u{E}}
+  \DeclareUnicodeCharacter{0115}{\u{e}}
+  \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
+  \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
+  \DeclareUnicodeCharacter{011A}{\v{E}}
+  \DeclareUnicodeCharacter{011B}{\v{e}}
+  \DeclareUnicodeCharacter{011C}{\^G}
+  \DeclareUnicodeCharacter{011D}{\^g}
+  \DeclareUnicodeCharacter{011E}{\u{G}}
+  \DeclareUnicodeCharacter{011F}{\u{g}}
+
+  \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
+  \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
+  \DeclareUnicodeCharacter{0124}{\^H}
+  \DeclareUnicodeCharacter{0125}{\^h}
+  \DeclareUnicodeCharacter{0128}{\~I}
+  \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
+  \DeclareUnicodeCharacter{012A}{\=I}
+  \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
+  \DeclareUnicodeCharacter{012C}{\u{I}}
+  \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
+
+  \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
+  \DeclareUnicodeCharacter{0131}{\dotless{i}}
+  \DeclareUnicodeCharacter{0132}{IJ}
+  \DeclareUnicodeCharacter{0133}{ij}
+  \DeclareUnicodeCharacter{0134}{\^J}
+  \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
+  \DeclareUnicodeCharacter{0139}{\'L}
+  \DeclareUnicodeCharacter{013A}{\'l}
+
+  \DeclareUnicodeCharacter{0141}{\L}
+  \DeclareUnicodeCharacter{0142}{\l}
+  \DeclareUnicodeCharacter{0143}{\'N}
+  \DeclareUnicodeCharacter{0144}{\'n}
+  \DeclareUnicodeCharacter{0147}{\v{N}}
+  \DeclareUnicodeCharacter{0148}{\v{n}}
+  \DeclareUnicodeCharacter{014C}{\=O}
+  \DeclareUnicodeCharacter{014D}{\=o}
+  \DeclareUnicodeCharacter{014E}{\u{O}}
+  \DeclareUnicodeCharacter{014F}{\u{o}}
+
+  \DeclareUnicodeCharacter{0150}{\H{O}}
+  \DeclareUnicodeCharacter{0151}{\H{o}}
+  \DeclareUnicodeCharacter{0152}{\OE}
+  \DeclareUnicodeCharacter{0153}{\oe}
+  \DeclareUnicodeCharacter{0154}{\'R}
+  \DeclareUnicodeCharacter{0155}{\'r}
+  \DeclareUnicodeCharacter{0158}{\v{R}}
+  \DeclareUnicodeCharacter{0159}{\v{r}}
+  \DeclareUnicodeCharacter{015A}{\'S}
+  \DeclareUnicodeCharacter{015B}{\'s}
+  \DeclareUnicodeCharacter{015C}{\^S}
+  \DeclareUnicodeCharacter{015D}{\^s}
+  \DeclareUnicodeCharacter{015E}{\cedilla{S}}
+  \DeclareUnicodeCharacter{015F}{\cedilla{s}}
+
+  \DeclareUnicodeCharacter{0160}{\v{S}}
+  \DeclareUnicodeCharacter{0161}{\v{s}}
+  \DeclareUnicodeCharacter{0162}{\cedilla{t}}
+  \DeclareUnicodeCharacter{0163}{\cedilla{T}}
+  \DeclareUnicodeCharacter{0164}{\v{T}}
+
+  \DeclareUnicodeCharacter{0168}{\~U}
+  \DeclareUnicodeCharacter{0169}{\~u}
+  \DeclareUnicodeCharacter{016A}{\=U}
+  \DeclareUnicodeCharacter{016B}{\=u}
+  \DeclareUnicodeCharacter{016C}{\u{U}}
+  \DeclareUnicodeCharacter{016D}{\u{u}}
+  \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
+  \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
+
+  \DeclareUnicodeCharacter{0170}{\H{U}}
+  \DeclareUnicodeCharacter{0171}{\H{u}}
+  \DeclareUnicodeCharacter{0174}{\^W}
+  \DeclareUnicodeCharacter{0175}{\^w}
+  \DeclareUnicodeCharacter{0176}{\^Y}
+  \DeclareUnicodeCharacter{0177}{\^y}
+  \DeclareUnicodeCharacter{0178}{\"Y}
+  \DeclareUnicodeCharacter{0179}{\'Z}
+  \DeclareUnicodeCharacter{017A}{\'z}
+  \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
+  \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
+  \DeclareUnicodeCharacter{017D}{\v{Z}}
+  \DeclareUnicodeCharacter{017E}{\v{z}}
+
+  \DeclareUnicodeCharacter{01C4}{D\v{Z}}
+  \DeclareUnicodeCharacter{01C5}{D\v{z}}
+  \DeclareUnicodeCharacter{01C6}{d\v{z}}
+  \DeclareUnicodeCharacter{01C7}{LJ}
+  \DeclareUnicodeCharacter{01C8}{Lj}
+  \DeclareUnicodeCharacter{01C9}{lj}
+  \DeclareUnicodeCharacter{01CA}{NJ}
+  \DeclareUnicodeCharacter{01CB}{Nj}
+  \DeclareUnicodeCharacter{01CC}{nj}
+  \DeclareUnicodeCharacter{01CD}{\v{A}}
+  \DeclareUnicodeCharacter{01CE}{\v{a}}
+  \DeclareUnicodeCharacter{01CF}{\v{I}}
+
+  \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
+  \DeclareUnicodeCharacter{01D1}{\v{O}}
+  \DeclareUnicodeCharacter{01D2}{\v{o}}
+  \DeclareUnicodeCharacter{01D3}{\v{U}}
+  \DeclareUnicodeCharacter{01D4}{\v{u}}
+
+  \DeclareUnicodeCharacter{01E2}{\={\AE}}
+  \DeclareUnicodeCharacter{01E3}{\={\ae}}
+  \DeclareUnicodeCharacter{01E6}{\v{G}}
+  \DeclareUnicodeCharacter{01E7}{\v{g}}
+  \DeclareUnicodeCharacter{01E8}{\v{K}}
+  \DeclareUnicodeCharacter{01E9}{\v{k}}
+
+  \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
+  \DeclareUnicodeCharacter{01F1}{DZ}
+  \DeclareUnicodeCharacter{01F2}{Dz}
+  \DeclareUnicodeCharacter{01F3}{dz}
+  \DeclareUnicodeCharacter{01F4}{\'G}
+  \DeclareUnicodeCharacter{01F5}{\'g}
+  \DeclareUnicodeCharacter{01F8}{\`N}
+  \DeclareUnicodeCharacter{01F9}{\`n}
+  \DeclareUnicodeCharacter{01FC}{\'{\AE}}
+  \DeclareUnicodeCharacter{01FD}{\'{\ae}}
+  \DeclareUnicodeCharacter{01FE}{\'{\O}}
+  \DeclareUnicodeCharacter{01FF}{\'{\o}}
+
+  \DeclareUnicodeCharacter{021E}{\v{H}}
+  \DeclareUnicodeCharacter{021F}{\v{h}}
+
+  \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
+  \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
+  \DeclareUnicodeCharacter{0228}{\cedilla{E}}
+  \DeclareUnicodeCharacter{0229}{\cedilla{e}}
+  \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
+  \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
+
+  \DeclareUnicodeCharacter{0232}{\=Y}
+  \DeclareUnicodeCharacter{0233}{\=y}
+  \DeclareUnicodeCharacter{0237}{\dotless{j}}
+
+  \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
+  \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
+  \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
+  \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
+  \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
+  \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
+  \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
+  \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
+  \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
+  \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
+  \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
+  \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
+
+  \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
+  \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
+
+  \DeclareUnicodeCharacter{1E20}{\=G}
+  \DeclareUnicodeCharacter{1E21}{\=g}
+  \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
+  \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
+  \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
+  \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
+  \DeclareUnicodeCharacter{1E26}{\"H}
+  \DeclareUnicodeCharacter{1E27}{\"h}
+
+  \DeclareUnicodeCharacter{1E30}{\'K}
+  \DeclareUnicodeCharacter{1E31}{\'k}
+  \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
+  \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
+  \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
+  \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
+  \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
+  \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
+  \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
+  \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
+  \DeclareUnicodeCharacter{1E3E}{\'M}
+  \DeclareUnicodeCharacter{1E3F}{\'m}
+
+  \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
+  \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
+  \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
+  \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
+  \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
+  \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
+  \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
+  \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
+  \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
+  \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
+
+  \DeclareUnicodeCharacter{1E54}{\'P}
+  \DeclareUnicodeCharacter{1E55}{\'p}
+  \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
+  \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
+  \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
+  \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
+  \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
+  \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
+  \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
+  \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
+
+  \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
+  \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
+  \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
+  \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
+  \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
+  \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
+  \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
+  \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
+  \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
+  \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
+
+  \DeclareUnicodeCharacter{1E7C}{\~V}
+  \DeclareUnicodeCharacter{1E7D}{\~v}
+  \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
+  \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
+
+  \DeclareUnicodeCharacter{1E80}{\`W}
+  \DeclareUnicodeCharacter{1E81}{\`w}
+  \DeclareUnicodeCharacter{1E82}{\'W}
+  \DeclareUnicodeCharacter{1E83}{\'w}
+  \DeclareUnicodeCharacter{1E84}{\"W}
+  \DeclareUnicodeCharacter{1E85}{\"w}
+  \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
+  \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
+  \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
+  \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
+  \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
+  \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
+  \DeclareUnicodeCharacter{1E8C}{\"X}
+  \DeclareUnicodeCharacter{1E8D}{\"x}
+  \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
+  \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
+
+  \DeclareUnicodeCharacter{1E90}{\^Z}
+  \DeclareUnicodeCharacter{1E91}{\^z}
+  \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
+  \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
+  \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
+  \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
+  \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
+  \DeclareUnicodeCharacter{1E97}{\"t}
+  \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
+  \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
+
+  \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
+  \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
+
+  \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
+  \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
+  \DeclareUnicodeCharacter{1EBC}{\~E}
+  \DeclareUnicodeCharacter{1EBD}{\~e}
+
+  \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
+  \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
+  \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
+  \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
+
+  \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
+  \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
+
+  \DeclareUnicodeCharacter{1EF2}{\`Y}
+  \DeclareUnicodeCharacter{1EF3}{\`y}
+  \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
+
+  \DeclareUnicodeCharacter{1EF8}{\~Y}
+  \DeclareUnicodeCharacter{1EF9}{\~y}
+
+  \DeclareUnicodeCharacter{2013}{--}
+  \DeclareUnicodeCharacter{2014}{---}
+  \DeclareUnicodeCharacter{2018}{\quoteleft}
+  \DeclareUnicodeCharacter{2019}{\quoteright}
+  \DeclareUnicodeCharacter{201A}{\quotesinglbase}
+  \DeclareUnicodeCharacter{201C}{\quotedblleft}
+  \DeclareUnicodeCharacter{201D}{\quotedblright}
+  \DeclareUnicodeCharacter{201E}{\quotedblbase}
+  \DeclareUnicodeCharacter{2022}{\bullet}
+  \DeclareUnicodeCharacter{2026}{\dots}
+  \DeclareUnicodeCharacter{2039}{\guilsinglleft}
+  \DeclareUnicodeCharacter{203A}{\guilsinglright}
+  \DeclareUnicodeCharacter{20AC}{\euro}
+
+  \DeclareUnicodeCharacter{2192}{\expansion}
+  \DeclareUnicodeCharacter{21D2}{\result}
+
+  \DeclareUnicodeCharacter{2212}{\minus}
+  \DeclareUnicodeCharacter{2217}{\point}
+  \DeclareUnicodeCharacter{2261}{\equiv}
+}% end of \utfeightchardefs
+
+
+% US-ASCII character definitions.
+\def\asciichardefs{% nothing need be done
+   \relax
+}
+
+% Make non-ASCII characters printable again for compatibility with
+% existing Texinfo documents that may use them, even without declaring a
+% document encoding.
+%
+\setnonasciicharscatcode \other
+
+
+\message{formatting,}
+
 \newdimen\defaultparindent \defaultparindent = 15pt
 
 \chapheadingskip = 15pt plus 4pt minus 2pt
@@ -6865,7 +8621,7 @@ should work if nowhere else does.}
 % Don't be so finicky about underfull hboxes, either.
 \hbadness = 2000
 
-% Following George Bush, just get rid of widows and orphans.
+% Following George Bush, get rid of widows and orphans.
 \widowpenalty=10000
 \clubpenalty=10000
 
@@ -6883,9 +8639,9 @@ should work if nowhere else does.}
   \fi
 }
 
-% Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
-% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
-% physical page width.
+% Parameters in order: 1) textheight; 2) textwidth;
+% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
+% 7) physical page height; 8) physical page width.
 %
 % We also call \setleading{\textleading}, so the caller should define
 % \textleading.  The caller should also set \parskip.
@@ -6912,6 +8668,10 @@ should work if nowhere else does.}
   \ifpdf
     \pdfpageheight #7\relax
     \pdfpagewidth #8\relax
+    % if we don't reset these, they will remain at "1 true in" of
+    % whatever layout pdftex was dumped with.
+    \pdfhorigin = 1 true in
+    \pdfvorigin = 1 true in
   \fi
   %
   \setleading{\textleading}
@@ -6926,19 +8686,19 @@ should work if nowhere else does.}
   \textleading = 13.2pt
   %
   % If page is nothing but text, make it come out even.
-  \internalpagesizes{46\baselineskip}{6in}%
+  \internalpagesizes{607.2pt}{6in}% that's 46 lines
                     {\voffset}{.25in}%
                     {\bindingoffset}{36pt}%
                     {11in}{8.5in}%
 }}
 
-% Use @smallbook to reset parameters for 7x9.5 (or so) format.
+% Use @smallbook to reset parameters for 7x9.25 trim size.
 \def\smallbook{{\globaldefs = 1
   \parskip = 2pt plus 1pt
   \textleading = 12pt
   %
   \internalpagesizes{7.5in}{5in}%
-                    {\voffset}{.25in}%
+                    {-.2in}{0in}%
                     {\bindingoffset}{16pt}%
                     {9.25in}{7in}%
   %
@@ -6949,6 +8709,24 @@ should work if nowhere else does.}
   \defbodyindent = .5cm
 }}
 
+% Use @smallerbook to reset parameters for 6x9 trim size.
+% (Just testing, parameters still in flux.)
+\def\smallerbook{{\globaldefs = 1
+  \parskip = 1.5pt plus 1pt
+  \textleading = 12pt
+  %
+  \internalpagesizes{7.4in}{4.8in}%
+                    {-.2in}{-.4in}%
+                    {0pt}{14pt}%
+                    {9in}{6in}%
+  %
+  \lispnarrowing = 0.25in
+  \tolerance = 700
+  \hfuzz = 1pt
+  \contentsrightmargin = 0pt
+  \defbodyindent = .4cm
+}}
+
 % Use @afourpaper to print on European A4 paper.
 \def\afourpaper{{\globaldefs = 1
   \parskip = 3pt plus 2pt minus 1pt
@@ -6964,7 +8742,7 @@ should work if nowhere else does.}
   % \global\normaloffset = -6mm
   % \global\bindingoffset = 10mm
   % @end tex
-  \internalpagesizes{51\baselineskip}{160mm}
+  \internalpagesizes{673.2pt}{160mm}% that's 51 lines
                     {\voffset}{\hoffset}%
                     {\bindingoffset}{44pt}%
                     {297mm}{210mm}%
@@ -7029,7 +8807,7 @@ should work if nowhere else does.}
   \parskip = 3pt plus 2pt minus 1pt
   \setleading{\textleading}%
   %
-  \dimen0 = #1
+  \dimen0 = #1\relax
   \advance\dimen0 by \voffset
   %
   \dimen2 = \hsize
@@ -7124,6 +8902,13 @@ should work if nowhere else does.}
 % \otherifyactive is called near the end of this file.
 \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
 
+% Used sometimes to turn off (effectively) the active characters even after
+% parsing them.
+\def\turnoffactive{%
+  \normalturnoffactive
+  \otherbackslash
+}
+
 \catcode`\@=0
 
 % \backslashcurfont outputs one backslash character in current font,
@@ -7131,28 +8916,29 @@ should work if nowhere else does.}
 \global\chardef\backslashcurfont=`\\
 \global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
 
-% \rawbackslash defines an active \ to do \backslashcurfont.
-% \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other.
-{\catcode`\\=\active
- @gdef@rawbackslash{@let\=@backslashcurfont}
- @gdef@otherbackslash{@let\=@realbackslash}
-}
-
 % \realbackslash is an actual character `\' with catcode other, and
 % \doublebackslash is two of them (for the pdf outlines).
 {\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
 
-% \normalbackslash outputs one backslash in fixed width font.
-\def\normalbackslash{{\tt\backslashcurfont}}
-
+% In texinfo, backslash is an active character; it prints the backslash
+% in fixed width font.
 \catcode`\\=\active
+@def@normalbackslash{{@tt@backslashcurfont}}
+% On startup, @fixbackslash assigns:
+%  @let \ = @normalbackslash
+
+% \rawbackslash defines an active \ to do \backslashcurfont.
+% \otherbackslash defines an active \ to be a literal `\' character with
+% catcode other.
+@gdef@rawbackslash{@let\=@backslashcurfont}
+@gdef@otherbackslash{@let\=@realbackslash}
 
-% Used sometimes to turn off (effectively) the active characters
-% even after parsing them.
-@def@turnoffactive{%
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'.
+% 
+@def@normalturnoffactive{%
+  @let\=@normalbackslash
   @let"=@normaldoublequote
-  @let\=@realbackslash
   @let~=@normaltilde
   @let^=@normalcaret
   @let_=@normalunderscore
@@ -7164,12 +8950,6 @@ should work if nowhere else does.}
   @unsepspaces
 }
 
-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.  (Thus, \ is not expandable when this is in
-% effect.)
-%
-@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash}
-
 % Make _ and + \other characters, temporarily.
 % This is canceled by @fixbackslash.
 @otherifyactive
@@ -7182,7 +8962,7 @@ should work if nowhere else does.}
 @global@let\ = @eatinput
 
 % On the other hand, perhaps the file did not have a `\input texinfo'. Then
-% the first `\{ in the file would cause an error. This macro tries to fix
+% the first `\' in the file would cause an error. This macro tries to fix
 % that, assuming it is called before the first `\' could plausibly occur.
 % Also turn back on active characters that might appear in the input
 % file name, in case not using a pre-dumped format.
diff --git a/Build/source/utils/texinfo/doc/texinfo.txi b/Build/source/utils/texinfo/doc/texinfo.txi
index 15ef1dd0cab..e3478242da6 100644
--- a/Build/source/utils/texinfo/doc/texinfo.txi
+++ b/Build/source/utils/texinfo/doc/texinfo.txi
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
-@c $Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp $
+@c $Id: texinfo.txi,v 1.220 2008/04/09 17:07:31 karl Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -37,20 +37,22 @@ This manual is for GNU Texinfo (version @value{VERSION}, @value{UPDATED}),
 a documentation system that can produce both online information and a
 printed manual from a single source.
 
-Copyright (C) 1988, 1990, 1991, 1992, 1993, 1995, 1996, 1997, 1998,
-1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright @copyright{} 1988, 1990, 1991, 1992, 1993, 1995, 1996, 1997,
+1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
-and with the Back-Cover Texts as in (a) below.  A copy of the license is
-included in the section entitled ``GNU Free Documentation License.''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation
+License.''
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+(a) The FSF's Back-Cover Text is: ``You are free to copy and modify
+this GNU Manual.  Buying copies from GNU Press supports the FSF in
+developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
@@ -60,6 +62,7 @@ Software Foundation raise funds for GNU development.''
 * install-info: (texinfo)Invoking install-info. Update info/dir entries.
 * texi2dvi: (texinfo)Format with texi2dvi.      Print Texinfo documents.
 * texi2pdf: (texinfo)PDF Output.                PDF output for Texinfo.
+* pdftexi2dvi: (texinfo)PDF Output.             PDF output for Texinfo.
 * texindex: (texinfo)Format with tex/texindex.  Sort Texinfo index files.
 * makeinfo: (texinfo)Invoking makeinfo.         Translate Texinfo source.
 @end direntry
@@ -101,8 +104,8 @@ Software Foundation raise funds for GNU development.''
 
 @sp 1
 Published by the Free Software Foundation @*
-59 Temple Place Suite 330 @*
-Boston, MA 02111-1307 @*
+51 Franklin St, Fifth Floor @*
+Boston, MA 02110-1301 @*
 USA @*
 ISBN 1-882114-67-1 @c for version 4.0, September 1999.
 @c ISBN 1-882114-65-5 is for version 3.12, March 1998.
@@ -122,7 +125,9 @@ Cover art by Etienne Suvasa.
 @node Top
 @top Texinfo
 
-@insertcopying
+This manual is for GNU Texinfo (version @value{VERSION}, @value{UPDATED}),
+a documentation system that can produce both online information and a
+printed manual from a single source.
 
 The first part of this master menu lists the major nodes in this Info
 document, including the @@-command and concept indices.  The rest of
@@ -163,9 +168,9 @@ the menu lists all the lower level nodes in the document.
 * Include Files::                 How to incorporate other Texinfo files.
 * Headings::                      How to write page headings and footings.
 * Catching Mistakes::             How to find formatting mistakes.
-* Copying This Manual::           The GNU Free Documentation License.
+* GNU Free Documentation License::Copying this manual.
 * Command and Variable Index::    A menu containing commands and variables.
-* Concept Index::                 A menu covering many topics.
+* General Index::                 A menu covering many topics.
 
 @detailmenu
  --- The Detailed Node Listing ---
@@ -434,16 +439,21 @@ Combining Indices
 Special Insertions
 
 * Atsign Braces Comma::         Inserting @@ and @{@} and ,.
+* Inserting Quote Characters::  Inserting left and right quotes, in code.
 * Inserting Space::             How to insert the right amount of space
                                  within a sentence.
 * Inserting Accents::           How to insert accents and special characters.
+* Inserting Quotation Marks::   How to insert quotation marks.
 * Dots Bullets::                How to insert dots and bullets.
 * TeX and copyright::           How to insert the @TeX{} logo
                                  and the copyright symbol.
 * euro::                        How to insert the Euro currency symbol.
 * pounds::                      How to insert the pounds currency symbol.
+* textdegree::                  How to insert the degrees symbol.
 * minus::                       How to insert a minus sign.
+* geq leq::                     How to insert greater/less-than-or-equal signs.
 * math::                        How to format a mathematical expression.
+* Click Sequences::             Inserting GUI usage sequences.
 * Glyphs::                      How to indicate results of evaluation,
                                  expansion of macros, errors, etc.
 
@@ -458,6 +468,7 @@ Inserting Space
 * Not Ending a Sentence::       Sometimes a . doesn't end a sentence.
 * Ending a Sentence::           Sometimes it does.
 * Multiple Spaces::             Inserting multiple spaces.
+* frenchspacing::               Specifying end-of-sentence spacing.
 * dmn::                         How to format a dimension.
 
 Inserting Ellipsis and Bullets
@@ -495,6 +506,7 @@ Forcing and Preventing Breaks
 * Break Commands::              Summary of break-related commands.
 * Line Breaks::                 Forcing line breaks.
 * - and hyphenation::           Helping @TeX{} with hyphenation points.
+* allowcodebreaks::             Controlling line breaks within @@code text.
 * w::                           Preventing unwanted line breaks in text.
 * tie::                         Inserting an unbreakable but varying space.
 * sp::                          Inserting blank lines.
@@ -628,9 +640,7 @@ Sample Texinfo Files
 * Verbatim Copying License::
 * All-permissive Copying License::
 
-Copying This Manual
-
-* GNU Free Documentation License::  License for copying this manual.
+GNU Free Documentation License
 
 Include Files
 
@@ -666,10 +676,6 @@ Finding Badly Referenced Nodes
 * Tagifying::                   How to tagify a file.
 * Splitting::                   How to split a file manually.
 
-Copying This Manual
-
-* GNU Free Documentation License::  License for copying this manual.
-
 @end detailmenu
 @end menu
 
@@ -789,13 +795,7 @@ better to include too much than to leave out something important.
 Patches are most welcome; if possible, please make them with
 @samp{@w{diff -c}} (@pxref{Top,, Overview, diff, Comparing and Merging
 Files}) and include @file{ChangeLog} entries (@pxref{Change Log,,,
-emacs, The GNU Emacs Manual}).
-
-When sending patches, if possible please do not encode or split them in
-any way; it's much easier to deal with one plain text message, however
-large, than many small ones.  @uref{ftp://ftp.gnu.org/gnu/sharutils/,
-GNU shar} is a convenient way of packaging multiple and/or binary files
-for email.
+emacs, The GNU Emacs Manual}), and follow the existing coding style.
 
 
 @node Using Texinfo
@@ -819,7 +819,7 @@ computer terminals; the HTML output works with virtually all web
 browsers.  Thus Texinfo can be used by almost any computer user.
 
 @cindex Source file format
-A Texinfo source file is a plain @sc{ascii} file containing text
+A Texinfo source file is a plain ASCII file containing text
 interspersed with @dfn{@@-commands} (words preceded by an @samp{@@})
 that tell the typesetting and formatting programs what to do.  You can
 edit a Texinfo file with any text editor, but it is especially
@@ -899,14 +899,15 @@ For more information on @TeX{} in general, please see the book
 @cindex Beebe, Nelson
 @pindex pdftex
 (Generated via @command{texi2dvi --pdf} or @command{texi2pdf}.)  This
-was developed by Adobe Systems for portable document interchange,
-based on their previous PostScript language.  It can represent the exact
-appearance of a document, including fonts, and supporting arbitrary
-scaling.  It is intended to be platform-independent and easily
-viewable, among other design goals; for a discussion, see
-@uref{http://tug.org/TUGboat/Articles/tb22-3/tb72beebeI.pdf}.  Texinfo
-uses the @command{pdftex} program, a variant of @TeX{}, to output PDF;
-see @uref{http://tug.org/applications/pdftex}.  @xref{PDF Output}.
+format was developed by Adobe Systems for portable document
+interchange, based on their previous PostScript language.  It can
+represent the exact appearance of a document, including fonts and
+graphics, and supporting arbitrary scaling.  It is intended to be
+platform-independent and easily viewable, among other design goals;
+@uref{http://tug.org/TUGboat/Articles/tb22-3/tb72beebe-pdf.pdf} has
+some background.  Texinfo uses the @command{pdftex} program, a variant
+of @TeX{}, to output PDF; see
+@uref{http://tug.org/applications/pdftex}.  @xref{PDF Output}.
 
 @item XML
 @cindex XML output
@@ -914,7 +915,7 @@ see @uref{http://tug.org/applications/pdftex}.  @xref{PDF Output}.
 @pindex texinfo.dtd
 (Generated via @command{makeinfo --xml}.)  XML is a generic syntax
 specification usable for any sort of content (see, for example,
-@uref{http://www.w3.org/XML/}).  The @command{makeinfo} xml output,
+@uref{http://www.w3.org/XML/}).  The @command{makeinfo} XML output,
 unlike all the formats above, interprets very little of the Texinfo
 source.  Rather, it merely translates the Texinfo markup commands into
 XML syntax, for processing by further XML tools.  The particular
@@ -1058,7 +1059,7 @@ info:emacs#Dissociated%20Press
 info://localhost/usr/info/emacs#Dissociated%20Press
 @end example
 
-The @command{info} program itself does not follow URI's of any kind.
+The @command{info} program itself does not follow URIs of any kind.
 
 
 @node Printed Books
@@ -1098,7 +1099,7 @@ file @file{texinfo.tex} that contains information (definitions or
 to @TeX{} commands, which @TeX{} can then process to create the typeset
 document.)  @file{texinfo.tex} contains the specifications for printing
 a document.  You can get the latest version of @file{texinfo.tex} from
-@uref{ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex}.
+the Texinfo home page, @uref{http://www.gnu.org/software/texinfo/}.
 
 In the United States, documents are most often printed on 8.5 inch by 11
 inch pages (216@dmn{mm} by 280@dmn{mm}); this is the default size.  But
@@ -1180,7 +1181,7 @@ the rest of the line.  (@code{@@chapter} creates chapter titles.)@refill
 
 @item
 Write a command such as @code{@@dots@{@}} wherever you wish but usually
-within a sentence. (@code{@@dots@{@}} creates dots @dots{})@refill
+within a sentence. (@code{@@dots@{@}} creates an ellipsis @dots{})@refill
 
 @item
 Write a command such as @code{@@code@{@var{sample-code}@}} wherever you
@@ -1225,7 +1226,7 @@ This section describes the general conventions used in all Texinfo documents.
 @itemize @bullet
 @item
 @cindex Source files, characters used
-All printable @sc{ascii} characters except @samp{@@}, @samp{@{} and
+All printable ASCII characters except @samp{@@}, @samp{@{} and
 @samp{@}} can appear in a Texinfo file and stand for themselves.
 @samp{@@} is the escape character which introduces commands, while
 @samp{@{} and @samp{@}} are used to surround arguments to certain
@@ -1245,30 +1246,9 @@ in other cases as well; you can use the @code{@@noindent} to inhibit
 paragraph indentation if required (@pxref{noindent,,@code{@@noindent}}).
 
 @item
-@cindex Quotation characters (`'), in source
-Use doubled single-quote characters to begin and end quotations:
-@w{@t{`@w{}`@dots{}'@w{}'}}.  @TeX{} converts two single quotes to
-left- and right-hand doubled quotation marks,
-@c this comes out as "like this" in Info, which is just confusing.
-@iftex
-``like this'',
-@end iftex
-and Info converts doubled single-quote characters to @sc{ascii}
-double-quotes: @w{@t{`@w{}`@dots{}'@w{}'}} becomes @w{@t{"@dots{}"}}.
-
-You may occasionally need to produce two consecutive single quotes;
-for example, in documenting a computer language such as Maxima where
-@t{'@w{}'} is a valid command.  You can do this with the input
-@t{'@@w@{@}'}; the empty @code{@@w} command stops the combination into
-the double-quote characters.
-
-@cindex Unicode quotation characters
-@cindex Grave accent, vs.@: left quote
-The left quote character (@t{`}, ASCII code 96) used in Texinfo is a
-grave accent in ANSI and ISO character set standards.  We use it as a
-quote character because that is how @TeX{} is set up, by default.  We
-hope to eventually support the various quotation characters in
-Unicode.
+Texinfo supports the usual quotation marks used in English, and
+quotation marks used in other languages, please see @ref{Inserting
+Quotation Marks}.
 
 @item
 @cindex Multiple dashes in source
@@ -1288,25 +1268,24 @@ contexts, such as @code{@@code} and @code{@@example}.
 
 @item
 @cindex Tabs; don't use!
-@strong{Caution:} Last and most important, do not use tab characters
-in a Texinfo file (except in verbatim modes)!  @TeX{} uses
-variable-width fonts, which means that it is impractical at best to
-define a tab to work in all circumstances.  Consequently, @TeX{}
-treats tabs like single spaces, and that is not what they look like in
-the source.  Furthermore, @code{makeinfo} does nothing special with
-tabs, and thus a tab character in your input file will usually appear
-differently in the output.
-
-@noindent
-To avoid this problem, Texinfo mode causes GNU Emacs to insert multiple
-spaces when you press the @key{TAB} key.
+@strong{Caution:} Last, do not use tab characters in a Texinfo file
+(except in verbatim modes)!  @TeX{} uses variable-width fonts, which
+means that it is impractical at best to define a tab to work in all
+circumstances.  Consequently, @TeX{} treats tabs like single spaces,
+and that is not what they look like in the source.  Furthermore,
+@code{makeinfo} does nothing special with tabs, and thus a tab
+character in your input file will usually appear differently in the
+output.
 
 @noindent
-Also, you can run @code{untabify} in Emacs to convert tabs in a region
-to multiple spaces, or use the @code{unexpand} command from the shell.
+To avoid this problem, Texinfo mode in GNU Emacs inserts
+multiple spaces when you press the @key{TAB} key.  Also, you can run
+@code{untabify} in Emacs to convert tabs in a region to multiple
+spaces, or use the @code{unexpand} command from the shell.
 
 @end itemize
 
+
 @node Comments
 @section Comments
 
@@ -1355,7 +1334,7 @@ error messages if you have invalid Texinfo commands within ignored text.
 @cindex Required in Texinfo file
 @cindex Texinfo file minimum
 
-By convention, the namea of a Texinfo file ends with (in order of
+By convention, the name of a Texinfo file ends with (in order of
 preference) one of the extensions @file{.texinfo}, @file{.texi},
 @file{.txi}, or @file{.tex}.  The longer extensions are preferred since
 they describe more clearly to a human reader the nature of the file.
@@ -1472,9 +1451,8 @@ The @dfn{Body} of the document is typically structured like a
 traditional book or encyclopedia, but it may be free form.
 
 @item 6. End
-The @dfn{End} segment contains commands for printing indices and
-generating the table of contents, and the @code{@@bye} command on a line
-of its own.
+The @dfn{End} segment may contain commands for printing indices, and
+closes with the @code{@@bye} command on a line of its own.
 @end table
 
 
@@ -1526,7 +1504,7 @@ which it is distributed.  @xref{GNU Sample Texts}.
 @@copying
 This is a short example of a complete Texinfo file, version 1.0.
 
-Copyright @@copyright@{@} 2004 Free Software Foundation, Inc.
+Copyright @@copyright@{@} 2005 Free Software Foundation, Inc.
 @@end copying
 @end group
 @end example
@@ -1563,18 +1541,18 @@ writing it out again; it is output on the back of the title page.  The
 @noindent
 The `Top' node contains the master menu for the Info file.  Since the
 printed manual uses a table of contents rather than a menu, it
-excludes the `Top' node.  We also include the copying text again for
-the benefit of online readers.  Since the copying text begins with
-a brief description of the manual, no other text is needed in this
-case.  The @samp{@@top} command itself helps @command{makeinfo}
-determine the relationships between nodes.
+excludes the `Top' node.  We repeat the short description from the
+beginning of the @samp{@@copying} text, but there's no need to repeat
+the copyright information, so we don't use @samp{@@insertcopying} here.
+The @samp{@@top} command itself helps @command{makeinfo} determine the
+relationships between nodes.
 
 @example
 @@ifnottex
 @@node Top
 @@top Short Sample
 
-@@insertcopying
+This is a short sample Texinfo file.
 @@end ifnottex
 
 @group
@@ -1670,13 +1648,13 @@ This is the second item.
 @cindex Chassell, Robert J.
 @cindex Fox, Brian
 @cindex Berry, Karl
-Richard M.@: Stallman invented the Texinfo format, wrote the initial
-processors, and created Edition 1.0 of this manual.  @w{Robert J.@:}
-Chassell greatly revised and extended the manual, starting with Edition
-1.1.  Brian Fox was responsible for the standalone Texinfo distribution
-until version 3.8, and wrote the standalone @command{makeinfo} and
-@command{info} programs.  Karl Berry has continued maintenance since
-Texinfo 3.8 (manual edition 2.22).
+Richard M. Stallman invented the Texinfo format, wrote the initial
+processors, and created Edition 1.0 of this manual.  Robert@tie{}J.
+Chassell greatly revised and extended the manual, starting with
+Edition 1.1.  Brian Fox was responsible for the standalone Texinfo
+distribution until version 3.8, and wrote the standalone
+@command{makeinfo} and @command{info} programs.  Karl Berry has
+continued maintenance since Texinfo 3.8 (manual edition 2.22).
 
 @cindex Pinard, Fran@,{c}ois
 @cindex Zuhn, David D.
@@ -1686,7 +1664,7 @@ Texinfo 3.8 (manual edition 2.22).
 @cindex Weinberg, Zack
 Our thanks go out to all who helped improve this work, particularly the
 indefatigable Eli Zaretskii and Andreas Schwab, who have provided
-patches beyond counting.  Fran@,{c}ois Pinard and @w{David D.@: Zuhn},
+patches beyond counting.  Fran@,{c}ois Pinard and David@tie{}D. Zuhn,
 tirelessly recorded and reported mistakes and obscurities.  Zack
 Weinberg did the impossible by implementing the macro syntax in
 @file{texinfo.tex}.  Special thanks go to Melissa Weisshaus for her
@@ -1701,7 +1679,7 @@ the @file{ChangeLog} file.  Our mistakes are our own.
 A bit of history: in the 1970's at CMU, Brian Reid developed a program
 and format named Scribe to mark up documents for printing.  It used the
 @code{@@} character to introduce commands, as Texinfo does.  Much more
-consequentially, it strived to describe document contents rather than
+consequentially, it strove to describe document contents rather than
 formatting, an idea wholeheartedly adopted by Texinfo.
 
 @cindex Bolio
@@ -1727,7 +1705,7 @@ as printed hard copy.
 @cindex Emacs
 
 You may edit a Texinfo file with any text editor you choose.  A Texinfo
-file is no different from any other @sc{ascii} file.  However, GNU Emacs
+file is no different from any other ASCII file.  However, GNU Emacs
 comes with a special mode, called Texinfo mode, that provides Emacs
 commands and tools to help ease your work.
 
@@ -1805,7 +1783,7 @@ equivalents, such as appendices.  With this value for the page
 delimiter, you can jump from chapter title to chapter title with the
 @kbd{C-x ]} (@code{forward-page}) and @kbd{C-x [}
 (@code{backward-page}) commands and narrow to a chapter with the
-@kbd{C-x p} (@code{narrow-to-page}) command.  (@xref{Pages, , ,emacs,
+@kbd{C-x n p} (@code{narrow-to-page}) command.  (@xref{Pages, , ,emacs,
 The GNU Emacs Manual}, for details about the page commands.)@refill
 
 You may name a Texinfo file however you wish, but the convention is to
@@ -1918,12 +1896,12 @@ cursor at the beginning of the next line.@refill
 @findex texinfo-insert-braces
 Insert @code{@{@}} and put the cursor between the braces.@refill
 
-@item C-c C-c @}
-@itemx C-c C-c ]
+@item C-c @}
+@itemx C-c  ]
 @itemx M-x up-list
 @findex up-list
 Move from between a pair of braces forward past the closing brace.
-Typing @kbd{C-c C-c ]} is easier than typing @kbd{C-c C-c @}}, which
+Typing @kbd{C-c ]} is easier than typing @kbd{C-c @}}, which
 is, however, more mnemonic; hence the two keybindings.  (Also, you can
 move out from between braces by typing @kbd{C-f}.)@refill
 @end table
@@ -2027,7 +2005,7 @@ Texinfo mode sets the value of the page delimiter variable to match
 the chapter-level @@-commands.  This enables you to use the @kbd{C-x
 ]} (@code{forward-page}) and @kbd{C-x [} (@code{backward-page})
 commands to move forward and backward by chapter, and to use the
-@kbd{C-x p} (@code{narrow-to-page}) command to narrow to a chapter.
+@kbd{C-x n p} (@code{narrow-to-page}) command to narrow to a chapter.
 @xref{Pages, , , emacs, The GNU Emacs Manual}, for more information
 about the page commands.@refill
 
@@ -2211,7 +2189,7 @@ This updates all the nodes and menus.@refill
 
 The @code{texinfo-column-for-description} variable specifies the
 column to which menu descriptions are indented.  By default, the value
-is 32 although it is often useful to reduce it to as low as 24.  You
+is 32 although it can be useful to reduce it to as low as 24.  You
 can set the variable via customization (@pxref{Changing an Option,,,
 emacs, The GNU Emacs Manual}) or with the @kbd{M-x set-variable}
 command (@pxref{Examining, , Examining and Setting Variables, emacs,
@@ -2511,9 +2489,9 @@ C-c C-c i       @r{Insert} @samp{@@item}.
 C-c C-c n       @r{Insert} @samp{@@node}.
 C-c C-c s       @r{Insert} @samp{@@samp}.
 C-c C-c v       @r{Insert} @samp{@@var}.
-C-c C-c @{       @r{Insert braces.}
-C-c C-c ]
-C-c C-c @}       @r{Move out of enclosing braces.}
+C-c @{       @r{Insert braces.}
+C-c ]
+C-c @}       @r{Move out of enclosing braces.}
 
 @group
 C-c C-c C-d     @r{Insert a node's section title}
@@ -2760,7 +2738,7 @@ Published by @dots{}
 @@node Top
 @@top @var{title}
 
-@@insertcopying
+This manual is for @var{program}, version @var{version}.
 @@end ifnottex
 
 @group
@@ -3094,10 +3072,11 @@ The copyright owner (or owners) is whoever holds legal copyright on the
 work.  In the case of works assigned to the FSF, the owner is `Free
 Software Foundation, Inc.'.
 
-The copyright `line' may actually be split across multiple
-lines, both in the source document and in the output.  This often
-happens for documents with a long history, having many different years
-of publication.
+The copyright `line' may actually be split across multiple lines, both
+in the source document and in the output.  This often happens for
+documents with a long history, having many different years of
+publication.  If you do use several lines, do not indent any of them
+(or anything else in the @code{@@copying} block) in the source file.
 
 @xref{Copyright Notices,,,maintain,GNU Maintenance Instructions}, for
 additional information.
@@ -3121,24 +3100,17 @@ This inserts the text previously defined by @code{@@copying}.  To meet
 legal requirements, it must be used on the copyright page in the printed
 manual (@pxref{Copyright}).
 
-We also strongly recommend using @code{@@insertcopying} in the Top node
-of your manual (@pxref{The Top Node}), although it is not required
-legally.  Here's why:
-
 The @code{@@copying} command itself causes the permissions text to
 appear in an Info file @emph{before} the first node.  The text is also
 copied into the beginning of each split Info output file, as is legally
 necessary.  This location implies a human reading the manual using Info
 does @emph{not} see this text (except when using the advanced Info
-command @kbd{g *}).  Therefore, an explicit @code{@@insertcopying}
-in the Top node makes it apparent to readers that the manual is free.
+command @kbd{g *}), but this does not matter for legal purposes,
+because the text is present.
 
 Similarly, the @code{@@copying} text is automatically included at the
 beginning of each HTML output file, as an HTML comment.  Again, this
-text is not visible (unless the reader views the HTML source).  And
-therefore again, the @code{@@insertcopying} in the Top node is valuable
-because it makes the copying permissions visible and thus promotes
-freedom.
+text is not visible (unless the reader views the HTML source).
 
 The permissions text defined by @code{@@copying} also appears
 automatically at the beginning of the XML output file.
@@ -3422,7 +3394,7 @@ commands.
 @findex filll @r{@TeX{} dimension}
 Use the @code{@@page} command to cause a page break.  To push the
 copyright notice and the other text on the copyright page towards the
-bottom of the page, use the following incantantion after @code{@@page}:
+bottom of the page, use the following incantation after @code{@@page}:
 
 @example
 @@vskip 0pt plus 1filll
@@ -3515,25 +3487,21 @@ The @code{@@headings} command is rarely used.  It specifies what kind of
 page headings and footings to print on each page.  Usually, this is
 controlled by the @code{@@setchapternewpage} command.  You need the
 @code{@@headings} command only if the @code{@@setchapternewpage} command
-does not do what you want, or if you want to turn off pre-defined page
+does not do what you want, or if you want to turn off predefined page
 headings prior to defining your own.  Write an @code{@@headings} command
-immediately after the @code{@@end titlepage} command.@refill
+immediately after the @code{@@end titlepage} command.
 
-You can use @code{@@headings} as follows:@refill
+You can use @code{@@headings} as follows:
 
 @table @code
 @item @@headings off
-Turn off printing of page headings.@refill
+Turn off printing of page headings.
 
 @item @@headings single
 Turn on page headings appropriate for single-sided printing.
-@refill
 
 @item @@headings double
-@itemx @@headings on
-Turn on page headings appropriate for double-sided printing.  The two
-commands, @code{@@headings on} and @code{@@headings double}, are
-synonymous.@refill
+Turn on page headings appropriate for double-sided printing.  
 
 @item @@headings singleafter
 @itemx @@headings doubleafter
@@ -3554,7 +3522,7 @@ double} after the @code{@@end titlepage} command.
 
 You can stop @TeX{} from generating any page headings at all by
 writing @code{@@headings off} on a line of its own immediately after the
-line containing the @code{@@end titlepage} command, like this:@refill
+line containing the @code{@@end titlepage} command, like this:
 
 @example
 @@end titlepage
@@ -3563,11 +3531,10 @@ line containing the @code{@@end titlepage} command, like this:@refill
 
 @noindent
 The @code{@@headings off} command overrides the @code{@@end titlepage}
-command, which would otherwise cause @TeX{} to print page
-headings.@refill
+command, which would otherwise cause @TeX{} to print page headings.
 
 You can also specify your own style of page heading and footing.
-@xref{Headings, , Page Headings}, for more information.@refill
+@xref{Headings, , Page Headings}, for more information.
 
 
 @node Contents
@@ -3619,7 +3586,7 @@ included in plain text output (generated by @code{makeinfo
 output.
 
 When @code{makeinfo} writes a short table of contents while producing
-html output, the links in the short table of contents point to
+HTML output, the links in the short table of contents point to
 corresponding entries in the full table of contents rather than the text
 of the document. The links in the full table of contents point to the
 main text of the document.
@@ -3658,25 +3625,24 @@ texi2dvi --texinfo=@@setcontentsaftertitlepage foo.texi
 @cindex Top node
 @cindex Node, `Top'
 
-The `Top' node is the node in which a reader enters an Info manual.  As
-such, it should begin with the @code{@@insertcopying} command
-(@pxref{Document Permissions}) to provide a brief description of the
-manual (including the version number) and copying permissions, and end
-with a master menu for the whole manual.  Of course you should include
-any other general information you feel a reader would find helpful.
+The `Top' node is the node in which a reader enters an Info manual.
+As such, it should begin with a brief description of the manual
+(including the version number), and end with a master menu for the
+whole manual.  Of course you should include any other general
+information you feel a reader would find helpful.
 
 @findex top
-It is also conventional to write an @code{@@top} sectioning command line
-containing the title of the document immediately after the @code{@@node
-Top} line (@pxref{makeinfo top command, , The @code{@@top} Sectioning
-Command}).
+It is conventional and desirable to write an @code{@@top} sectioning
+command line containing the title of the document immediately after
+the @code{@@node Top} line (@pxref{makeinfo top command, , The
+@code{@@top} Sectioning Command}).
 
 The contents of the `Top' node should appear only in the online output;
 none of it should appear in printed output, so enclose it between
 @code{@@ifnottex} and @code{@@end ifnottex} commands.  (@TeX{} does not
 print either an @code{@@node} line or a menu; they appear only in Info;
 strictly speaking, you are not required to enclose these parts between
-@code{@@ifnottex} and @code{@@end ifnottext}, but it is simplest to do
+@code{@@ifnottex} and @code{@@end ifnottex}, but it is simplest to do
 so.  @xref{Conditionals, , Conditionally Visible Text}.)
 
 @menu
@@ -3699,6 +3665,7 @@ Here is an example of a Top node.
 @@top Sample Title
 
 @@insertcopying
+@@end ifnottex
 @end group
 
 Additional general information.
@@ -3737,6 +3704,8 @@ for the chapters, chapter-like sections, and the appendices.
 The second part contains nodes for the indices.
 
 @item
+@findex detailmenu
+@cindex Detailed menu
 The third and subsequent parts contain a listing of the other, lower
 level nodes, often ordered by chapter.  This way, rather than go
 through an intermediary menu, an inquirer can go directly to a
@@ -3764,7 +3733,7 @@ For example, the master menu for this manual looks like the following
 @end group
 @group
 * Command and Variable Index::
-* Concept Index::
+* General Index::
 @end group
 
 @group
@@ -4422,17 +4391,11 @@ This kind of stylistic choice is not usually offered by Texinfo.
 Use the @code{@@unnumbered} command to create a chapter that appears
 in a printed manual without chapter numbers of any kind.  Use the
 @code{@@appendix} command to create an appendix in a printed manual
-that is labelled by letter instead of by number.@refill
-
-For Info file output, the @code{@@unnumbered} and @code{@@appendix}
-commands are equivalent to @code{@@chapter}: the title is printed on a
-line by itself with a line of asterisks underneath.  (@xref{chapter, ,
-@code{@@chapter}}.)@refill
+that is labelled by letter (`A', `B', @dots{}) instead of by number.
 
-To create an appendix or an unnumbered chapter, write an
-@code{@@appendix} or @code{@@unnumbered} command at the beginning of a
-line and follow it on the same line by the title, as you would if you
-were creating a chapter.@refill
+Write an @code{@@appendix} or @code{@@unnumbered} command at the
+beginning of a line and follow it on the same line by the title, as
+you would if you were creating a chapter.
 
 
 @node majorheading & chapheading
@@ -4459,17 +4422,19 @@ of asterisks underneath.  (@xref{chapter, , @code{@@chapter}}.)@refill
 
 
 @node section
-@comment  node-name,  next,  previous,  up
 @section @code{@@section}
 @findex section
 
-In a printed manual, an @code{@@section} command identifies a
-numbered section within a chapter.  The section title appears in the
-table of contents.  In Info, an @code{@@section} command provides a
-title for a segment of text, underlined with @samp{=}.@refill
+A @code{@@section} command identifies a section within a chapter unit,
+whether created with @code{@@chapter}, @code{@@unnumbered}, or
+@code{@@appendix}, following the numbering scheme of the chapter-level
+command.  Thus, within a @code{@@chapter} chapter numbered `1', the
+section is numbered like `1.2'; within an @code{@@appendix}
+``chapter'' labeled `A', the section is numbered like `A.2'; within an
+@code{@@unnumbered} chapter, the section gets no number.
 
-This section is headed with an @code{@@section} command and looks like
-this in the Texinfo file:@refill
+For example, this section is headed with an @code{@@section} command
+and looks like this in the Texinfo file:
 
 @example
 @@section @@code@{@@@@section@}
@@ -4477,7 +4442,7 @@ this in the Texinfo file:@refill
 
 To create a section, write the @code{@@section} command at the
 beginning of a line and follow it on the same line by the section
-title.@refill
+title.  The output is underlined with @samp{=} in Info.
 
 Thus,
 
@@ -4486,21 +4451,17 @@ Thus,
 @end example
 
 @noindent
-produces
+might produce the following in Info:
 
 @example
 @group
-This is a section
-=================
+5.7 This is a section
+=====================
 @end group
 @end example
 
-@noindent
-in Info.
-
 
 @node unnumberedsec appendixsec heading
-@comment  node-name,  next,  previous,  up
 @section @code{@@unnumberedsec}, @code{@@appendixsec}, @code{@@heading}
 @findex unnumberedsec
 @findex appendixsec
@@ -4508,8 +4469,8 @@ in Info.
 
 The @code{@@unnumberedsec}, @code{@@appendixsec}, and @code{@@heading}
 commands are, respectively, the unnumbered, appendix-like, and
-heading-like equivalents of the @code{@@section} command.
-(@xref{section, , @code{@@section}}.)@refill
+heading-like equivalents of the @code{@@section} command, as described
+in the previous section.
 
 @table @code
 @item @@unnumberedsec
@@ -4531,15 +4492,19 @@ You may use the @code{@@heading} command anywhere you wish for a
 section-style heading that will not appear in the table of contents.@refill
 @end table
 
+@code{@@unnumberedsec} and @code{@@appendixsec} do not need to be used
+in ordinary circumstances, because @code{@@section} may also be used
+within @code{@@unnumbered} and @code{@@appendix} chapters; again, see
+the previous section.
+
 
 @node subsection
-@comment  node-name,  next,  previous,  up
 @section The @code{@@subsection} Command
 @findex subsection
 
 Subsections are to sections as sections are to chapters.
 (@xref{section, , @code{@@section}}.)  In Info, subsection titles are
-underlined with @samp{-}.  For example,@refill
+underlined with @samp{-}.  For example,
 
 @example
 @@subsection This is a subsection
@@ -4550,16 +4515,16 @@ produces
 
 @example
 @group
-This is a subsection
---------------------
+1.2.3 This is a subsection
+--------------------------
 @end group
 @end example
 
 In a printed manual, subsections are listed in the table of contents
 and are numbered three levels deep.@refill
 
+
 @node unnumberedsubsec appendixsubsec subheading
-@comment  node-name,  next,  previous,  up
 @section The @code{@@subsection}-like Commands
 @cindex Subsection-like commands
 @findex unnumberedsubsec
@@ -4569,7 +4534,7 @@ and are numbered three levels deep.@refill
 The @code{@@unnumberedsubsec}, @code{@@appendixsubsec}, and
 @code{@@subheading} commands are, respectively, the unnumbered,
 appendix-like, and heading-like equivalents of the @code{@@subsection}
-command.  (@xref{subsection, , @code{@@subsection}}.)@refill
+command.  (@xref{subsection, , @code{@@subsection}}.)
 
 In Info, the @code{@@subsection}-like commands generate a title
 underlined with hyphens.  In a printed manual, an @code{@@subheading}
@@ -4579,7 +4544,13 @@ an @code{@@unnumberedsubsec} command produces an unnumbered heading like
 that of a subsection and an @code{@@appendixsubsec} command produces a
 subsection-like heading labelled with a letter and numbers; both of
 these commands produce headings that appear in the table of
-contents.@refill
+contents.
+
+@code{@@unnumberedsubsec} and @code{@@appendixsubsec} do not need to
+be used in ordinary circumstances, because @code{@@subsection} may
+also be used within sections of @code{@@unnumbered} and
+@code{@@appendix} chapters (@pxref{section,,@code{section}}).
+
 
 @node subsubsection
 @section The `subsub' Commands
@@ -4618,6 +4589,13 @@ Info, subsubheadings look exactly like ordinary subsubsection
 headings.@refill
 @end table
 
+@code{@@unnumberedsubsubsec} and @code{@@appendixsubsubsec} do not
+need to be used in ordinary circumstances, because
+@code{@@subsubsection} may also be used within subsections of
+@code{@@unnumbered} and @code{@@appendix} chapters
+(@pxref{section,,@code{section}}).
+
+
 In Info,  `subsub' titles are underlined with periods.
 For example,@refill
 
@@ -4630,8 +4608,8 @@ produces
 
 @example
 @group
-This is a subsubsection
-.......................
+1.2.3.4 This is a subsubsection
+...............................
 @end group
 @end example
 
@@ -4879,31 +4857,35 @@ contain any number of nodes.  Indeed, a chapter usually contains
 several nodes, one for each section, subsection, and
 subsubsection.
 
-To create a node, write an @code{@@node} command at the beginning of a
-line, and follow it with up to four arguments, separated by commas, on
-the rest of the same line.  The first argument is required; it is the
-name of this node.  The subsequent arguments are the names of the
-`Next', `Previous', and `Up' pointers, in that order, and may be omitted
-if your Texinfo document is hierarchically organized (@pxref{makeinfo
+To specify a node, write an @code{@@node} command at the beginning of
+a line, and follow it with up to four arguments, separated by commas,
+on the rest of the same line.  The first argument is required; it is
+the name of this node (for details of node names, @pxref{Node Line
+Requirements}).  The subsequent arguments are the names of the `Next',
+`Previous', and `Up' pointers, in that order, and may be omitted if
+your Texinfo document is hierarchically organized (@pxref{makeinfo
 Pointer Creation}).
 
-You may insert spaces before each name if you wish; the spaces are
-ignored.  You must write the name of the node and (if present) the names
-of the `Next', `Previous', and `Up' pointers all on the same line.
-Otherwise, the formatters fail.  (@inforef{Top, info, info}, for more
-information about nodes in Info.)
+@opindex accesskey@r{, in HTML output}
+Whether the node pointers are specified implicitly or explicitly, the
+HTML output from @command{makeinfo} for each node includes links to
+the `Next', `Previous', and `Up' nodes.  The HTML also uses the
+@code{accesskey} attribute with the values @samp{n}, @samp{p}, and
+@samp{u} respectively.  This allows people using web browsers to
+follow the nagivation using (typically) @kbd{M-@var{letter}}, e.g.,
+@kbd{M-n} for the `Next' node, from anywhere within the node.
+
+You may insert spaces before each name on the @code{@@node} line if
+you wish; the spaces are ignored.  You must write the name of the node
+and (if present) the names of the `Next', `Previous', and `Up'
+pointers all on the same line.  Otherwise, the formatters fail.
+(@inforef{Top, info, info}, for more information about nodes in Info.)
 
 Usually, you write one of the chapter-structuring command lines
 immediately after an @code{@@node} line---for example, an
 @code{@@section} or @code{@@subsection} line.  (@xref{Structuring
 Command Types}.)
 
-@quotation Note
-The GNU Emacs Texinfo mode updating commands work
-only with Texinfo files in which @code{@@node} lines are followed by chapter
-structuring lines.  @xref{Updating Requirements}.
-@end quotation
-
 @TeX{} uses @code{@@node} lines to identify the names to use for cross
 references.  For this reason, you must write @code{@@node} lines in a
 Texinfo file that you intend to format for printing, even if you do not
@@ -4925,15 +4907,16 @@ see @ref{Cross References}.)
 @subsection Choosing Node and Pointer Names
 
 @cindex Node names, choosing
-The name of a node identifies the node.  The pointers enable
-you to reach other nodes and consist simply of the names of those nodes.
+The name of a node identifies the node (for details of node names,
+@pxref{Node Line Requirements}).  The pointers enable you to reach
+other nodes and consist simply of the names of those nodes.
 
-Normally, a node's `Up' pointer contains the name of the node whose menu
-mentions that node.  The node's `Next' pointer contains the name of the
-node that follows that node in that menu and its `Previous' pointer
-contains the name of the node that precedes it in that menu.  When a
-node's `Previous' node is the same as its `Up' node, both node pointers
-name the same node.
+Normally, a node's `Up' pointer contains the name of the node whose
+menu mentions that node.  The node's `Next' pointer contains the name
+of the node that follows the present node in that menu and its
+`Previous' pointer contains the name of the node that precedes it in
+that menu.  When a node's `Previous' node is the same as its `Up'
+node, both node pointers name the same node.
 
 Usually, the first node of a Texinfo file is the `Top' node, and its
 `Up' and `Previous' pointers point to the @file{dir} file, which
@@ -4948,7 +4931,7 @@ Even when you explicitly specify all pointers, that does not mean you
 can write the nodes in the Texinfo source file in an arbitrary order!
 Because @TeX{} processes the file sequentially, irrespective of node
 pointers, you must write the nodes in the order you wish them to appear
-in the printed output.
+in the output.
 
 
 @node Writing a Node
@@ -4959,7 +4942,7 @@ in the printed output.
 
 The easiest way to write an @code{@@node} line is to write @code{@@node}
 at the beginning of a line and then the name of the node, like
-this:@refill
+this:
 
 @example
 @@node @var{node-name}
@@ -4969,7 +4952,7 @@ If you are using GNU Emacs, you can use the update node commands
 provided by Texinfo mode to insert the names of the pointers; or you
 can leave the pointers out of the Texinfo file and let @code{makeinfo}
 insert node pointers into the Info file it creates.  (@xref{Texinfo
-Mode}, and @ref{makeinfo Pointer Creation}.)@refill
+Mode}, and @ref{makeinfo Pointer Creation}.)
 
 Alternatively, you can insert the `Next', `Previous', and `Up'
 pointers yourself.  If you do this, you may find it helpful to use the
@@ -4977,15 +4960,21 @@ Texinfo mode keyboard command @kbd{C-c C-c n}.  This command inserts
 @samp{@@node} and a comment line listing the names of the pointers in
 their proper order.  The comment line helps you keep track of which
 arguments are for which pointers.  This comment line is especially useful
-if you are not familiar with Texinfo.@refill
+if you are not familiar with Texinfo.
 
 The template for a fully-written-out node line with `Next', `Previous',
-and `Up' pointers looks like this:@refill
+and `Up' pointers looks like this:
 
 @example
 @@node @var{node-name}, @var{next}, @var{previous}, @var{up}
 @end example
 
+The @var{node-name} argument must be present, but the others are
+optional.  If you wish to specify some but not others, just insert
+commas as needed, as in: @samp{@@node mynode,,,uppernode}.  However,
+we recommend leaving off all the pointers and letting @code{makeinfo}
+determine them, as described above.
+
 If you wish, you can ignore @code{@@node} lines altogether in your first
 draft and then use the @code{texinfo-insert-node-lines} command to
 create @code{@@node} lines for you.  However, we do not recommend this
@@ -5138,12 +5127,8 @@ short for @samp{(dir)top}, and specifies the Top node in the @file{dir}
 file, which contains the main menu for the Info system as a whole.
 
 @item
-@cindex Previous node of Top node
-On the other hand, do not define the `Previous' node of the Top node to
-be @samp{(dir)}, as it causes confusing behavior for users: if you are
-in the Top node and hits @key{DEL} to go backwards, you wind up in the
-middle of the some other entry in the @file{dir} file, which has nothing
-to do with what you were reading.
+@cindex Prev node of Top node
+The `Prev' node of the Top node should also be your @samp{(dir)} file.
 
 @item
 @cindex Next node of Top node
@@ -5155,11 +5140,8 @@ document.
 @xref{Installing an Info File}, for more information about installing
 an Info file in the @file{info} directory.
 
-For concreteness, here is an example with explicit pointers (which you
-can maintain automatically with the texinfo mode commands):
-
-Or you can leave the pointers off entirely and let the tools implicitly
-define them.  This is recommended.  Thus:
+It is usually best to leave the pointers off entirely and let the
+tools implicitly define them, with this simple result:
 
 @example
 @@node Top
@@ -5205,8 +5187,9 @@ Thus, in practice, a Top node starts like this:
 @cindex Pointer creation with @code{makeinfo}
 @cindex Automatic pointer creation with @code{makeinfo}
 
-The @code{makeinfo} program has a feature for automatically determining
-node pointers for a hierarchically organized document.
+The @code{makeinfo} program has a feature for automatically
+determining node pointers for a hierarchically organized document.  We
+highly recommend using it.
 
 When you take advantage of this feature, you do not need to write the
 `Next', `Previous', and `Up' pointers after the name of a node.
@@ -5222,7 +5205,14 @@ Finally, you must write the name of each node (except for the `Top'
 node) in a menu that is one or more hierarchical levels above the
 node's hierarchical level.
 
-This implicit node pointer insertion feature in @code{makeinfo}
+@cindex Detail menu
+@findex detailmenu
+If you use a detailed menu in your master menu (@pxref{Master Menu
+Parts}), mark it with the @code{@@detailmenu @@dots@{@} @@end
+detailmenu} environment, or @command{makeinfo} will get confused,
+typically about the last and/or first node in the document.
+
+This implicit node pointer creation feature in @code{makeinfo}
 relieves you from the need to update menus and pointers manually or
 with Texinfo mode commands.  (@xref{Updating Nodes and Menus}.)
 
@@ -5233,8 +5223,7 @@ sectioning commands at all (for example, if you never intend the
 document to be printed).  The special procedure for handling the short
 text before a menu (@pxref{Menus}) also disables this
 feature, for that group of nodes.  In those cases, you will need to
-explicitly specify the pointers.
-
+explicitly specify all pointers.
 
 @node anchor
 @section @code{@@anchor}: Defining Arbitrary Cross-reference Targets
@@ -5273,13 +5262,16 @@ It is best to put @code{@@anchor} commands just before the position you
 wish to refer to; that way, the reader's eye is led on to the correct
 text when they jump to the anchor.  You can put the @code{@@anchor}
 command on a line by itself if that helps readability of the source.
-Spaces are always ignored after @code{@@anchor}.
+Whitespace (including newlines) is ignored after @code{@@anchor}.
 
 Anchor names and node names may not conflict.  Anchors and nodes are
 given similar treatment in some ways; for example, the @code{goto-node}
 command in standalone Info takes either an anchor name or a node name as
 an argument.  (@xref{goto-node,,,info-stnd,GNU Info}.)
 
+Also like node names, anchor names cannot include some characters
+(@pxref{Node Line Requirements}).
+
 
 @node Menus
 @chapter Menus
@@ -5291,11 +5283,12 @@ you use menus to go to such nodes.  Menus have no effect in printed
 manuals and do not appear in them.
 
 A node with a menu should not contain much text.  If you find yourself
-writing a lot of before a menu, we generally recommend moving most of
-the text into a new subnode---all but a paragraph or two.  Otherwise,
-a reader with a terminal that displays only a few lines may miss the
-menu and its associated text.  As a practical matter, it is best to
-locate a menu within 20 or so lines of the beginning of the node.
+writing a lot of text before a menu, we generally recommend moving
+most of the text into a new subnode---all but a paragraph or two.
+Otherwise, a reader with a terminal that displays only a few lines may
+miss the menu and its associated text.  As a practical matter, it is
+best to locate a menu within 20 or so lines of the beginning of the
+node.
 
 @menu
 * Menu Location::               Menus go at the ends of short nodes.
@@ -5338,10 +5331,10 @@ In the past, we recommended using a @samp{@@heading} command within an
 @code{@@ifinfo} conditional instead of the normal sectioning commands
 after a very short node with a menu.  This had the advantage of making
 the printed output look better, because there was no very short text
-between two headings on the page.  But aside from not working with
-@command{makeinfo}'s implicit pointer creation, it also makes the XML
-output incorrect, since it does not reflect the true document
-structure.  So, unfortunately we can no longer recommend this.
+between two headings on the page.  But this also does not work with
+@command{makeinfo}'s implicit pointer creation, and it also makes the
+XML output incorrect, since it does not reflect the true document
+structure.  So, regrettably, we can no longer recommend this.
 
 
 @node Writing a Menu
@@ -5377,6 +5370,13 @@ menu comment line; the two lines starting with @w{@samp{* }} are menu
 entries.  Space characters in a menu are preserved as-is; this allows
 you to format the menu as you wish.
 
+@opindex accesskey@r{, in HTML output}
+In the HTML output from @command{makeinfo}, the @code{accesskey}
+attribute is used with the values @samp{1}@dots{}@samp{9} for the
+first nine entries.  This allows people using web browsers to follow
+the first menu entries using (typically) @kbd{M-@var{digit}}, e.g.,
+@kbd{M-1} for the first entry.
+
 
 @node Menu Parts
 @section The Parts of a Menu
@@ -5753,9 +5753,12 @@ node provides the page reference only for references within the same
 document.@refill
 
 @item
-The cross reference name for the Info reference, if it is to be different
-from the node name.  If you include this argument, it becomes
-the first part of the cross reference.  It is usually omitted.@refill
+The cross reference name for the Info reference, if it is to be
+different from the node name or the topic description.  If you
+include this argument, it becomes the first part of the cross reference.
+It is usually omitted; then the topic description (third argument) is
+used if it was specified; if that was omitted as well, the node name
+is used.
 
 @item
 A topic description or section name.  Often, this is the title of the
@@ -6265,19 +6268,20 @@ This makes it useful as the last part of a sentence.
 
 @cindex Hurricanes
 @example
-For more information, see @@ref@{Hurricanes@}.
+For more information, @@pxref@{This@}, and @@ref@{That@}.
 @end example
 
-@noindent produces (in Info):
+@noindent produces in Info:
 
 @example
-For more information, see *Note Hurricanes::.
+For more information, *note This::, and *note That::.
 @end example
 
-@noindent and (in printed output):
+@noindent and in printed output:
 
 @quotation
-For more information, see Section 8.2 [Hurricanes], page 123.
+For more information, see Section 1.1 [This], page 1,
+and Section 1.2 [That], page 2.
 @end quotation
 
 The @code{@@ref} command sometimes tempts writers to express
@@ -6296,19 +6300,21 @@ Sea surges are described in @@ref@{Hurricanes@}.
 Sea surges are described in Section 6.7 [Hurricanes], page 72.
 @end quotation
 
-@noindent but is awkward to read in Info:
+@noindent but is awkward to read in Info, ``note'' being a verb:
 
 @example
-Sea surges are described in *Note Hurricanes::.
+Sea surges are described in *note Hurricanes::.
 @end example
 
-As a general rule, you should write a period or comma immediately
-after an @code{@@ref} command with two or more arguments.
+You should write a period or comma immediately after an @code{@@ref}
+command with two or more arguments.  If there is no such following
+punctuation, @command{makeinfo} will generate a (grammatically
+incorrect) period in the Info output; otherwise, the cross-reference
+would fail completely, due to the current syntax of Info format.
 
-If there is no such following punctuation, @command{makeinfo} will
-generate a (grammatically incorrect) period in the Info output;
-otherwise, the cross-reference would fail completely, due to the
-current syntax of Info format.
+In general, it is best to use @code{@@ref} only when you need some
+word other than ``see'' to precede the reference.  When ``see'' (or
+``See'') is ok, @code{@@xref} and @code{@@pxref} are preferable.
 
 
 @node pxref
@@ -6318,40 +6324,32 @@ current syntax of Info format.
 @findex pxref
 
 The parenthetical reference command, @code{@@pxref}, is nearly the
-same as @code{@@xref}, but you use it @emph{only} inside parentheses
-and you do @emph{not} type a comma or period (or anything else) after
-the command's closing brace.  The command differs from @code{@@xref}
+same as @code{@@xref}, but it is best used at the end of a sentence or
+before a closing parenthesis.  The command differs from @code{@@xref}
 in two ways:
 
 @enumerate
 @item
 @TeX{} typesets the reference for the printed manual with a lower case
-`see' rather than an upper case `See'.@refill
+`see' rather than an upper case `See'.
 
 @item
 The Info formatting commands automatically end the reference with a
-closing colon or period.@refill
+closing colon or period, if necessary.
 @end enumerate
 
-Because one type of formatting automatically inserts closing
-punctuation and the other does not, you should use @code{@@pxref}
-@emph{only} inside parentheses as part of another sentence.  Also, you
-yourself should not insert punctuation after the reference (or any
-other text), as you do with @code{@@xref}.  In the Info
-output, such text would follow a period, which is grammatically wrong.
-
 @code{@@pxref} is designed so that the output looks right and works
-right between parentheses both in printed output and in an Info file.
-In a printed manual, a closing comma or period should not follow a
-cross reference within parentheses; such punctuation is wrong.  But in
-an Info file, suitable closing punctuation must follow the cross
-reference so Info can recognize its end.  @code{@@pxref} spares you
-the need to use complicated methods to put a terminator into one form
-of the output and not the other.@refill
+right at the end of a sentence or parenthetical phrase, both in
+printed output and in an Info file.  In a printed manual, a closing
+comma or period should not follow a cross reference within
+parentheses; such punctuation is wrong.  But in an Info file, suitable
+closing punctuation must follow the cross reference so Info can
+recognize its end.  @code{@@pxref} spares you the need to use
+complicated methods to put a terminator into one form of the output
+and not the other.
 
 @noindent
-With one argument, a parenthetical cross reference looks like
-this:@refill
+With one argument, a parenthetical cross reference looks like this:
 
 @cindex Flooding
 @example
@@ -6364,7 +6362,7 @@ which produces
 
 @example
 @group
-@dots{} storms cause flooding (*Note Hurricanes::) @dots{}
+@dots{} storms cause flooding (*note Hurricanes::) @dots{}
 @end group
 @end example
 
@@ -6375,8 +6373,7 @@ and
 @dots{} storms cause flooding (see Section 6.7 [Hurricanes], page 72) @dots{}
 @end quotation
 
-With two arguments, a parenthetical cross reference has this
-template:@refill
+With two arguments, a parenthetical cross reference has this template:
 
 @example
 @dots{} (@@pxref@{@var{node-name}, @var{cross-reference-name}@}) @dots{}
@@ -6386,30 +6383,45 @@ template:@refill
 which produces
 
 @example
-@dots{} (*Note @var{cross-reference-name}: @var{node-name}.) @dots{}
+@dots{} (*note @var{cross-reference-name}: @var{node-name}.) @dots{}
 @end example
 
 @noindent
 and
 
-@need 1500
 @quotation
 @dots{} (see Section @var{nnn} [@var{node-name}], page @var{ppp}) @dots{}
 @end quotation
 
-@code{@@pxref} can be used with up to five arguments just like
-@code{@@xref} (@pxref{xref, , @code{@@xref}}).@refill
+@code{@@pxref} can be used with up to five arguments, just like
+@code{@@xref} (@pxref{xref, , @code{@@xref}}).
 
-@quotation Caution
-Use @code{@@pxref} only as a parenthetical
-reference.  Do not try to use @code{@@pxref} as a clause in a sentence.
-It will look bad in either the Info file, the printed output, or
-both.@refill
-@end quotation
+In past versions of Texinfo, it was not allowed to write punctuation
+after a @code{@@pxref}, so it could be used @emph{only} before a right
+parenthesis.  This is no longer the case, so now it can be used (for
+example) at the end of a sentence, where a lowercase ``see'' works
+best.  For instance:
+
+@example
+@dots{} For more information, @@pxref@{More@}.
+@end example
+
+@noindent
+which outputs (in Info):
+
+@example
+@dots{} For more information, *note More::.
+@end example
+
+@noindent
+This works fine.  @code{@@pxref} should only be followed by a comma,
+period, or right parenthesis; in other cases, @command{makeinfo} has
+to insert a period to make the cross-reference work correctly in Info,
+and that period looks wrong.
 
-Parenthetical cross references look best at the ends of sentences.
-Although they technically work in the middle of a sentence, that
-location breaks up the flow of reading.
+As a matter of general style, @code{@@pxref} is best used at the ends
+of sentences.  Although it technically works in the middle of a
+sentence, that location breaks up the flow of reading.
 
 
 @node inforef
@@ -6505,7 +6517,7 @@ produces a link you can follow.
 had the meaning of @code{@@indicateurl}
 (@pxref{indicateurl,,@code{@@indicateurl}}), but in actual practice it
 was misused the vast majority of the time.  So we've changed the
-definitions.
+meaning.
 
 The second argument, if specified, is the text to display (the default
 is the url itself); in Info and DVI output, but not in HTML output, the
@@ -6563,17 +6575,17 @@ holds programs and texts.
 
 An example of the three-argument form:
 @example
-The @@uref@{/man.cgi/1/ls,,ls(1)@} program @dots{}
+The @@uref@{/man.cgi/1/ls,,ls@} program @dots{}
 @end example
 
 @noindent produces:
 @display
-The @uref{/man.cgi/1/ls,,ls(1)} program @dots{}
+The @uref{/man.cgi/1/ls,,ls} program @dots{}
 @end display
 
 @noindent but with HTML:
 @example
-The <a href="/man.cgi/1/ls">ls(1)</a> program @dots{}
+The <a href="/man.cgi/1/ls">ls</a> program @dots{}
 @end example
 
 To merely indicate a url without creating a link people can follow, use
@@ -6698,7 +6710,7 @@ Indicate a metasyntactic variable.
 
 @item @@env@{@var{environment-variable}@}
 Indicate an environment variable.
-@xref{env,,@code{@@kenv}}.
+@xref{env,,@code{@@env}}.
 
 @item @@file@{@var{file-name}@}
 Indicate the name of a file.
@@ -6738,7 +6750,7 @@ Indicate an electronic mail address.
 
 @ignore
 @item @@ctrl@{@var{ctrl-char}@}
-Use for an @sc{ascii} control character.@refill
+Use for an ASCII control character.
 @end ignore
 @end table
 
@@ -6778,8 +6790,6 @@ should rearrange the sentence.
 In the printed manual, @code{@@code} causes @TeX{} to typeset the
 argument in a typewriter face.  In the Info file, it causes the Info
 formatting commands to use single quotation marks around the text.
-
-@need 700
 For example,
 
 @example
@@ -6787,7 +6797,7 @@ The function returns @@code@{nil@}.
 @end example
 
 @noindent
-produces this in the printed manual:
+produces this:
 
 @quotation
 The function returns @code{nil}.
@@ -6801,7 +6811,7 @@ The function returns `nil'.
 @end example
 @end iftex
 
-Here are some cases for which it is preferable not to use @code{@@code}:
+Here are some cases for which it is preferable @emph{not} to use @code{@@code}:
 
 @itemize @bullet
 @item
@@ -6845,6 +6855,11 @@ The new commands allow you to express the markup more precisely, but
 there is no real harm in using the older commands, and of course the
 long-standing manuals do so.
 
+Ordinarily, @TeX{} will consider breaking lines at @samp{-} and
+@samp{_} characters within @code{@@code} and related commands.  This
+can be controlled with @code{@@allowcodebreaks}
+(@pxref{allowcodebreaks,,@code{@@allowcodebreaks}}).
+
 
 @node kbd
 @subsection @code{@@kbd}@{@var{keyboard-characters}@}
@@ -6933,7 +6948,6 @@ input, write @kbd{@@key@{SPC@}} for it.)@refill
 
 
 @node key
-@comment  node-name,  next,  previous,  up
 @subsection @code{@@key}@{@var{key-name}@}
 @findex key
 
@@ -6948,11 +6962,12 @@ You can use the @code{@@key} command within the argument of an
 @code{@@kbd} command when the sequence of characters to be typed
 includes one or more keys that are described by name.@refill
 
-@need 700
-For example, to produce @kbd{C-x @key{ESC}} you would type:@refill
+For example, to produce @kbd{C-x @key{ESC}} and @kbd{M-@key{TAB}} you
+would type:
 
 @example
 @@kbd@{C-x @@key@{ESC@}@}
+@@kbd@{M-@@key@{TAB@}@}
 @end example
 
 Here is a list of the recommended names for keys:
@@ -6969,14 +6984,14 @@ Space
 Return
 @item LFD
 Linefeed (however, since most keyboards nowadays do not have a Linefeed key,
-it might be better to call this character @kbd{C-j}.
+it might be better to call this character @kbd{C-j})
 @item TAB
 Tab
 @item BS
 Backspace
 @item ESC
 Escape
-@item DEL
+@item DELETE
 Delete
 @item SHIFT
 Shift
@@ -6996,12 +7011,9 @@ to the modifier key in isolation, use the @code{@@key} command.  For
 example, write @samp{@@kbd@{Meta-a@}} to produce @kbd{Meta-a} and
 @samp{@@key@{META@}} to produce @key{META}.
 
-@c I don't think this is a good explanation.
-@c I think it will puzzle readers more than it clarifies matters.  -- rms.
-@c In other words, use @code{@@kbd} for what you do, and use @code{@@key}
-@c for what you talk about: ``Press @code{@@kbd@{M-a@}} to move point to
-@c the beginning of the sentence.  The @code{@@key@{META@}} key is often in
-@c the lower left of the keyboard.''@refill
+As a convention in GNU manuals, @code{@@key} should not be used in
+index entries.
+
 
 @node samp
 @subsection @code{@@samp}@{@var{text}@}
@@ -7319,7 +7331,7 @@ command since a reader can easily follow such a reference in Info.
 @c subsection @code{@@ctrl}@{@var{ctrl-char}@}
 @findex ctrl
 
-The @code{@@ctrl} command is seldom used.  It describes an @sc{ascii}
+The @code{@@ctrl} command is seldom used.  It describes an ASCII
 control character by inserting the actual character into the Info
 file.
 
@@ -7335,7 +7347,7 @@ to make it easier for a reader to understand.@refill
 @code{@@ctrl} is an idea from the beginnings of Texinfo which may not
 really fit in to the scheme of things.  But there may be times when
 you want to use the command.  The pattern is
-@code{@@ctrl@{@var{ch}@}}, where @var{ch} is an @sc{ascii} character
+@code{@@ctrl@{@var{ch}@}}, where @var{ch} is an ASCII character
 whose control-equivalent is wanted.  For example, to specify
 @samp{control-f}, you would enter@refill
 
@@ -7382,7 +7394,7 @@ not at the end of a sentence, and has no second argument, remember to
 use the @code{@@.} command (@pxref{Not Ending a
 Sentence}) to get the correct spacing.  However, you do not have to
 use @code{@@.} within the abbreviation itself; Texinfo automatically
-assumes periods within the abbreivation do not end a sentence.
+assumes periods within the abbreviation do not end a sentence.
 
 @cindex <abbr> tag
 In @TeX{} and in the Info output, the first argument is printed as-is;
@@ -7475,8 +7487,7 @@ acronyms.
 
 @item
 It's not essential to use these commands for all abbreviations.  Text
-is perfectly readable without them, and for common abbreviations like
-`etc.@:', we consider them to be overkill.
+is perfectly readable without them.
 
 @end itemize
 
@@ -7531,7 +7542,6 @@ suggestions to the @email{bug-texinfo@@gnu.org, same place}.
 
 
 @node Emphasis
-@comment node-name,  next,  previous,  up
 @section Emphasizing Text
 @cindex Emphasizing text
 
@@ -7649,7 +7659,34 @@ We recommend using regular mixed case wherever possible.
 @subsection Fonts for Printing, Not Info
 @cindex Fonts for printing, not Info
 
-Texinfo provides a number of font commands that specify font changes
+@findex fonttextsize
+@cindex Font size, reducing
+@cindex Reducing font size
+@cindex Smaller fonts
+Texinfo provides one command to change the size of the main body font
+in the @TeX{} output for a document: @code{@@fonttextsize}.  It has no
+effect at all in other output.  It takes a single argument on the
+remainder of the line, which must be either @samp{10} or @samp{11}.
+For example:
+
+@example
+@@fonttextsize 10
+@end example
+
+@cindex Printing cost, reducing
+The effect is to reduce the body font to a 10@dmn{pt} size (the
+default is 11@dmn{pt}).  Fonts for other elements, such as sections
+and chapters, are reduced accordingly.  This should only be used in
+conjunction with @code{@@smallbook} (@pxref{smallbook,,Printing
+``Small'' Books}) or similar, since 10@dmn{pt} fonts on standard paper
+(8.5x11 or A4) are too small.  One reason to use this command is to
+save pages, and hence printing cost, for physical books.
+
+Texinfo does not at present have commands to switch the font family
+to use, or more general size-changing commands.
+
+@cindex Styles, font
+Texinfo also provides a number of font commands that specify font changes
 in the printed manual and (where possible) in the HTML output, but
 have no effect in the Info file.  All the commands apply to an
 argument that follows, surrounded by braces.
@@ -7681,7 +7718,7 @@ selects a @sansserif{sans serif} font;
 @findex slanted @r{(slanted font)}
 @cindex Slanted font
 @cindex Oblique font
-rselects a @slanted{slanted} font;
+selects a @slanted{slanted} font;
 
 @item @@t
 @findex t @r{(typewriter font)}
@@ -7693,8 +7730,8 @@ selects the @t{fixed-width}, typewriter-style font used by @code{@@code};
 @end table
 
 (The commands with longer names were invented much later than the
-others, when it did not seem desirable to use very short names for
-such an infrequently needed feature.)
+others, at which time it did not seem desirable to use very short
+names for such an infrequently needed feature.)
 
 @cindex <lineannotation> Docbook tag
 Only the @code{@@r} command has much use: in example-like
@@ -7721,8 +7758,8 @@ produces
 @end lisp
 
 In general, you should avoid using the other font commands.  Some of
-them are only useful when documenting functionality with specific font
-effects, such as in \TeX\ and related packages.
+them are only useful when documenting functionality of specific font
+effects, such as in @TeX{} and related packages.
 
 
 @node Quotations and Examples
@@ -7966,20 +8003,13 @@ normal roman font, you can use the @code{@@r} command (@pxref{Fonts}).
 Use the @code{@@verbatim} environment for printing of text that may
 contain special characters or commands that should not be interpreted,
 such as computer input or output (@code{@@example} interprets its text
-as regular Texinfo commands).  This is especially useful for including
-automatically generated output in a Texinfo manual.  Here is an example;
-the output you see is just the same as the input, with a line
-@code{@@verbatim} before and a line @code{@@end verbatim} after.
+as regular Texinfo commands).  This is especially useful for including automatically
+generated files in a Texinfo manual.
 
-@verbatim
-This is an example of text written in a @verbatim
-block.  No character substitutions are made.  All commands
-are ignored, until `<at>end verbatim'.
-
-In the printed manual, the text is typeset in a
-fixed-width font, and not indented or filled.  All
-spaces and blank lines are significant, including tabs.
-@end verbatim
+In general, the output will be just the same as the input.  No
+character substitutions are made, e.g., all spaces and blank lines are
+significant, including tabs.  In the printed manual, the text is
+typeset in a fixed-width font, and not indented or filled.
 
 Write a @code{@@verbatim} command at the beginning of a line by itself.
 This line will disappear from the output.  Mark the end of the verbatim
@@ -8000,7 +8030,7 @@ For example:
 @end example
 
 @noindent
-produces
+This produces:
 
 @verbatim
 {
@@ -8015,7 +8045,22 @@ produce no output, typically you should put a blank line before the
 verbatim}.  Blank lines between the beginning @code{@@verbatim} and
 the ending @code{@@end verbatim} will appear in the output.
 
-It is not reliable to use @code{@@verbatim} inside other Texinfo constructs.
+@cindex Verbatim, small
+@cindex Small verbatim
+You can get a ``small'' verbatim by enclosing the @code{@@verbatim} in
+an @code{@@smallformat} environment, as shown here:
+
+@c more cheating ...
+@smallexample
+@exdent @t{@@smallformat}
+@exdent @t{@@verbatim}
+@exdent @t{... still verbatim, but in a smaller font ...}
+@exdent @t{@@end verbatim}
+@exdent @t{@@end smallformat}
+@end smallexample
+
+Finally, a word of warning: it is not reliable to use
+@code{@@verbatim} inside other Texinfo constructs.
 
 
 @node verbatiminclude
@@ -8040,16 +8085,19 @@ the @code{@@verbatiminclude} within @code{@@example}
 
 The name of the file is taken literally, with a single exception:
 @code{@@value@{@var{var}@}} references are expanded.  This makes it
-possible to reliably include files in other directories in a
-distribution, for instance:
+possible to include files in other directories within a distribution,
+for instance:
 
 @example
-@@include @@value@{top_srcdir@}/NEWS
+@@verbatiminclude @@value@{top_srcdir@}/NEWS
 @end example
 
 @noindent (You still have to get @code{top_srcdir} defined in the
 first place.)
 
+For a method on printing the file contents in a smaller font size, see
+the end of the previous section on @code{@@verbatim}.
+
 
 @node lisp
 @section @code{@@lisp}: Marking a Lisp Example
@@ -8195,7 +8243,7 @@ This line follows an @@@@example command.
 @@exdent This line is exdented.
 This line follows the exdented line.
 The @@@@end example comes on the next line.
-@@end group
+@@end example
 @end group
 @end example
 
@@ -8989,7 +9037,9 @@ input lines in your source file as necessary.
 @cindex <thead> HTML tag
 You can also use @code{@@headitem} instead of @code{@@item} to produce
 a @dfn{heading row}.  The @TeX{} output for such a row is in bold, and
-the HTML, XML, and Docbook output uses the @code{<thead>} tag.
+the HTML, XML, and Docbook output uses the @code{<thead>} tag.  In
+Info, the heading row is followed by a separator line made of dashes
+(@samp{-} characters).
 
 Here is a complete example of a multi-column table (the text is from
 @cite{The GNU Emacs Manual}, @pxref{Split Window,, Splitting Windows,
@@ -9079,7 +9129,7 @@ an @code{@@group} (@pxref{group,,@code{@@group}}).
 
 
 @node float
-@subsection @code{@@float} [@var{type}][,@var{label}]: Floating material
+@subsection @code{@@float} [@var{type}][,@var{label}]: Floating Material
 @findex float
 @cindex Float environment
 
@@ -9116,7 +9166,7 @@ cross-referencing will simply use a bare number.
 @item label
 Specifies a cross-reference label for this float.  If given, this
 float is automatically given a number, and will appear in any
-@code{@@listofloats} output (@pxref{listoffloats}).  Cross-references
+@code{@@listoffloats} output (@pxref{listoffloats}).  Cross-references
 to @var{label} are allowed.
 
 @cindex Floats, making unnumbered
@@ -9196,7 +9246,7 @@ environments such as @code{@@example}, or other complex constructs.
 
 
 @node listoffloats
-@subsection @code{@@listoffloats}: Tables of contents for floats
+@subsection @code{@@listoffloats}: Tables of Contents for Floats
 @findex listoffloats
 @cindex List of floats
 @cindex Floats, list of
@@ -9259,7 +9309,7 @@ since they are most often part of a displayed figure or example.
 @node Image Syntax
 @subsection Image Syntax
 
-Here is the basic synopsis of the @code{@@image} command:
+Here is the synopsis of the @code{@@image} command:
 
 @example
 @@image@{@var{filename}@r{[,} @var{width}@r{[,} @var{height}@r{[,} @var{alttext}@r{[, }@var{extension}@r{]]]]}@}
@@ -9272,11 +9322,18 @@ extension, because the different processors support different formats:
 
 @itemize @bullet
 @item
+@pindex eps image format
 @TeX{} reads the file @file{@var{filename}.eps} (Encapsulated PostScript
 format).
 @item
 @pindex pdftex@r{, and images}
-PDF@TeX{} reads @file{@var{filename}.pdf} (Adobe's Portable Document Format).
+@pindex png image format
+@pindex jpeg image format
+@pindex pdf image inclusions
+pdf@TeX{} reads @file{@var{filename}.png}, @file{@var{filename}.jpg},
+@file{@var{filename}.jpeg}, or @file{@var{filename}.pdf} (in that
+order).  It also tries uppercase versions of the extensions.  The PDF
+format cannot support EPS images, so they must be converted first.
 @item
 @code{makeinfo} includes @file{@var{filename}.txt} verbatim for
 Info output (more or less as if it was an @code{@@example}).
@@ -9297,31 +9354,34 @@ will cause @code{makeinfo} to look for @file{foo.xpm} before any others.
 The @var{width} and @var{height} arguments are described in the next
 section.
 
-For @TeX{} output, if an image is the first thing in a paragraph, for
-example if you want two images side-by-side, you must precede it with
-@code{@@noindent} (@pxref{noindent,,@code{@@noindent}}).  Otherwise it
-will be displayed on a line by itself.  If you want it centered, 
-use @code{@@center} (@pxref{titlefont center sp,,@code{@@titlefont
-@@center @@sp}}).
+For @TeX{} output, if an image is the only thing in a paragraph it
+will ordinarily be displayed on a line by itself, respecting the
+current environment indentation, but without the normal paragraph
+indentation.  If you want it centered, use @code{@@center}
+(@pxref{titlefont center sp,,@code{@@titlefont @@center @@sp}}).
 
 @cindex Alt attribute for images
 @cindex Images, alternate text for
-When producing html, @code{makeinfo} sets the @dfn{alt attribute} for
+@findex - (in image alt string)
+For HTML output, @code{makeinfo} sets the @dfn{alt attribute} for
 inline images to the optional @var{alttext} (fourth) argument to
 @code{@@image}, if supplied.  If not supplied, @code{makeinfo} uses
-the full file name of the image being displayed.  If you want an empty
-@code{alt} string, use @code{@@-}.  The @var{alttext} is taken as
-Texinfo text, so special characters such as @samp{"} and @samp{<} and
-@samp{&} are escaped in the HTML and XML output.
+the full file name of the image being displayed.  The @var{alttext} is
+taken as Texinfo text, so special characters such as @samp{"} and
+@samp{<} and @samp{&} are escaped in the HTML and XML output; also,
+you can get an empty @code{alt} string with @code{@@-} (a command
+that produces no output; @pxref{- and hyphenation}).
+
+For Info output, the @code{alt} string is also processed as Texinfo
+text and output.  In this case, @samp{\} is escaped as @samp{\\} and
+@samp{"} as @samp{\"}; no other escapes are done.
 
-@cindex GIF images, unsupported due to patents
 @cindex PNG image format
-@cindex JPG image format
+@cindex JPEG image format
 If you do not supply the optional @var{extension} (fifth) argument,
 @code{makeinfo} first tries @file{@var{filename}.png}; if that does
 not exist, it tries @file{@var{filename}.jpg}.  If that does not exist
-either, it complains.  (We cannot support GIF format directly due to
-software patents.)
+either, it complains.
 
 In Info output, @code{makeinfo} writes a reference to the binary image
 file (trying @var{filename} suffixed with @file{@var{extension}},
@@ -9332,6 +9392,7 @@ Emacs Info browser, running under X) can do so, whereas Info readers
 which can only use text (such as the standalone Info reader) can
 display the textual version.
 
+@cindex @samp{^@@^H} for images in Info
 The implementation of this is to put the following construct into the
 Info output:
 
@@ -9966,7 +10027,8 @@ These are:
 @item Accents.
 @item Dots and bullets.
 @item The @TeX{} logo and the copyright symbol.
-@item The pounds currency symbol.
+@item The euro and pounds currency symbols.
+@item The degrees symbol.
 @item The minus sign.
 @item Mathematical expressions.
 @item Glyphs for evaluation, macros, errors, etc.
@@ -9977,16 +10039,21 @@ These are:
 
 @menu
 * Atsign Braces Comma::         Inserting @@ and @{@} and ,.
+* Inserting Quote Characters::  Inserting left and right quotes, in code.
 * Inserting Space::             How to insert the right amount of space
                                  within a sentence.
 * Inserting Accents::           How to insert accents and special characters.
+* Inserting Quotation Marks::   How to insert quotation marks.
 * Dots Bullets::                How to insert dots and bullets.
 * TeX and copyright::           How to insert the @TeX{} logo
                                  and the copyright symbol.
 * euro::                        How to insert the Euro currency symbol.
 * pounds::                      How to insert the pounds currency symbol.
+* textdegree::                  How to insert the degrees symbol.
 * minus::                       How to insert a minus sign.
+* geq leq::                     How to insert greater/less-than-or-equal signs.
 * math::                        How to format a mathematical expression.
+* Click Sequences::             Inserting GUI usage sequences.
 * Glyphs::                      How to indicate results of evaluation,
                                  expansion of macros, errors, etc.
 @end menu
@@ -10036,7 +10103,7 @@ output.
 output.
 
 Do not put braces after either an @code{@@@{} or an @code{@@@}}
-command.ppp
+command.
 
 
 @node Inserting a Comma
@@ -10053,9 +10120,9 @@ context: some commands, such as @code{@@acronym} (@pxref{acronym}) and
 macros (@pxref{Defining Macros}), can take more than one argument.  In
 these cases, the comma character is used to separate arguments.
 
-Since a comma chacter would confuse Texinfo's parsing for these
-commands, you must use the command @samp{@comma{}} instead if you want
-to have an actual comma in the output.  Here are some examples:
+Since a comma character would confuse Texinfo's parsing for these
+commands, you must use the command @samp{@@comma@{@}} instead if you want
+to pass an actual comma.  Here are some examples:
 
 @example
 @@acronym@{ABC, A Bizarre @@comma@{@}@}
@@ -10063,10 +10130,60 @@ to have an actual comma in the output.  Here are some examples:
 @@mymac@{One argument@@comma@{@} containing a comma@}
 @end example
 
-Although @comma{} can be used anywhere, there is no need for it
+Although @comma{} can be used nearly anywhere, there is no need for it
 anywhere except in this unusual case.
 
 
+@node Inserting Quote Characters
+@section Inserting Quote Characters
+
+@cindex Inserting quote characters
+@cindex Quote characters, inserting
+
+As explained in the early section on general Texinfo input conventions
+(@pxref{Conventions}), Texinfo source files use the ASCII character
+@code{`} (96 decimal) to produce a left quote (`), and ASCII @code{'}
+(39 decimal) to produce a right quote (').  Doubling these input
+characters (@code{``} and @code{''}) produces double quotes (`` and
+'').  These are the conventions used by @TeX{}.
+
+This works all right for text.  However, in examples of computer code,
+readers are especially likely to cut and paste the text
+verbatim---and, unfortunately, some document viewers will mangle these
+characters.  (The free PDF reader @command{xpdf} works fine, but other
+PDF readers, both free and nonfree, have problems.)
+
+If this is a concern for your document, Texinfo provides two special
+settings via @code{@@set}:
+
+@table @code
+@item @@set txicodequoteundirected
+causes the output for the @code{'} character to be the undirected
+single quote, like this:
+@set txicodequoteundirected
+@code{'}.
+@clear txicodequoteundirected
+
+@item @@set txicodequotebacktick
+Cause the output for the @code{`} character to be the standalone grave
+accent, like this:
+@set txicodequotebacktick
+@code{`}.
+@clear txicodequotebacktick
+
+@end table
+
+@code{xyza`'bc}
+
+If you want these settings for only part of the document,
+@code{@@clear} will restore the normal behavior, as in
+@code{@@clear@tie{}txicodequoteundirected}.
+
+These settings affect @code{@@code}, @code{@@example}, and
+@code{@@verbatim}; they do not affect @code{@@samp}.  (@xref{Useful
+Highlighting}.)
+
+
 @node Inserting Space
 @section Inserting Space
 
@@ -10079,6 +10196,7 @@ kinds within and after sentences.
 * Not Ending a Sentence::       Sometimes a . doesn't end a sentence.
 * Ending a Sentence::           Sometimes it does.
 * Multiple Spaces::             Inserting multiple spaces.
+* frenchspacing::               Specifying end-of-sentence spacing.
 * dmn::                         How to format a dimension.
 @end menu
 
@@ -10108,8 +10226,8 @@ which are not at the ends of sentences.
 For example,
 
 @example
-The s.o.p.@@: has three parts @dots{}
-The s.o.p. has three parts @dots{}
+foo vs.@@: bar
+foo vs. bar
 @end example
 
 @noindent
@@ -10118,19 +10236,16 @@ produces
 @end ifnottex
 @iftex
 produces the following.  If you look carefully at this printed output,
-you will see a little extraneous space after @samp{s.o.p.} in the second
+you will see a little extraneous space after @samp{vs.}@: in the second
 line.
 @end iftex
 
 @quotation
-The s.o.p.@: has three parts @dots{}@*
-The s.o.p. has three parts @dots{}
+foo vs.@: bar @*
+foo vs. bar
 @end quotation
 
 @noindent
-(Incidentally, @samp{s.o.p.} is an abbreviation for ``Standard Operating
-Procedure''.)
-
 @code{@@:} has no effect on the Info and HTML output.  In Docbook and
 XML, the previous punctuation character (.?!:) is output as an entity
 instead of as the normal character: @samp{&period; &quest; &excl;
@@ -10233,6 +10348,74 @@ Do not follow any of these commands with braces.
 To produce a non-breakable space, see @ref{tie, @code{@@tie}}.
 
 
+@node frenchspacing
+@subsection @code{@@frenchspacing} @var{val}: Control sentence spacing
+@findex frenchspacing
+@cindex French spacing
+@cindex Sentences, spacing after
+@cindex Space, after sentences
+
+In American typography, it is traditional and correct to put extra
+space at the end of a sentence, after a semi-colon, and so on.  This
+is the default in Texinfo.  In French typography (and many others),
+this extra space is wrong; all spaces are uniform.
+
+Therefore Texinfo provides the @code{@@frenchspacing} command to
+control the spacing after punctuation.  It reads the rest of the line
+as its argument, which must be the single word @samp{on} or @samp{off}
+(always these words, regardless of the language) of the document.
+Here is an example:
+
+@example
+@@frenchspacing on
+This is text. Two sentences. Three sentences. French spacing.
+
+@@frenchspacing off
+This is text. Two sentences. Three sentences. Non-French spacing.
+@end example
+
+@noindent produces (there will be no difference in Info):
+
+@frenchspacing on
+This is text. Two sentences. Three sentences. French spacing.
+
+@frenchspacing off
+This is text. Two sentences. Three sentences. Non-French spacing.
+
+@code{@@frenchspacing} mainly affects the printed output, including
+the output after @code{@@.}, @code{@@!}, and @code{@@?} (@pxref{Ending
+a Sentence}).
+
+In Info, usually space characters in the input are written unaltered
+to the output, and @code{@@frenchspacing} does not change this.  It
+does change the one case where @command{makeinfo} outputs a space on
+its own: when a sentence ends at a newline in the source.  Here's an
+example:
+
+@example
+Some sentence.
+Next sentence.
+@end example
+
+@noindent produces in Info output, with @code{@@frenchspacing off}
+(the default), two spaces between the sentences:
+
+@example
+Some sentence.  Next sentence.
+@end example
+
+@noindent With @code{@@frenchspacing on}, @command{makeinfo} outputs
+only a single space:
+
+@example
+Some sentence. Next sentence.
+@end example
+
+@code{@@frenchspacing} has no effect on the HTML or Docbook output;
+for XML, it outputs a transliteration of itself (@pxref{Output
+Formats}).
+
+
 @node dmn
 @subsection @code{@@dmn}@{@var{dimension}@}: Format a Dimension
 @cindex Thin space between number, dimension
@@ -10285,9 +10468,11 @@ braces around their argument (which is taken to be the next character).
 This is so as to make the source as convenient to type and read as
 possible, since accented characters are very common in some languages.
 
+@findex documentencoding
 To get the true accented characters output in Info, and not just the
-ASCII transliterations, you can use the @option{--enable-encoding}
-option to @command{makeinfo} (@pxref{makeinfo options}).
+ASCII transliterations, it is necessary to specify
+@code{@@documentencoding} with an encoding which supports the required
+characters (@pxref{documentencoding,,@code{@@documentencoding}}).
 
 @findex " @r{(umlaut accent)}
 @cindex Umlaut accent
@@ -10321,8 +10506,8 @@ option to @command{makeinfo} (@pxref{makeinfo options}).
 @cindex Hacek accent
 @cindex Check accent
 @cindex Caron accent
-@multitable {@@questiondown@{@}} {Output} {hacek/check/caron accent}
-@item Command               @tab Output         @tab What
+@multitable {@t{@@questiondown@{@}}} {Output} {hacek/check/caron accent}
+@headitem Command           @tab Output         @tab What
 @item @t{@@"o}              @tab @"o            @tab umlaut accent
 @item @t{@@'o}              @tab @'o            @tab acute accent
 @item @t{@@,@{c@}}          @tab @,{c}          @tab cedilla accent
@@ -10384,7 +10569,7 @@ commonly used in languages other than English.
 @cindex Es-zet
 @cindex Sharp S
 @cindex German S
-@multitable {x@@questiondown@{@}} {oe OE} {es-zet or sharp S}
+@multitable {@t{@@questiondown@{@}}} {oe OE} {es-zet or sharp S}
 @item @t{@@exclamdown@{@}}   @tab @exclamdown{}   @tab upside-down !
 @item @t{@@questiondown@{@}} @tab @questiondown{} @tab upside-down ?
 @item @t{@@aa@{@} @@AA@{@}}  @tab @aa{} @AA{}     @tab a,A with circle
@@ -10399,6 +10584,150 @@ commonly used in languages other than English.
 @end multitable
 
 
+@node Inserting Quotation Marks
+@section Inserting Quotation Marks
+@cindex Inserting quotation marks
+@cindex Quotation marks, inserting
+
+@cindex Quotation characters (`'), in source
+Use doubled single-quote characters to begin and end quotations:
+@w{@t{`@w{}`@dots{}'@w{}'}}.  @TeX{} converts two single quotes to
+left- and right-hand doubled quotation marks,
+@c this comes out as "like this" in Info, which is just confusing.
+@iftex
+``like this'',
+@end iftex
+and Info converts doubled single-quote characters to ASCII
+double-quotes: @w{@t{`@w{}`@dots{}'@w{}'}} becomes @w{@t{"@dots{}"}}.
+
+You may occasionally need to produce two consecutive single quotes;
+for example, in documenting a computer language such as Maxima where
+@t{'@w{}'} is a valid command.  You can do this with the input
+@t{'@@w@{@}'}; the empty @code{@@w} command stops the combination into
+the double-quote characters.
+
+@cindex Unicode quotation characters
+@cindex Grave accent, vs. left quote
+The left quote character (@t{`}, ASCII code 96) used in Texinfo is a
+grave accent in ANSI and ISO character set standards.  We use it as a
+quote character because that is how @TeX{} is set up, by default.
+
+Texinfo supports several other quotation marks used in languages other
+than English.  Below is a table with the commands Texinfo provides for
+inserting quotation marks.
+
+@findex documentencoding
+@cindex UTF-8
+@cindex ISO 8859-15
+@cindex Latin 9
+@cindex ISO 8859-1
+@cindex Latin 1
+In order to get the symbols for the quotation marks in encoded Info
+output, it is necessary to specify @code{@@documentencoding UTF-8}.
+(@xref{documentencoding,,@code{@@documentencoding}}.)  Double
+guillemets are also present in ISO 8859-1 (aka Latin@tie{}1) and ISO
+8859-15 (aka Latin@tie{}9).
+
+@cindex European Computer Modern fonts
+@cindex EC fonts
+The standard @TeX{} fonts support the usual quotation marks used in
+English (the ones produced with single and doubled ASCII
+single-quotes).  For the other quotation marks, @TeX{} uses European
+Computer Modern (EC) fonts (@file{ecrm1000} and other variants).
+These fonts are freely available, of course; you can download them
+from @url{http://@/www.ctan.org/@/tex-archive/@/fonts/ec}, among other
+places.
+
+@cindex CM-Super fonts
+The free EC fonts are bitmap fonts created with Metafont.  Especially
+for on-line viewing, Type@tie{}1 (vector) versions of the fonts are
+preferable; these are available in the CM-Super font package
+(@url{http://@/www.ctan.org/@/tex-archive/@/fonts/@/ps-type1/@/cm-super}).
+
+Both distributions include installation instructions.
+
+@cindex Single quotation marks
+@cindex Double quotation marks
+@cindex Left quotation marks
+@cindex Right quotation marks
+@findex quotedblleft
+@cindex ``
+@findex quoteleft
+@cindex `
+@findex quotedblright
+@cindex ''
+@findex quoteright
+@cindex '
+@cindex Double low-9 quotation mark
+@cindex Single low-9 quotation mark
+@findex quotedblbase
+@cindex @quotedblbase{} (double low-9 quotation mark)
+@findex quotesinglbase
+@cindex @quotesinglbase{} (single low-9 quotation mark)
+@cindex Angle quotation marks
+@cindex Guillemets
+@cindex Guillemots
+@cindex French quotation marks
+@cindex Quotation marks, French
+@cindex German quotation marks
+@cindex Quotation marks, German
+@cindex Double guillemets
+@cindex Single guillemets
+@cindex Double angle quotation marks
+@cindex Single angle quotation marks
+@cindex Left-pointing angle quotation marks
+@cindex Right-pointing angle quotation marks
+@cindex Double left-pointing angle quotation mark
+@cindex Double right-pointing angle quotation mark
+@cindex Single left-pointing angle quotation mark
+@cindex Single right-pointing angle quotation mark
+@findex guillemetleft
+@findex guillemotleft
+@cindex @guillemetleft{}
+@findex guillemetright
+@findex guillemotright
+@cindex @guillemetright{}
+@findex guilsinglleft
+@cindex @guilsinglleft{}
+@findex guilsinglright
+@cindex @guilsinglright{}
+@multitable {@t{@@quotedblright@{@} '@w{}'}} {Glyph} {Right-pointing double angle quotation mark (U+00BB)}
+@headitem Command                    @tab Glyph             @tab Unicode name (point)
+@item @verb{.@quotedblleft{} ``.}    @tab @quotedblleft{}   @tab Left double quotation mark (U+201C)
+@item @verb{.@quotedblright{} ''.}   @tab @quotedblright{}  @tab Right double quotation mark (U+201D)
+@item @verb{.@quoteleft{} `.}        @tab @quoteleft{}      @tab Left single quotation mark (U+2018)
+@item @verb{.@quoteright{} '.}       @tab @quoteright{}     @tab Right single quotation mark (U+2019)
+@item @t{@@quotedblbase@{@}}         @tab @quotedblbase{}   @tab Double low-9 quotation mark (U+201E)
+@item @t{@@quotesinglbase@{@}}       @tab @quotesinglbase{} @tab Single low-9 quotation mark (U+201A)
+@item @t{@@guillemetleft@{@}}        @tab @guillemetleft{}  @tab Left-pointing double angle quotation mark (U+00AB)
+@item @t{@@guillemetright@{@}}       @tab @guillemetright{} @tab Right-pointing double angle quotation mark (U+00BB)
+@item @t{@@guilsinglleft@{@}}        @tab @guilsinglleft{}  @tab Single left-pointing angle quotation mark (U+2039)
+@item @t{@@guilsinglright@{@}}       @tab @guilsinglright{} @tab Single right-pointing angle quotation mark (U+203A)
+@end multitable
+
+For the double angle quotation marks, Adobe and @LaTeX{} glyph names
+are also supported:  @code{@@guillemotleft} and
+@code{@@guillemotright}.  These names are actually incorrect; a
+``guillemot'' is a bird species (a type of auk).
+
+Traditions for quotation mark usage vary to a great extent between
+languages (@url{http://@/en.wikipedia.org/@/wiki/@/Quotation_mark%2C_non-English_usage@/#Overview}).
+Texinfo does not provide commands for typesetting quotation marks
+according to the numerous traditions.  Therefore, you have to choose
+the commands appropriate for the language of your manual.  Sometimes
+aliases (@pxref{alias,,@code{@@alias}}) can simplify the usage and
+make the source code more readable.  For example, in German,
+@code{@@quotedblbase} is used for the left double quote, and the right
+double quote is actually @code{@@quotedblleft}, which is
+counter-intuitive.  Thus, in this case the following aliases would be
+convenient:
+
+@example
+@@alias lgqq = quotedblbase
+@@alias rgqq = quotedblleft
+@end example
+
+
 @node Dots Bullets
 @section Inserting Ellipsis and Bullets
 @cindex Dots, inserting
@@ -10445,7 +10774,7 @@ end-of-sentence ellipsis, which has different spacing afterwards,
 Here is an ellipsis: @dots{}
 Here are three periods in a row: ...
 
-In printed output, the three periods in a row are closer together than
+In printed output, the three periods in a row are much closer together than
 the dots in the ellipsis.
 @end iftex
 
@@ -10484,6 +10813,9 @@ between the name of the command and the braces.
 @subsection @code{@@TeX}@{@} (@TeX{}) and @code{@@LaTeX}@{@} (@LaTeX{})
 @findex TeX
 @findex LaTeX
+@cindex Logos, @TeX{}
+@cindex @TeX{} logo
+@cindex @LaTeX{} logo
 
 Use the @code{@@TeX@{@}} command to generate `@TeX{}'.  In a printed
 manual, this is a special logo that is different from three ordinary
@@ -10503,6 +10835,7 @@ that they use both uppercase and lowercase letters.
 @node copyright symbol
 @subsection @code{@@copyright@{@}} (@copyright{})
 @findex copyright
+@cindex Copyright symbol
 
 Use the @code{@@copyright@{@}} command to generate the copyright
 symbol, `@copyright{}'.  Where possible, this is a @samp{c}
@@ -10512,6 +10845,7 @@ inside a circle; in Info, this is @samp{(C)}.
 @node registered symbol
 @subsection @code{@@registeredsymbol@{@}} (@registeredsymbol{})
 @findex registeredsymbol
+@cindex Registered symbol
 
 Use the @code{@@registeredsymbol@{@}} command to generate the
 registered symbol, `@registeredsymbol{}'.  Where possible, this is an
@@ -10519,15 +10853,16 @@ registered symbol, `@registeredsymbol{}'.  Where possible, this is an
 
 
 @node euro
-@section @code{@@euro}@{@} (@euro{}): Euro currency symbol
+@section @code{@@euro}@{@} (@euro{}): Euro Currency Symbol
 @findex euro
+@cindex Euro symbol
 
 Use the @code{@@euro@{@}} command to generate `@euro{}'.  Where
 possible, this is the symbol for the Euro currency, invented as part
-of the European economic unification relatively recently.  In plain
-Info, it is the word @samp{Euro }.  (The space is included in the text
-transliteration since typically there would be no space after the
-symbol, so it would be inappropriate to have a space in the source document.)
+of the European economic unification.  In plain Info, it is the word
+@samp{Euro }.  A trailing space is included in the text
+transliteration since typically no space is desired after the symbol,
+so it would be inappropriate to have a space in the source document.
 
 Texinfo cannot magically synthesize support for the Euro symbol where
 the underlying system (fonts, software, whatever) does not support
@@ -10542,19 +10877,41 @@ it is necessary to specify @code{@@documentencoding ISO-8859-15}.
 is in ISO 8859-15 (aka Latin@tie{}9), and is @emph{not} in the more
 widely-used and supported ISO 8859-1 (Latin@tie{}1).
 
+@pindex feymr10
+@cindex Euro font
+The Euro symbol does not exist in the standard @TeX{} fonts (which
+were designed before the Euro was legislated into existence).
+Therefore, @TeX{} uses an additional font, named @code{feymr10} (along
+with other variables).  It is freely available, of course; you can
+download it from @url{http://www.ctan.org/tex-archive/fonts/eurosym},
+among other places.  The distribution includes installation
+instructions.
+
 
 @node pounds
 @section @code{@@pounds}@{@} (@pounds{}): Pounds Sterling
 @findex pounds
+@cindex Pounds symbol
 
 Use the @code{@@pounds@{@}} command to generate `@pounds{}'.  Where
 possible, this is the symbol for the currency pounds sterling.  In
 Info, it is a @samp{#}.
 
 
+@node textdegree
+@section @code{@@textdegree}@{@} (@textdegree{}): Degrees Symbol
+@findex textdegree
+@cindex Degree symbol
+
+Use the @code{@@textdegree@{@}} command to generate `@textdegree{}'.
+Where possible, this is the normal symbol for degrees.  In plain text
+and Info output, it is an @samp{o}.
+
+
 @node minus
 @section @code{@@minus}@{@} (@minus{}): Inserting a Minus Sign
 @findex minus
+@cindex Minus sign
 
 @cindex Em dash, compared to minus sign
 @cindex Hyphen, compared to minus
@@ -10584,6 +10941,17 @@ an itemized list, you do not need to type the braces
 (@pxref{itemize, , @code{@@itemize}}).
 
 
+@node geq leq
+@section @code{@@geq@{@}} (@geq{}) and @code{@@leq@{@}} (@leq{}): Inserting relations
+@findex geq
+@findex leq
+
+Use the @code{@@geq@{@}} and @code{@@geq@{@}} commands to generate
+greater-than-or-equal and less-than-equal-signs, `@geq{}' and
+`@leq{}'.  In plain text and Info output, these are the ASCII
+sequences @samp{>=} and @samp{<=}.
+
+
 @node math
 @section @code{@@math}: Inserting Mathematical Expressions
 @findex math
@@ -10614,15 +10982,31 @@ command.  Write the mathematical expression between braces, like this:
 (a + b)(a + b) = a^2 + 2ab + b^2
 @end example
 
-Thus, the @code{@@math} command has no effect on the Info and HTML
-output; @command{makeinfo} just reproduces the input, it does not try
-to interpret the mathematics in any way.
+The @code{@@math} command has no special effect on the Info and HTML
+output.  @command{makeinfo} expands any @code{@@}-commands as usual,
+but it does not try to produce good mathematical formatting in any
+way.
+
+However, as far as the @TeX{} output is concerned, plain @TeX{}
+mathematical commands are allowed in @code{@@math}, starting with
+@samp{\}, and the plain @TeX{} math characters like @samp{^} and
+@samp{_} are also recognized.  In essence, @code{@@math} drops you
+into plain @TeX{} math mode.
+
+This allows you to conveniently write superscripts and subscripts (as
+in the above example), and also to use all the plain @TeX{} math
+control sequences for symbols, functions, and so on, and thus get
+proper formatting in the @TeX{} output, at least.
+
+It's best to use @samp{\} instead of @samp{@@} for any such
+mathematical commands; otherwise, @command{makeinfo} will complain.
+On the other hand, input with matching (but unescaped) braces, such as
+@samp{k_@{75@}}, is allowed inside @code{@@math}, although
+@command{makeinfo} would complain about the bare braces in regular
+input.
+
+Here's an example:
 
-@code{@@math} implies @code{@@tex}.  This not only makes it possible to
-write superscripts and subscripts (as in the above example), but also
-allows you to use any of the plain @TeX{} math control sequences.  It's
-conventional to use @samp{\} instead of @samp{@@} for these commands.
-As in:
 @example
 @@math@{\sin 2\pi \equiv \cos 3\pi@}
 @end example
@@ -10643,17 +11027,67 @@ As in:
 @findex \ @r{(literal \ in @code{@@math})}
 Since @samp{\} is an escape character inside @code{@@math}, you can use
 @code{@@\} to get a literal backslash (@code{\\} will work in @TeX{},
-but you'll get the literal @samp{\\} in Info).  @code{@@\} is not
+but you'd get the literal @samp{\\} in Info).  @code{@@\} is not
 defined outside of @code{@@math}, since a @samp{\} ordinarily produces a
 literal @samp{\}.
 
-
 @cindex Displayed equations
 @cindex Equations, displayed
 For displayed equations, you must at present use @TeX{} directly
 (@pxref{Raw Formatter Commands}).
 
 
+@node Click Sequences
+@section Click Sequences
+@cindex Click sequences
+@cindex Sequence of clicks
+@cindex GUI click sequence
+
+@findex clicksequence
+When documenting graphical interfaces, it is necessary to describe
+sequences such as `Click on @samp{File}, then choose @samp{Open}, then
+@dots{}'.  Texinfo offers commands @code{@@clicksequence} and
+@code{click} to represent this, typically used like this:
+
+@example
+@dots{} @@clicksequence@{File @@click@{@} Open@} @dots{}
+@end example
+
+@noindent
+which produces:
+
+@display
+@dots{} @clicksequence{File @click{} Open} @dots{}
+@end display
+
+@findex click
+@findex arrow
+The @code{@@click} command produces a simple right arrow (@samp{->} in
+Info) by default; this glyph is also available independently via the
+command @code{@@arrow@{@}}.
+
+@findex clickstyle
+You can change the glyph produced by @code{@@click} with the command
+@code{@@clickstyle}, which takes a command name as its single argument
+on the rest of the line, much like @code{@@itemize} and friends
+(@pxref{itemize,,@code{@@itemize}}).  The command should produce a
+glyph, and the usual empty braces @samp{@{@}} are omitted.  Here's an
+example:
+
+@example
+@@clickstyle @@result
+@dots{} @@clicksequence@{File @@click@{@} Open@} @dots{}
+@end example
+
+@noindent
+now produces:
+
+@display
+@clickstyle @result
+@dots{} @clicksequence{File @click{} Open} @dots{}
+@end display
+
+
 @node Glyphs
 @section Glyphs for Examples
 @cindex Glyphs
@@ -10666,7 +11100,7 @@ evaluation or an expansion using @samp{@result{}} or
 @samp{@expansion{}}.  Likewise, there are commands to insert glyphs
 to indicate
 printed output, error messages, equivalence of expressions, and the
-location of point.@refill
+location of point.
 
 The glyph-insertion commands do not need to be used within an example, but
 most often they are.  Every  glyph-insertion command is followed by a pair of
@@ -10762,7 +11196,7 @@ You can indicate the result of the expansion with the
 
 @iftex
 The @code{@@expansion@{@}} command is displayed as @samp{@expansion{}}
-in the printed output.  and as @samp{==>} in other formats.
+in the printed output and as @samp{==>} in other formats.
 @end iftex
 @ifnottex
 The @code{@@expansion@{@}} command is displayed as @samp{@expansion{}}
@@ -11029,6 +11463,7 @@ commands.
 * Break Commands::              Summary of break-related commands.
 * Line Breaks::                 Forcing line breaks.
 * - and hyphenation::           Helping @TeX{} with hyphenation points.
+* allowcodebreaks::             Controlling line breaks within @@code text.
 * w::                           Preventing unwanted line breaks in text.
 * tie::                         Inserting an unbreakable but varying space.
 * sp::                          Inserting blank lines.
@@ -11161,10 +11596,51 @@ put a @samp{-} at each hyphenation point.  For example:
 @@hyphenation@{man-u-script man-u-scripts@}
 @end example
 @noindent @TeX{} only uses the specified hyphenation points when the
-words match exactly, so give all necessary variants.
+words match exactly, so give all necessary variants, such as plurals.
 @end table
 
-Info output is not hyphenated, so these commands have no effect there.
+Info, HTML, and other non-@TeX{} output is not hyphenated, so none of
+these commands have any effect there.
+
+
+@node allowcodebreaks
+@section @code{@@allowcodebreaks}: Control Line Breaks in @code{@@code}
+
+@findex allowcodebreaks
+@cindex Breaks, within @code{@@code}
+@cindex -, breakpoint within @code{@@code}
+@cindex Hyphen, breakpoint within @code{@@code}
+@cindex Dash, breakpoint within @code{@@code}
+@cindex _, breakpoint within @code{@@code}
+@cindex Underscore, breakpoint within @code{@@code}
+
+Ordinarily, @TeX{} will consider breaking lines at @samp{-} and
+@samp{_} characters within @code{@@code} and related commands
+(@pxref{code,,@code{@@code}}), more or less as if they were ``empty''
+hyphenation points.
+
+This is necessary as many manuals, especially for Lisp-family
+languages, must document very long identifiers.  On the other hand,
+other manuals don't have this problems, and you may not wish to allow
+a line break at the underscore in, for example, @code{SIZE_MAX}, or
+even worse, after any of the four underscores in @code{__typeof__}.
+
+So Texinfo provides this command:
+
+@example
+@@allowcodebreaks false
+@end example
+
+@noindent to prevent @TeX{} from breaking at @samp{-} or @samp{_} within
+@code{@@code}.  You can go back to allowing such breaks with
+@code{@@allowcodebreaks true}.  Write these commands on lines by
+themselves.
+
+These commands can be given anywhere in the document.  For example,
+you may have just one problematic paragraph where you need to turn off
+the breaks, but want them in general, or vice versa.
+
+This command has no effect in Info, HTML, and other non-@TeX{} output.
 
 
 @node w
@@ -11192,7 +11668,7 @@ the width of a normal interword space:
 
 The space from @code{@@w@{@w{ }@}}, as well as being non-breakable,
 also will not stretch or shrink.  Sometimes that is what you want, for
-instance if you're doing indenting manual.  However, usually you want
+instance if you're doing manual indenting.  However, usually you want
 a normal interword space that does stretch and shrink (in the printed
 output); see the @code{@@tie} command in the next section.
 
@@ -11490,7 +11966,7 @@ produces
 
 @quotation
 @deffn Command forward-word count
-This function moves point forward @var{count} words
+This command moves point forward @var{count} words
 (or backward if @var{count} is negative). @dots{}
 @end deffn
 @end quotation
@@ -11511,7 +11987,9 @@ enclose it in braces.  For example:
 Otherwise, the second word will be mistaken for the name of the
 entity.  As a general rule, when any of the arguments in the heading
 line @emph{except} the last one are more than one word, you need to
-enclose them in braces.
+enclose them in braces.  This may also be necessary if the text
+contains commands, for example, @samp{@{declaraci@@'on@}} if you are
+writing in Spanish.
 
 Some of the definition commands are more general than others.  The
 @code{@@deffn} command, for example, is the general definition command
@@ -12782,7 +13260,7 @@ sections for more details:
 
 @table @code
 @item @@set @var{flag} [@var{value}]
-Set the variable @var{flag}, to the optional @var{value} if specifed.
+Set the variable @var{flag}, to the optional @var{value} if specified.
 
 @item @@clear @var{flag}
 Undefine the variable @var{flag}, whether or not it was previously defined.
@@ -12807,7 +13285,9 @@ is ignored.  If @var{flag} is clear, text through the following
 
 @node set value
 @subsection @code{@@set} and @code{@@value}
+@findex set
 @findex value
+@findex clear
 
 You use the @code{@@set} command to specify a value for a flag, which
 is later expanded by the @code{@@value} command.
@@ -13118,222 +13598,75 @@ supports, see @ref{Inserting Accents}.
 
 
 @node documentlanguage
-@section @code{@@documentlanguage @var{cc}}: Set the Document Language
+@section @code{@@documentlanguage @var{ll}[_@var{cc}]}: Set the Document Language
 
 @findex documentlanguage
 @cindex Language, declaring
+@cindex Locale, declaring
 @cindex Document language, declaring
 
 The @code{@@documentlanguage} command declares the current document
-language.  Write it on a line by itself, with a two-letter ISO-639
-language code following (list is included below).  If you have a
-multilingual document, the intent is to be able to use this command
-multiple times, to declare each language change.  If the command is not
-used at all, the default is @code{en} for English.
+locale.  Write it on a line by itself, near the beginning of the
+file, but after @code{@@setfilename}
+(@pxref{setfilename,,@code{@@setfilename}}).
+
+Include a two-letter ISO@tie{}639-2 language code (@var{ll}) following
+the command name, optionally followed by a two-letter ISO@tie{}3166
+two-letter country code (@var{cc}).  If you have a multilingual
+document, the intent is to be able to use this command multiple times,
+to declare each language change.  If the command is not used at all,
+the default is @code{en_US} for US English.
+
+As with GNU Gettext (@pxref{Top,,,gettext, Gettext}), if the country
+code is omitted, the main dialect is assumed where possible.  For
+example, @code{de} is equivalent to @code{de_DE} (German as spoken in
+Germany).
+
+@cindex Document strings, translation of
+For Info and other online output, this command changes the translation
+of various @dfn{document strings} such as ``see'' in cross-references
+(@pxref{Cross References}), ``Function' in defuns (@pxref{Definition
+Commands}), and so on.  Some strings, such as ``Node:'', ``Next:'',
+``Menu:'', etc., are keywords in Info output, so are not translated
+there; they are translated in other output formats.
 
 @cindex @file{txi-@var{cc}.tex}
-At present, this command is ignored in Info and HTML output.  For
-@TeX{}, it causes the file @file{txi-@var{cc}.tex} to be read (if it
-exists).  Such a file appropriately redefines the various English words
-used in @TeX{} output, such as `Chapter', `See', and so on.
+For @TeX{}, this command causes a file @file{txi-@var{locale}.tex} to
+be read (if it exists).  If @code{@@setdocumentlanguage} argument
+contains the optional @samp{_@var{cc}} suffix, this is tried first.
+For example, with @code{@@setdocumentlanguage de_DE}, @TeX{} first
+looks for @file{txi-de_DE.tex}, then @file{txi-de.tex}.
+
+Such a @file{txi-*} file is intended to redefine the various English
+words used in @TeX{} output, such as `Chapter', `See', and so on.  We
+are aware that individual words like these cannot always be translated
+in isolation, and that a very different strategy would be required for
+ideographic (among other) scripts.  Help in improving Texinfo's
+language support is welcome.
 
 @cindex Hyphenation patterns, language-dependent
-It would be good if this command also changed @TeX{}'s ideas of the
-current hyphenation patterns (via the @TeX{} primitive
-@code{\language}), but this is unfortunately not currently implemented.
+It would also be desirable for this command to also change @TeX{}'s
+ideas of the current hyphenation patterns (via the @TeX{} primitive
+@code{\language}), but this is unfortunately not currently
+implemented.
 
-@cindex ISO 639 codes
-@cindex Language codes
-Hereare the valid language codes, from ISO-639.
+In September 2006, the W3C Internationalization Activity released a
+new recommendation for specifying tags identifying language:
+@example
+@url{http://www.rfc-editor.org/rfc/bcp/bcp47.txt}
+@end example
+When Gettext supports this new scheme, Texinfo will too.
 
-@multitable @columnfractions .07 .26 .07 .26 .07 .26
-@item
-@code{aa} @tab Afar @tab
-@code{ab} @tab Abkhazian @tab
-@code{af} @tab Afrikaans
-@item
-@code{am} @tab Amharic @tab
-@code{ar} @tab Arabic @tab
-@code{as} @tab Assamese
-@item
-@code{ay} @tab Aymara @tab
-@code{az} @tab Azerbaijani @tab
-@code{ba} @tab Bashkir
-@item
-@code{be} @tab Byelorussian @tab
-@code{bg} @tab Bulgarian @tab
-@code{bh} @tab Bihari
-@item
-@code{bi} @tab Bislama @tab
-@code{bn} @tab Bengali; Bangla @tab
-@code{bo} @tab Tibetan
-@item
-@code{br} @tab Breton @tab
-@code{ca} @tab Catalan @tab
-@code{co} @tab Corsican
-@item
-@code{cs} @tab Czech @tab
-@code{cy} @tab Welsh @tab
-@code{da} @tab Danish
-@item
-@code{de} @tab German @tab
-@code{dz} @tab Bhutani @tab
-@code{el} @tab Greek
-@item
-@code{en} @tab English @tab
-@code{eo} @tab Esperanto @tab
-@code{es} @tab Spanish
-@item
-@code{et} @tab Estonian @tab
-@code{eu} @tab Basque @tab
-@code{fa} @tab Persian
-@item
-@code{fi} @tab Finnish @tab
-@code{fj} @tab Fiji @tab
-@code{fo} @tab Faroese
-@item
-@code{fr} @tab French @tab
-@code{fy} @tab Frisian @tab
-@code{ga} @tab Irish
-@item
-@code{gd} @tab Scots Gaelic @tab
-@code{gl} @tab Galician @tab
-@code{gn} @tab Guarani
-@item
-@code{gu} @tab Gujarati @tab
-@code{ha} @tab Hausa @tab
-@code{he} @tab Hebrew
-@item
-@code{hi} @tab Hindi @tab
-@code{hr} @tab Croatian @tab
-@code{hu} @tab Hungarian
-@item
-@code{hy} @tab Armenian @tab
-@code{ia} @tab Interlingua @tab
-@code{id} @tab Indonesian
-@item
-@code{ie} @tab Interlingue @tab
-@code{ik} @tab Inupiak @tab
-@code{is} @tab Icelandic
-@item
-@code{it} @tab Italian @tab
-@code{iu} @tab Inuktitut @tab
-@code{ja} @tab Japanese
-@item
-@code{jw} @tab Javanese @tab
-@code{ka} @tab Georgian @tab
-@code{kk} @tab Kazakh
-@item
-@code{kl} @tab Greenlandic @tab
-@code{km} @tab Cambodian @tab
-@code{kn} @tab Kannada
-@item
-@code{ks} @tab Kashmiri @tab
-@code{ko} @tab Korean @tab
-@code{ku} @tab Kurdish
-@item
-@code{ky} @tab Kirghiz @tab
-@code{la} @tab Latin @tab
-@code{ln} @tab Lingala
-@item
-@code{lt} @tab Lithuanian @tab
-@code{lo} @tab Laothian @tab
-@code{lv} @tab Latvian, Lettish
-@item
-@code{mg} @tab Malagasy @tab
-@code{mi} @tab Maori @tab
-@code{mk} @tab Macedonian
-@item
-@code{ml} @tab Malayalam @tab
-@code{mn} @tab Mongolian @tab
-@code{mo} @tab Moldavian
-@item
-@code{mr} @tab Marathi @tab
-@code{ms} @tab Malay @tab
-@code{mt} @tab Maltese
-@item
-@code{my} @tab Burmese @tab
-@code{na} @tab Nauru @tab
-@code{ne} @tab Nepali
-@item
-@code{nl} @tab Dutch @tab
-@code{no} @tab Norwegian @tab
-@code{oc} @tab Occitan
-@item
-@code{om} @tab (Afan) Oromo @tab
-@code{or} @tab Oriya @tab
-@code{pa} @tab Punjabi
-@item
-@code{pl} @tab Polish @tab
-@code{ps} @tab Pashto, Pushto @tab
-@code{pt} @tab Portuguese
-@item
-@code{qu} @tab Quechua @tab
-@code{rm} @tab Rhaeto-Romance @tab
-@code{rn} @tab Kirundi
-@item
-@code{ro} @tab Romanian @tab
-@code{ru} @tab Russian @tab
-@code{rw} @tab Kinyarwanda
-@item
-@code{sa} @tab Sanskrit @tab
-@code{sd} @tab Sindhi @tab
-@code{sg} @tab Sangro
-@item
-@code{sh} @tab Serbo-Croatian @tab
-@code{si} @tab Sinhalese @tab
-@code{sk} @tab Slovak
-@item
-@code{sl} @tab Slovenian @tab
-@code{sm} @tab Samoan @tab
-@code{sn} @tab Shona
-@item
-@code{so} @tab Somali @tab
-@code{sq} @tab Albanian @tab
-@code{sr} @tab Serbian
-@item
-@code{ss} @tab Siswati @tab
-@code{st} @tab Sesotho @tab
-@code{su} @tab Sundanese
-@item
-@code{sv} @tab Swedish @tab
-@code{sw} @tab Swahili @tab
-@code{ta} @tab Tamil
-@item
-@code{te} @tab Telugu @tab
-@code{tg} @tab Tajik @tab
-@code{th} @tab Thai
-@item
-@code{ti} @tab Tigrinya @tab
-@code{tk} @tab Turkmen @tab
-@code{tl} @tab Tagalog
-@item
-@code{tn} @tab Setswana @tab
-@code{to} @tab Tonga @tab
-@code{tr} @tab Turkish
-@item
-@code{ts} @tab Tsonga @tab
-@code{tt} @tab Tatar @tab
-@code{tw} @tab Twi
-@item
-@code{ug} @tab Uighur @tab
-@code{uk} @tab Ukrainian @tab
-@code{ur} @tab Urdu
-@item
-@code{uz} @tab Uzbek @tab
-@code{vi} @tab Vietnamese @tab
-@code{vo} @tab Volapuk
-@item
-@code{wo} @tab Wolof @tab
-@code{xh} @tab Xhosa @tab
-@code{yi} @tab Yiddish
-@item
-@code{yo} @tab Yoruba @tab
-@code{za} @tab Zhuang @tab
-@code{zh} @tab Chinese
-@item
-@code{zu} @tab Zulu
-@end multitable
+@cindex ISO 639-2 language codes
+@cindex ISO 3166 country codes
+@cindex Language codes
+@cindex Country codes
+Since the lists of language codes and country codes are quite dynamic,
+we don't attempt to list them here.  The valid language codes are on
+the official home page for ISO@tie{}639,
+@url{http://www.loc.gov/standards/iso639-2/}.  The country codes and
+the official web site for ISO@tie{}3166 can be found via
+@url{http://en.wikipedia.org/wiki/ISO_3166}.
 
 
 @node documentencoding
@@ -13347,7 +13680,8 @@ Hereare the valid language codes, from ISO-639.
 
 The @code{@@documentencoding} command declares the input document
 encoding.  Write it on a line by itself, with a valid encoding
-specification following.
+specification following, near the beginning of the file but after
+@code{@@setfilename} (@pxref{setfilename,,@code{@@setfilename}}).
 
 At present, Texinfo supports only these encodings:
 
@@ -13355,6 +13689,11 @@ At present, Texinfo supports only these encodings:
 @item US-ASCII
 This has no particular effect, but it's included for completeness.
 
+@itemx UTF-8
+The vast global character encoding, expressed in 8-bit bytes.
+The Texinfo processors have no deep knowledge of Unicode; for the most
+part, they just pass along the input they are given to the output.
+
 @itemx ISO-8859-1
 @itemx ISO-8859-15
 @item ISO-8859-2
@@ -13362,10 +13701,17 @@ These specify the standard encodings for Western European (the first
 two) and Eastern European languages (the third), respectively.  ISO
 8859-15 replaces some little-used characters from 8859-1 (e.g.,
 precomposed fractions) with more commonly needed ones, such as the
-Euro symbol.
+Euro symbol (@euro{}).
 
 A full description of the encodings is beyond our scope here;
 one useful reference is @uref{http://czyborra.com/charsets/iso8859.html}.
+
+@item koi8-r
+This is the commonly used encoding for the Russian language.
+
+@item koi8-u
+This is the commonly used encoding for the Ukrainian language.
+
 @end table
 
 Specifying an encoding @var{enc} has the following effects:
@@ -13373,7 +13719,7 @@ Specifying an encoding @var{enc} has the following effects:
 @opindex --enable-encoding
 @cindex Local Variables: section, for encoding
 @cindex Info output, and encoding
-In Info output, if the option @option{--enable-encoding} is given
+In Info output, unless the option @option{--disable-encoding} is given
 to @command{makeinfo}, a so-called `Local Variables' section
 (@pxref{File Variables,,,emacs,The GNU Emacs Manual}) is output
 including @var{enc}.  This allows Info readers to set the encoding
@@ -13385,6 +13731,11 @@ coding: @var{enc}
 End:
 @end example
 
+Also, in Info and plain text output (barring
+@option{--disable-encoding}), accent constructs and special
+characters, such as @code{@@'e}, are output as the actual 8-bit
+character in the given encoding.
+
 @cindex HTML output, and encodings
 @cindex @code{http-equiv}, and charset specification
 @cindex @code{<meta>} HTML tag, and charset specification
@@ -13398,7 +13749,19 @@ used to display the page, if supported by the system.
      charset=@var{enc}">
 @end example
 
-In all other cases, it is recognized but ignored.
+In split HTML output, if @option{--transliterate-file-names} is
+given (@pxref{HTML Xref 8-bit Character Expansion}), the names of HTML
+files are formed by transliteration of the corresponding node names,
+using the specified encoding. 
+
+In XML and Docbook output, the given document encoding is written in
+the output file as usual with those formats.
+
+In @TeX{} output, the characters which are supported in the standard
+Computer Modern fonts are output accordingly.  (For example, this
+means using constructed accents rather than precomposed glyphs.)
+Using a missing character generates a warning message, as does
+specifying an unimplemented encoding.
 
 
 @node Defining New Texinfo Commands
@@ -13578,16 +13941,78 @@ No arguments here.
 @end display
 
 @cindex Comma, in macro arguments
+Passing strings containing commas as macro arguments requires special
+care, since they should be properly @dfn{quoted} to prevent
+@command{makeinfo} from confusing them with argument separators.  To
+manually quote a comma, prepend it with a backslash character, like
+this: @code{\,}.  Alternatively, use the @code{@@comma} command
+(@pxref{Inserting a Comma}).  However, to facilitate use of macros,
+@command{makeinfo} implements a set of rules called @dfn{automatic
+quoting}:
+
+@enumerate 1
+@item If a macro takes only one argument, all commas in its invocation
+are quoted by default.  For example:
+
+@example
+@group
+@@macro FIXME@{text@}
+@@strong@{FIXME: \text\@}
+@@end macro
+
+@@FIXME@{A nice feature, though it can be dangerous.@}
+@end group
+@end example
+
+@noindent
+will produce the following output
+
+@example
+@strong{FIXME: A nice feature, though it can be dangerous.}
+@end example
+
+And indeed, it can.  Namely, @command{makeinfo}
+does not control number of arguments passed to one-argument
+macros, so be careful when you invoke them.
+
+@item If a macro invocation includes another command (including a
+recursive invocation of itself), any commas in the nested command
+invocation(s) are quoted by default.  For example, in
+
+@example
+@@say@{@@strong@{Yes, I do@}, person one@}
+@end example
+
+the comma after @samp{Yes} is implicitly quoted.  Here's another
+example, with a recursive macro:
+
+@example
+@group
+@@rmacro cat@{a,b@}
+\a\\b\
+@@end rmacro
+
+@@cat@{@@cat@{foo, bar@}, baz@}
+@end group
+@end example
+
+@noindent
+will produce the string @samp{foobarbaz}.
+
+@item Otherwise, a comma should be explicitly quoted, as above, to be
+treated as a part of an argument.
+@end enumerate
+
 @cindex Braces, in macro arguments
-To insert a comma, brace, or backslash in an argument, prepend a
-backslash, as in
+Other characters that need to be quoted in macro arguments are
+curly braces and backslash.  For example
 
 @example
 @@@var{macname} @{\\\@{\@}\,@}
 @end example
 
 @noindent
-which will pass the (almost certainly error-producing) argument
+will pass the (almost certainly error-producing) argument
 @samp{\@{@},} to @var{macname}.  However, commas in parameters, even
 if escaped by a backslash, might cause trouble in @TeX{}.
 
@@ -13827,7 +14252,7 @@ follow the command name with two commas in a row; otherwise, the Info
 formatting commands will naturally misinterpret the end delimiter string
 you intended as the start delimiter string.
 
-If you do a @code{@@definfoenclose} on the name of a pre-defined macro
+If you do a @code{@@definfoenclose} on the name of a predefined macro
 (such as @code{@@emph}, @code{@@strong}, @code{@@t}, or @code{@@i}), the
 enclosure definition will override the built-in definition.
 
@@ -14092,31 +14517,72 @@ MS-DOS and perhaps in other circumstances, you may need to run @samp{sh
 texi2dvi foo.texi} instead of relying on the operating system to invoke
 the shell on the @samp{texi2dvi} script.
 
-Perhaps the most useful option to @code{texi2dvi} is
-@samp{--command=@var{cmd}}.  This inserts @var{cmd} on a line by itself
-after the @code{@@setfilename} in a temporary copy of the input file
-before running @TeX{}.  With this, you can specify different printing
+@opindex --command @r{(@command{texi2dvi})}
+One useful option to @code{texi2dvi} is @samp{--command=@var{cmd}}.
+This inserts @var{cmd} on a line by itself after the
+@code{@@setfilename} in a temporary copy of the input file before
+running @TeX{}.  With this, you can specify different printing
 formats, such as @code{@@smallbook} (@pxref{smallbook}),
 @code{@@afourpaper} (@pxref{A4 Paper}), or @code{@@pagesizes}
 (@pxref{pagesizes}), without actually changing the document source.
 (You can also do this on a site-wide basis with @file{texinfo.cnf};
 @pxref{Preparing for TeX,,Preparing for @TeX{}}).
 
+@opindex --pdf @r{(@command{texi2dvi})}
 With the @option{--pdf} option, @command{texi2dvi} produces PDF output
 instead of DVI (@pxref{PDF Output}), by running @command{pdftex}
 instead of @command{tex}.  Alternatively, the command
-@command{texi2pdf} is an abbreviation for running @samp{texi2dvi --pdf}.
+@command{texi2pdf} is an abbreviation for running @samp{texi2dvi
+--pdf}.  The command @command{pdftexi2dvi} is also supported as a
+convenience to AUC-@TeX{} users, since the latter merely prepends
+@samp{pdf} to DVI producing tools to have PDF producing tools.
 
 @cindex @LaTeX{}, processing with @command{texi2dvi}
 @command{texi2dvi} can also be used to process @LaTeX{} files; simply
 run @samp{texi2dvi filename.ext}.
 
+@opindex --language @r{(@command{texi2dvi})}
+Normally @command{texi2dvi} is able to guess the input file language
+by its contents and file name suffix. If, however, it fails to do so
+you can specify the input language using
+@option{--language=@var{lang}} command line option, where @var{lang}
+is either @samp{latex} or @samp{texinfo}.
+
 @command{texi2dvi} will use @command{etex} (or @command{pdfetex}) if
 they are available; these extended versions of @TeX{} are not
 required, and the DVI (or PDF) output is identical, but they simplify
 the @TeX{} programming in some cases, and provide additional tracing
 information when debugging @file{texinfo.tex}.
 
+@opindex --translate-file @r{(@command{texi2dvi})}
+Several options are provided for handling documents, written in
+character sets other than ASCII. The
+@option{--translate-file=@var{file}} option instructs
+@command{texi2dv} to translate input into internal @TeX{} character
+set using @dfn{translation file} @var{file} (@pxref{TCX files, TCX
+files, TCX files: Character translations, web2c, Web2c: A @TeX{}
+implementation}).
+
+@opindex --recode @r{(@command{texi2dvi})}
+The options @option{--recode} and @option{--recode-from=@var{enc}}
+allow conversion of an input document before running @TeX{}. The
+@option{--recode} option recodes the document from encoding specified
+by @samp{@@documentencoding} command
+(@pxref{documentencoding,,@code{documentencoding}}) to plain 7-bit
+@samp{texinfo} encoding.
+
+@opindex --recode-from @r{(@command{texi2dvi})}
+The option @option{--recode-from=@var{enc}} recodes the document from
+@var{enc} encoding to the encoding specified by
+@samp{@@documentencoding}. This is useful, for example, if the
+document is written in @samp{UTF-8} encoding and an equivalent 8-bit
+encoding is supported by @command{makeinfo}.
+
+Both @option{--recode} and @option{--recode-from=@var{enc}} use
+@command{recode} utility to perform the conversion. If
+@command{recode} fails to process the file, @command{texi2dvi} prints
+a warning and continues using unmodified input file.
+
 For a list of other options, run @samp{texi2dvi --help}.
 
 
@@ -14440,9 +14906,18 @@ Also, you should install @file{epsf.tex}, if it is not already installed
 from another distribution.  More details are at the end of the description
 of the @code{@@image} command (@pxref{Images}).
 
-@pindex pdfcolor.tex@r{, installing}
-Likewise for @file{pdfcolor.tex}, if it is not already installed and you
-use pdftex.
+@cindex European Computer Modern fonts, installing
+@cindex EC fonts, installing
+@cindex CM-Super fonts, installing
+To be able to use quotation marks other than those used in English
+you'll need to install European Computer Modern fonts and optionally
+CM-Super fonts, unless they are already installed (@pxref{Inserting
+Quotation Marks}).
+
+@pindex feymr10@r{, installing}
+@cindex Euro font, installing
+If you intend to use the @code{@@euro} command, you should install the
+Euro font, if it is not already installed.  @xref{euro}.
 
 @pindex texinfo.cnf @r{installation}
 @cindex Customizing of @TeX{} for Texinfo
@@ -14524,6 +14999,7 @@ redumping.)  You can do this by running this command, assuming
 initex texinfo @@dump
 @end example
 
+@noindent
 (@code{dump} is a @TeX{} primitive.)  Then, move @file{texinfo.fmt} to
 wherever your @code{.fmt} files are found; typically, this will be in the
 subdirectory @file{web2c} of your @TeX{} installation.
@@ -14782,12 +15258,12 @@ magnifications.  Be prepared to experiment.
 
 @pindex pdftex
 The simplest way to generate PDF output from Texinfo source is to run
-the convenience script @command{texi2pdf}; this simply executes the
-@command{texi2dvi} script with the @option{--pdf} option
-(@pxref{Format with texi2dvi}).  If for some reason you want to
-process by hand, simply run the @command{pdftex} program instead of
-plain @command{tex}.  That is, run @samp{pdftex foo.texi} instead of
-@samp{tex foo.texi}.
+the convenience script @command{texi2pdf} (or @command{pdftexi2dvi});
+this simply executes the @command{texi2dvi} script with the
+@option{--pdf} option (@pxref{Format with texi2dvi}).  If for some
+reason you want to process the document by hand, simply run the
+@command{pdftex} program instead of plain @command{tex}.  That is, run
+@samp{pdftex foo.texi} instead of @samp{tex foo.texi}.
 
 @dfn{PDF} stands for `Portable Document Format'. It was invented by
 Adobe Systems some years ago for document interchange, based on their
@@ -14844,8 +15320,8 @@ Code CD-ROM suitable for printing Texinfo manuals.  To order it, contact:
 @display
 @group
 Free Software Foundation, Inc.
-59 Temple Place Suite 330
-Boston, MA @ @ 02111-1307
+51 Franklin St, Fifth Floor
+Boston, MA @ @ 02110-1301
 USA
 Telephone: @w{+1-617-542-5942}
 Fax: (including Japan) @w{+1-617-542-2652}
@@ -14993,15 +15469,34 @@ style sheets specifications, in the @samp{<style>} block of the HTML
 output.  @xref{HTML CSS}.  If @var{file} is @samp{-}, read standard
 input.
 
+@item --css-ref=@var{url}
+@opindex --css-ref
+In HTML mode, add a @samp{<link>} tag to the HTML output which
+references a cascading style sheet at @var{url}. This allows using
+standalone style sheets.
+
+@item --disable-encoding
+@itemx --enable-encoding
+@opindex --disable-encoding
+@opindex --enable-encoding
+By default, or with @option{--enable-encoding}, output accented and
+special characters in Info or plain text output based on
+@samp{@@documentencoding}.  With @option{--disable-encoding}, 7-bit
+ASCII transliterations are output.
+@xref{documentencoding,,@code{documentencoding}}, and @ref{Inserting
+Accents}.
+
 @item --docbook
 @opindex --docbook
 Generate Docbook output rather than Info.
 
-@item --enable-encoding
-@opindex --enable-encoding
-Output accented and special characters in Info or plain text output
-based on @samp{@@documentencoding}.
-@xref{documentencoding,,@code{documentencoding}}, and @ref{Inserting Accents}.
+@item --document-language=@var{lang}
+@opindex --document-language
+@vindex LANG
+Use @var{lang} to translate Texinfo keywords which end up in the
+output document.  The default is the locale specified by the
+@code{@@documentlanguage} command if there is one
+(@pxref{documentlanguage}).
 
 @item --error-limit=@var{limit}
 @itemx -e @var{limit}
@@ -15212,19 +15707,15 @@ Delete any existing indentation.
 Indent each paragraph by @var{num} spaces.
 @end table
 
-@item --reference-limit=@var{limit}
-@itemx -r @var{limit}
-@opindex --reference-limit=@var{limit}
-@opindex -r @var{limit}
-Set the value of the number of references to a node that
-@code{makeinfo} will make without reporting a warning.  If a node has more
-than this number of references in it, @code{makeinfo} will make the
-references but also report a warning.  The default is 1000.
-
 @item --split-size=@var{num}
 @opindex --split-size=@var{num}
 Keep Info files to at most @var{num} characters; default is 300,000.
 
+@item --transliterate-file-names
+@opindex --transliterate-file-names
+Enable transliteration of 8-bit characters in node names for the
+purpose of file name creation. @xref{HTML Xref 8-bit Character Expansion}.
+
 @item -U @var{var}
 Cause @var{var} to be undefined.  This is equivalent to
 @code{@@clear @var{var}} in the Texinfo file (@pxref{set clear value}).
@@ -15893,6 +16384,16 @@ the beginning of the Texinfo input, before the first @code{@@node}
 command.  If you use them later on in the input, @code{install-info}
 will not notice them.
 
+@code{install-info} will automatically reformat the description of the
+menu entries it is adding.  As a matter of convention, the description
+of the main entry (above, @samp{The GNU documentation format}) should
+start at column 32, starting at zero (as in
+@code{what-cursor-position} in Emacs).  This will make it align with
+most others.  Description for individual utilities best start in
+column 48, where possible.  For more information about formatting see
+the @samp{--calign}, @samp{--align}, and @samp{--max-width} options in
+@ref{Invoking install-info}.
+
 If you use @code{@@dircategory} more than once in the Texinfo source,
 each usage specifies the `current' category; any subsequent
 @code{@@direntry} commands will add to that category.
@@ -15932,7 +16433,8 @@ traditional @command{man} system.
 
 @code{install-info} inserts menu entries from an Info file into the
 top-level @file{dir} file in the Info system (see the previous sections
-for an explanation of how the @file{dir} file works).  It's most often
+for an explanation of how the @file{dir} file works).  @code{install-info} 
+also removes menu entries from the @file{dir} file.  It's most often
 run as part of software installation, or when constructing a @file{dir} file
 for all manuals on a system.  Synopsis:
 
@@ -15961,23 +16463,56 @@ open @file{@var{dir-file}.gz}.
 Options:
 
 @table @code
+@item --add-once
+Specifies that the entry or entries will only be put into a single section.
+
+@item --align=@var{column}
+@opindex --align=@var{column}
+Specifies the column that the second and subsequent lines of menu entry's 
+description will be formatted to begin at.  The default for this option is 
+@samp{35}.  It is used in conjunction with the @samp{--max-width} option.
+@var{column} starts counting at 1.
+
+@item --append-new-sections
+Instead of alphabetizing new sections, place them at the end of the DIR file.
+
+@item --calign=@var{column}
+@opindex --calign=@var{column}
+Specifies the column that the first line of menu entry's description will 
+be formatted to begin at.  The default for this option is @samp{33}.  It is 
+used in conjunction with the @samp{--max-width} option.
+When the name of the menu entry exceeds this column, entry's description 
+will start on the following line.
+@var{column} starts counting at 1.
+
+@item --debug
+@opindex --debug
+Report what is being done.
+
 @item --delete
 @opindex --delete
 Delete the entries in @var{info-file} from @var{dir-file}.  The file
 name in the entry in @var{dir-file} must be @var{info-file} (except for
 an optional @samp{.info} in either one).  Don't insert any new entries.
+Any empty sections that result from the removal are also removed.
+
+@item --description=@var{text}
+@opindex --description=@var{text}
+Specify the explanatory portion of the menu entry.  If you don't specify
+a description (either via @samp{--entry}, @samp{--item} or this option),
+the description is taken from the Info file itself.
 
 @item --dir-file=@var{name}
-@itemx -d @var{name}
 @opindex --dir-file=@var{name}
-@opindex -d @var{name}
 Specify file name of the Info directory file.  This is equivalent to
 using the @var{dir-file} argument.
 
+@item --dry-run
+@opindex --dry-run
+Same as @samp{--test}.
+
 @item --entry=@var{text}
-@itemx -e @var{text}
 @opindex --entry=@var{text}
-@opindex -e @var{text}
 Insert @var{text} as an Info directory entry; @var{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
@@ -15985,54 +16520,119 @@ added.  If you don't specify any entries, they are determined from
 information in the Info file itself.
 
 @item --help
-@itemx -h
 @opindex --help
-@opindex -h
-Display a usage message listing basic usage and all available options,
+Display a usage message with basic usage and all available options,
 then exit successfully.
 
 @item --info-file=@var{file}
-@itemx -i @var{file}
 @opindex --info-file=@var{file}
-@opindex -i @var{file}
-Specify Info file to install in the directory.
-Equivalent to using the @var{info-file} argument.
+Specify Info file to install in the directory.  This is
+equivalent to using the @var{info-file} argument.
 
 @item --info-dir=@var{dir}
-@itemx -D @var{dir}
 @opindex --info-dir=@var{dir}
-@opindex -D @var{dir}
 Specify the directory where the directory file @file{dir} resides.
 Equivalent to @samp{--dir-file=@var{dir}/dir}.
 
+@item --infodir=@var{dir}
+@opindex --infodir=@var{dir}
+Same as @samp{--info-dir}.
+
 @item --item=@var{text}
 @opindex --item=@var{text}
 Same as @samp{--entry=@var{text}}.  An Info directory entry is actually
 a menu item.
 
+@item --keep-old
+@opindex --keep-old
+Do not replace pre-existing menu entries.  When @samp{--remove} is specified, 
+this option means that empty sections are not removed.
+
+@item --max-width=@var{column}
+@opindex --max-width=@var{column}
+Specifies the column that the menu entry's description will be word-wrapped
+at.  @var{column} starts counting at 1.
+
+@item --maxwidth=@var{column}
+@opindex --maxwidth=@var{column}
+Same as @samp{--max-width}.
+
+@item --menuentry=@var{text}
+@opindex --menuentry=@var{text}
+Same as @samp{--name}.
+
+@item --name=@var{text}
+@opindex --name=@var{text}
+Specify the name portion of the menu entry.  If the @var{text} does not start
+with an asterisk @samp{*}, it is presumed to be the text after the @samp{*} 
+and before the parentheses that specify the Info file.  Otherwise @var{text} 
+is taken verbatim, and is meant to include the text up to and including the 
+first dot @samp{.}.  If you don't specify the name (either via @samp{--entry}, 
+@samp{--item} or this option), it is taken from the Info file itself.  If 
+the Info does not contain the name, the basename of the Info file is used.
+
+@item --no-indent
+@opindex --no-indent
+Suppress formatting of new entries into the @file{dir} file.
+
 @item --quiet
 @opindex --quiet
-Suppress warnings.
+@itemx --silent
+@opindex --silent
+Suppress warnings, etc., for silent operation.
 
 @item --remove
-@itemx -r
 @opindex --remove
-@opindex -r
 Same as @samp{--delete}.
 
+@item --remove-exactly
+@opindex --remove-exactly
+Also like @samp{--delete}, but only entries if the Info file name
+matches exactly; @code{.info} and/or @code{.gz} suffixes are
+@emph{not} ignored.
+
 @item --section=@var{sec}
-@itemx -s @var{sec}
 @opindex --section=@var{sec}
-@opindex -s @var{sec}
 Put this file's entries in section @var{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.
+information in the Info file itself.  If the Info file doesn't specify
+a section, the menu entries are put into the Miscellaneous section.
+
+@item --section @var{regex} @var{sec}
+@opindex --section @var{regex} @var{sec}
+Same as @samp{--regex=@var{regex} --section=@var{sec} --add-once}.
+
+@code{install-info} tries to detect when this alternate syntax is used, 
+but does not always guess correctly!  Here is the heuristic that 
+@code{install-info} uses:
+@enumerate
+@item
+If the second argument to @code{--section} starts with a hyphen, the original syntax is presumed.
+@item
+If the second argument to @code{--section} is a file that can be opened, the original syntax is presumed
+@item
+Otherwise the alternate syntax is used.
+@end enumerate
+
+When heuristic fails because your section title starts with a hyphen, or it 
+happens to be a filename that can be opened, the syntax should be changed 
+to @samp{--regex=@var{regex} --section=@var{sec} --add-once}.
+
+
+@item --regex=@var{regex}
+@opindex  --regex=@var{regex}
+Put this file's entries into any section that matches @var{regex}.  If
+more than one section matches, all of the entries are added in each of the
+sections.  Specify @var{regex} using basic regular expression syntax, more 
+or less as used with @command{grep}, for example.
+
+@item --test
+@opindex --test
+Suppress updating of the directory file.
 
 @item --version
-@itemx -V
 @opindex --version
-@opindex -V
 @cindex Version number, for install-info
 Display version information and exit successfully.
 
@@ -16165,11 +16765,18 @@ and to use the `inherited' font (generally a regular roman typeface)
 for both @code{@@smalldisplay} and @code{@@display}.  By default, the
 HTML @samp{<pre>} command uses a monospaced font.
 
-You can influence the CSS in the HTML output with the
-@option{--css-include=@var{file}} option to @command{makeinfo}.  This
-includes the contents @var{file} in the HTML output, as you might
-expect.  However, the details are somewhat tricky, as described in the
-following, to provide maximum flexibility.
+You can influence the CSS in the HTML output with two
+@command{makeinfo} options: @option{--css-include=@var{file}} and
+@option{--css-ref=@var{url}}.
+
+The option @option{--css-ref=@var{url}} adds to each output HTML file
+a @samp{<link>} tag referencing a CSS at the given @var{url}. This
+allows using external style sheets.
+
+The option @option{--css-include=@var{file}} includes the contents
+@var{file} in the HTML output, as you might expect.  However, the
+details are somewhat tricky, as described in the following, to provide
+maximum flexibility. 
 
 @cindex @@import specifications, in CSS files
 The CSS file may begin with so-called @samp{@@import} directives,
@@ -16290,9 +16897,10 @@ HTML links, the @samp{http://localhost/} could be omitted entirely.
 The @var{dir} and @var{file} parts are more complicated, and depend on
 the relative split/mono nature of both the manual being processed and
 the manual that the cross-reference refers to.  The underlying idea is
-that there is one directory for Texinfo manuals in HTML, and each
-manual is either available as a monolithic file @file{manual.html}, or a
-split subdirectory @file{manual/*.html}.  Here are the cases:
+that there is one directory for Texinfo manuals in HTML, and a given
+@var{manual} is either available as a monolithic file
+@file{@var{manual}.html}, or a split subdirectory
+@file{@var{manual}/*.html}.  Here are the cases:
 
 @itemize @bullet
 @item
@@ -16501,9 +17109,9 @@ according to the other rules.
 @item @code{@@minus}            @tab U+2212
 @item @code{@@ordf}             @tab U+00AA
 @item @code{@@ordm}             @tab U+00BA
-@item @code{@@point}            @tab U+2217
+@item @code{@@point}            @tab U+2605
 @item @code{@@pounds}           @tab U+00A3
-@item @code{@@print}            @tab @samp{-|}
+@item @code{@@print}            @tab U+22A3
 @item @code{@@questiondown}     @tab U+00BF
 @item @code{@@registeredsymbol} @tab U+00AE
 @item @code{@@result}           @tab U+21D2
@@ -16531,6 +17139,7 @@ Any other command is an error, and the result is unspecified.
 @cindex HTML cross-reference 8-bit character expansion
 @cindex 8-bit characters, in HTML cross-references
 @cindex Expansion of 8-bit characters in HTML cross-references
+@cindex Transliteration of 8-bit characters in HTML cross-references
 
 Usually, characters other than plain 7-bit ASCII are transformed into
 the corresponding Unicode code point(s) in Normalization Form C, which
@@ -16561,6 +17170,19 @@ point is 0x10ffff, this is sufficient.  (We felt it was better to
 define this extra escape than to always use six hex digits, since the
 first two would nearly always be zeros.)
 
+This method works fine if the node name consists mostly of ASCII
+characters and contains only few 8-bit ones. If the document is
+written in a language whose script is not based on the Latin alphabet
+(such as, e.g. Ukrainian), it will create file names consisting
+entirely of @samp{_@var{xxxx}} notations, which is inconvenient.
+
+To handle such cases, @command{makeinfo} offers
+@option{--transliterate-file-names} command line option. This option
+enables @dfn{transliteration} of node names into ASCII characters for
+the purposes of file name creation and referencing. The
+transliteration is based on phonetic principle, which makes the
+produced file names easily readable.
+
 For the definition of Unicode Normalization Form C, see Unicode report
 UAX#15, @uref{http://www.unicode.org/reports/tr15/}.  Many related
 documents and implementations are available elsewhere on the web.
@@ -16697,11 +17319,9 @@ end-of-sentence capital letter).  @xref{Ending a Sentence}.
 Produces no output, but allows a line break.  @xref{Line Breaks}.
 
 @item @@:
-Indicate to @TeX{} that an immediately preceding period, question
-mark, exclamation mark, or colon does not end a sentence.  Prevent
-@TeX{} from inserting extra whitespace as it does at the end of a
-sentence.  The command has no effect on the Info file output.
-@xref{Not Ending a Sentence}.
+Tell @TeX{} to refrain from inserting extra whitespace after an
+immediately preceding period, question mark, exclamation mark, or
+colon, as @TeX{} normally would.  @xref{Not Ending a Sentence}.
 
 @item @@=
 Generate a macron (bar) accent over the next character, as in @=o.
@@ -16797,10 +17417,14 @@ title appears in the table of contents of a printed manual.  In Info,
 the title is underlined with periods.  @xref{subsubsection,, The
 `subsub' Commands}.@refill
 
+@item @@arrow@{@}
+Produce a normal right arrow glyph: @samp{@arrow{}}.  Used by default
+for @code{@@click}.  @xref{Click Sequences}.
+
 @item @@asis
 Used following @code{@@table}, @code{@@ftable}, and @code{@@vtable} to
 print the table's first column without highlighting (``as is'').
-@xref{Two-column Tables, , Making a Two-column Table}.@refill
+@xref{Two-column Tables}.
 
 @item @@author @var{author}
 Typeset @var{author} flushleft and underline it.  @xref{title
@@ -16864,6 +17488,18 @@ Defining the Entries of an Index}.@refill
 Highlight the name of a book or other reference that lacks a
 companion Info file.  @xref{cite, , @code{@@cite}}.@refill
 
+@item @@click@{@}
+Represent a single ``click'' in a GUI.  Used within
+@code{@@clicksequence}.  @xref{Click Sequences}.
+
+@item @@clicksequence@{@var{action} @@click@{@} @var{action}@}
+Represent a sequence of clicks in a GUI.  @xref{Click Sequences}.
+
+@item @@clickstyle @@@var{cmd}
+Execute @@@var{cmd} for each @code{@@click}; the default is
+@code{@@arrow}.  The usual following empty braces on @@@var{cmd} are
+omitted.  @xref{Click Sequences}.
+
 @item @@clear @var{flag}
 Unset @var{flag}, preventing the Texinfo formatting commands from
 formatting text between subsequent pairs of @code{@@ifset @var{flag}}
@@ -16900,8 +17536,8 @@ Generate the copyright symbol @copyright{}.  @xref{copyright symbol,,
 
 @ignore
 @item @@ctrl@{@var{ctrl-char}@}
-Describe an @sc{ascii} control character.  Insert actual control character
-into Info file.  @xref{ctrl, , @code{@@ctrl}}.@refill
+Describe an ASCII control character.  Insert actual control character
+into Info file.  @xref{ctrl, , @code{@@ctrl}}.
 @end ignore
 
 @item @@defcodeindex @var{index-name}
@@ -17214,6 +17850,9 @@ index of functions.  Pair with @code{@@end ftable}.  The same as
 @code{@@table}, except for indexing.  @xref{ftable vtable, ,
 @code{@@ftable} and @code{@@vtable}}.@refill
 
+@item @@geq@{@}
+Generate a greater-than-or-equal sign, `@geq{}'.  @xref{geq leq}.
+
 @item @@group
 Hold text together that must appear on one printed page.  Pair with
 @code{@@end group}.  Not relevant to Info.  @xref{group, ,
@@ -17267,7 +17906,7 @@ resp.@: @code{@@end ifhtml} resp.@: @code{@@end ifinfo}.
 @itemx @@ifnotxml
 Begin a stretch of text that will be ignored in one output format but
 not the others.  The text appears in the formats not specified:
-@code{@@ifnothtml} text is omitted from html output, etc.  The exception
+@code{@@ifnothtml} text is omitted from HTML output, etc.  The exception
 is @code{@@ifnotinfo} text, which is omitted from plain text output as
 well as Info output.  Pair with the corresponding @code{@@end
 ifnot@var{format}}.  @xref{Conditionals}.
@@ -17360,6 +17999,9 @@ respectively: @L{}, @l{}.
 @item @@LaTeX@{@}
 Insert the logo @LaTeX{}.  @xref{tex, , @TeX{} and @LaTeX{}}.
 
+@item @@leq@{@}
+Generate a less-than-or-equal sign, `@leq{}'.  @xref{geq leq}.
+
 @item @@lisp
 Begin an example of Lisp code.  Indent text, do not fill, and select
 fixed-width font.  Pair with @code{@@end lisp}.  @xref{lisp, , @code{@@lisp}}.
@@ -17393,7 +18035,7 @@ Mark the beginning of a menu of nodes in Info.  No effect in a printed
 manual.  Pair with @code{@@end menu}.  @xref{Menus}.@refill
 
 @item @@minus@{@}
-Generate a minus sign, `@minus{}'.  @xref{minus, , @code{@@minus}}.@refill
+Generate a minus sign, `@minus{}'.  @xref{minus, , @code{@@minus}}.
 
 @item @@multitable @var{column-width-spec}
 Begin a multi-column table.  Pair with @code{@@end multitable}.
@@ -17402,15 +18044,15 @@ Begin a multi-column table.  Pair with @code{@@end multitable}.
 @item @@need @var{n}
 Start a new page in a printed manual if fewer than @var{n} mils
 (thousandths of an inch) remain on the current page.  @xref{need, ,
-@code{@@need}}.@refill
+@code{@@need}}.
 
 @item @@node @var{name}, @var{next}, @var{previous}, @var{up}
 Define the beginning of a new node in Info, and serve as a locator for
-references for @TeX{}.  @xref{node, , @code{@@node}}.@refill
+references for @TeX{}.  @xref{node, , @code{@@node}}.
 
 @item @@noindent
 Prevent text from being indented as if it were a new paragraph.
-@xref{noindent, , @code{@@noindent}}.@refill
+@xref{noindent, , @code{@@noindent}}.
 
 @item @@novalidate
 Suppress validation of node references, omit creation of auxiliary files
@@ -17692,14 +18334,16 @@ Formatter Commands}.
 
 @item @@thischapter
 @itemx @@thischaptername
+@itemx @@thischapternum
 @itemx @@thisfile
 @itemx @@thispage
 @itemx @@thistitle
-Only allowed in a heading or footing.  Stands for the number and name of
-the current chapter (in the format `Chapter 1: Title'), the chapter name
+Only allowed in a heading or footing.  Stands for, respectively, the
+number and name of the current chapter (in the format `Chapter 1:
+Title'), the current chapter name only, the current chapter number
 only, the filename, the current page number, and the title of the
 document, respectively.  @xref{Custom Headings, , How to Make Your Own
-Headings}.@refill
+Headings}.
 
 @item @@tie@{@}
 Generate a normal interword space at which a line break is not allowed.
@@ -17858,14 +18502,12 @@ has four types of @@-command:@refill
 
 @table @asis
 @item 1. Non-alphabetic commands.
-These commands consist of an @@ followed by a punctuation mark or other
-character that is not part of the alphabet.  Non-alphabetic commands are
-almost always part of the text within a paragraph, and never take any
-argument.  The two characters (@@ and the other one) are complete in
-themselves; none is followed by braces.  The non-alphabetic commands
-are: @code{@@.}, @code{@@:}, @code{@@*}, @code{@@@kbd{SPACE}},
-@code{@@@kbd{TAB}}, @code{@@@kbd{NL}}, @code{@@@@}, @code{@@@{}, and
-@code{@@@}}.@refill
+These commands consist of an @@ followed by a punctuation mark or
+other character that is not part of the alphabet.  Non-alphabetic
+commands are almost always part of the text within a paragraph.  The
+non-alphabetic commands include @code{@@@@}, @code{@@@{}, @code{@@@}},
+@code{@@.}, @code{@@@kbd{SPACE}}, most of the accent commands, and
+many more.
 
 @item 2. Alphabetic commands that do not require arguments.
 These commands start with @@ followed by a word followed by left- and
@@ -18362,7 +19004,7 @@ it for a printed manual.
 @@copying
 This is a short example of a complete Texinfo file.
 
-Copyright (C) 2004 Free Software Foundation, Inc.
+Copyright @copyright{} 2005 Free Software Foundation, Inc.
 @@end copying
 
 @@titlepage
@@ -18448,10 +19090,11 @@ Here are some notes on the example:
 @cindex Documentation identification
 @cindex Identification of documentation
 The @samp{$Id:} comment is for the CVS (@pxref{Top,, Overview, cvs,
-Concurrent Versions System}) or RCS (see rcsintro(1)) version control
-systems, which expand it into a string such as:
+Concurrent Versions System}) or RCS
+(@url{http://www.gnu.org/software/rcs}) version control systems, which
+expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp $
+$Id: texinfo.txi,v 1.220 2008/04/09 17:07:31 karl Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -18503,8 +19146,16 @@ that case the sample texts given here have to be modified.  @xref{GNU
 Free Documentation License}.
 
 @item
-If your manual has invariant sections (again, see the license itself for
-details), then don't forget to change the text here accordingly.
+If the FSF is not the copyright holder, then use the appropriate name.
+
+@item
+If your manual is not published on paper by the FSF, then omit the
+last sentence in the Back-Cover Text that talks about copies from GNU
+Press.
+
+@item
+If your manual has Invariant Sections (again, see the license itself
+for details), then change the text here accordingly.
 
 @item
 For documents that express your personal views, feelings or experiences,
@@ -18517,7 +19168,7 @@ Here is the sample document:
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
-@comment $Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp $
+@comment $Id: texinfo.txi,v 1.220 2008/04/09 17:07:31 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
@@ -18525,24 +19176,23 @@ Here is the sample document:
 @syncodeindex pg cp
 @comment %**end of header
 @copying
-This manual is for GNU Sample
-(version @value{VERSION}, @value{UPDATED}),
+This manual is for GNU Sample (version @value{VERSION}, @value{UPDATED}),
 which is an example in the Texinfo documentation.
 
-Copyright @copyright{} 2004 Free Software Foundation, Inc.
+Copyright @copyright{} 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
 and with the Back-Cover Texts as in (a) below.  A copy of the
 license is included in the section entitled ``GNU Free Documentation
 License.''
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+(a) The FSF's Back-Cover Text is: ``You have the freedom to
+copy and modify this GNU manual.  Buying copies from the FSF
+supports it in developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
@@ -18566,7 +19216,7 @@ Software Foundation raise funds for GNU development.''
 @node Top
 @top GNU Sample
 
-@insertcopying
+This manual is for GNU Sample (version @value{VERSION}, @value{UPDATED}).
 @end ifnottex
 
 @menu
@@ -18587,12 +19237,8 @@ invoke, but if there was, you could see its basic usage
 and command line options here.
 
 
-@node Copying This Manual
-@appendix Copying This Manual
-
-@menu
-* GNU Free Documentation License::  License for copying this manual.
-@end menu
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
 
 @include fdl.texi
 
@@ -18628,7 +19274,7 @@ see the previous sections.
 @copying
 This document is a sample for allowing verbatim copying only.
 
-Copyright @copyright{} 2004 Free Software Foundation, Inc.
+Copyright @copyright{} 2005 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to make and distribute verbatim copies
@@ -18659,7 +19305,7 @@ the license text itself.  For a complete sample document, see the
 previous sections.
 
 @example
-Copyright @copyright{} 2004 Free Software Foundation, Inc.
+Copyright @copyright{} 2005 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -19139,12 +19785,12 @@ Write custom heading specifications in the Texinfo file immediately
 after the @code{@@end titlepage} command.
 You must cancel the predefined heading commands with the
 @code{@@headings off} command before defining your own
-specifications.@refill
+specifications.
 
 @need 1000
 Here is how to tell @TeX{} to place the chapter name at the left, the
 page number in the center, and the date at the right of every header
-for both even- and odd-numbered pages:@refill
+for both even- and odd-numbered pages:
 
 @example
 @group
@@ -19157,37 +19803,35 @@ for both even- and odd-numbered pages:@refill
 You need to divide the left part from the central part and the central
 part from the right part by inserting @samp{@@|} between parts.
 Otherwise, the specification command will not be able to tell where
-the text for one part ends and the next part begins.@refill
+the text for one part ends and the next part begins.
 
 Each part can contain text or @@-commands.  The text
 is printed as if the part were within an ordinary paragraph in the
 body of the page.  The @@-commands replace
 themselves with the page number, date, chapter name, or
-whatever.@refill
+whatever.
 
 @need 950
-Here are the six heading and footing commands:@refill
+Here are the six heading and footing commands:
 
-@findex everyheading
-@findex everyfooting
 @table @code
 @item @@everyheading @var{left} @@| @var{center} @@| @var{right}
 @itemx @@everyfooting @var{left} @@| @var{center} @@| @var{right}
-
+@findex everyheading
+@findex everyfooting
 The `every' commands specify the format for both even- and odd-numbered
 pages.  These commands are for documents that are printed on one side
 of each sheet of paper, or for documents in which you want symmetrical
-headers or footers.@refill
+headers or footers.
 
-@findex evenheading
-@findex evenfooting
-@findex oddheading
-@findex oddfooting
 @item @@evenheading @var{left} @@| @var{center} @@| @var{right}
 @itemx @@oddheading  @var{left} @@| @var{center} @@| @var{right}
 @itemx @@evenfooting @var{left} @@| @var{center} @@| @var{right}
 @itemx @@oddfooting  @var{left} @@| @var{center} @@| @var{right}
-
+@findex evenheading
+@findex evenfooting
+@findex oddheading
+@findex oddfooting
 The `even' and `odd' commands specify the format for even-numbered
 pages and odd-numbered pages.  These commands are for books and
 manuals that are printed on both sides of each sheet of paper.
@@ -19198,53 +19842,66 @@ provide the names of chapters
 and sections and the page number.  You can use the
 @samp{@@this@dots{}} commands in the left, center, or right portions
 of headers and footers, or anywhere else in a Texinfo file so long as
-they are between @code{@@iftex} and @code{@@end iftex} commands.@refill
+they are between @code{@@iftex} and @code{@@end iftex} commands.
 
 @need 1000
-Here are the @samp{@@this@dots{}} commands:@refill
+Here are the @samp{@@this@dots{}} commands:
 
 @table @code
-@findex thispage
 @item @@thispage
-Expands to the current page number.@refill
-@c !!! Karl Berry says that `thissection' can fail on page breaks.
-@ignore
+@findex thispage
+Expands to the current page number.
+
+@item @@thissectionname
+@findex thissectionname
+Expands to the name of the current section.
+
+@item @@thissectionnum
+@findex thissectionnum
+Expands to the number of the current section.
+
 @item @@thissection
-Expands to the name of the current section.@refill
-@end ignore
+@findex thissection
+Expands to the number and name of the current section, in the format
+`Section 1: Title'.
 
-@findex thischaptername
 @item @@thischaptername
-Expands to the name of the current chapter.@refill
+@findex thischaptername
+Expands to the name of the current chapter.
+
+@item @@thischapternum
+@findex thischapternum
+Expands to the number of the current chapter, or letter of the current
+appendix.
 
-@findex thischapter
 @item @@thischapter
+@findex thischapter
 Expands to the number and name of the current
-chapter, in the format `Chapter 1: Title'.@refill
+chapter, in the format `Chapter 1: Title'.
 
-@findex thistitle
 @item @@thistitle
+@findex thistitle
 Expands to the name of the document, as specified by the
-@code{@@settitle} command.@refill
+@code{@@settitle} command.
 
-@findex thisfile
 @item @@thisfile
+@findex thisfile
 For @code{@@include} files only: expands to the name of the current
 @code{@@include} file.  If the current Texinfo source file is not an
 @code{@@include} file, this command has no effect.  This command does
 @emph{not} provide the name of the current Texinfo source file unless
 it is an @code{@@include} file.  (@xref{Include Files}, for more
-information about @code{@@include} files.)@refill
+information about @code{@@include} files.)
 @end table
 
 @noindent
 You can also use the @code{@@today@{@}} command, which expands to the
-current date, in `1 Jan 1900' format.@refill
+current date, in `1 Jan 1900' format.
 @findex today
 
 Other @@-commands and text are printed in a header or footer just as
 if they were in the body of a page.  It is useful to incorporate text,
-particularly when you are writing drafts:@refill
+particularly when you are writing drafts:
 
 @example
 @group
@@ -19255,7 +19912,44 @@ particularly when you are writing drafts:@refill
 @end example
 
 Beware of overlong titles: they may overlap another part of the
-header or footer and blot it out.@refill
+header or footer and blot it out.
+
+If you have very short chapters and/or sections, several of them can
+appear on a single page.  You can specify which chapters and sections
+you want @code{@@thischapter}, @code{@@thissection} and other such
+macros to refer to on such pages as follows:
+
+@table @code
+@item @@everyheadingmarks @var{ref}
+@itemx @@everyfootingmarks @var{ref}
+@findex everyheadingmarks
+@findex everyfootingmarks
+The @var{ref} argument can be either @code{top} (the @code{@@this...}
+commands will refer to the chapter/section at the top of a page) or
+@code{bottom} (the commands will reflect the situation at the bottom
+of a page).  These @samp{@@every...} commands specify what to do on
+both even- and odd-numbered pages.
+
+@item @@evenheadingmarks @var{ref}
+@itemx @@oddheadingmarks @var{ref}
+@itemx @@evenfootingmarks @var{ref}
+@itemx @@oddfootingmarks @var{ref}
+@findex evenheadingmarks
+@findex oddheadingmarks
+@findex evenfootingmarks
+@findex oddfootingmarks
+These @samp{@@even...} and @samp{@@odd...} commands specify what to do
+on only even- or odd-numbered pages, respectively.  The @var{ref}
+argument is the same as with the @samp{@@every...} commands.
+@end table
+
+Write these commands immediately after the @code{@@...contents}
+commands, or after the @code{@@end titlepage} command if you don't
+have a table of contents or if it is printed at the end of your
+manual.
+
+By default the @code{@@this...} commands reflect the situation at the
+bottom of a page both in headings and in footings.
 
 
 @node Catching Mistakes
@@ -20484,12 +21178,8 @@ Insert the current date.
 @end ignore
 
 
-@node Copying This Manual
-@appendix Copying This Manual
-
-@menu
-* GNU Free Documentation License::  License for copying this manual.
-@end menu
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
 
 @include fdl.texi
 
@@ -20504,8 +21194,8 @@ commands are listed without their preceding @samp{@@}.@refill
 @printindex fn
 
 
-@node Concept Index
-@unnumbered Concept Index
+@node General Index
+@unnumbered General Index
 
 @printindex cp
 
diff --git a/Build/source/utils/texinfo/doc/txi-cs.tex b/Build/source/utils/texinfo/doc/txi-cs.tex
index cdbc3c0d226..999e404cd0f 100644
--- a/Build/source/utils/texinfo/doc/txi-cs.tex
+++ b/Build/source/utils/texinfo/doc/txi-cs.tex
@@ -1,7 +1,7 @@
-% $Id: txi-cs.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
+% $Id: txi-cs.tex,v 1.5 2007/07/01 19:06:03 karl Exp $
 % Czech translation for texinfo.tex.
 %
-% Copyright (C) 1999, 2000 Free Software Foundation.
+% Copyright (C) 1999, 2000, 2007 Free Software Foundation.
 % 
 % Authors:
 % Vladimir Michl <Vladimir.Michl@mujweb.cz>
@@ -9,7 +9,7 @@
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
+% the Free Software Foundation; either version 3 of the License, or
 % (at your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
@@ -18,8 +18,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %
 \gdef\putwordAppendix{Pøílohy}
 \gdef\putwordChapter{Kapitola}
diff --git a/Build/source/utils/texinfo/doc/txi-de.tex b/Build/source/utils/texinfo/doc/txi-de.tex
index f3726c3677a..275429bb4b0 100644
--- a/Build/source/utils/texinfo/doc/txi-de.tex
+++ b/Build/source/utils/texinfo/doc/txi-de.tex
@@ -1,12 +1,12 @@
 % txi-de.tex -- adaptation to German for texinfo.tex.
-% $Id: txi-de.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
-%
-% Copyright (C) 1999 Free Software Foundation, Inc.
+% $Id: txi-de.tex,v 1.7 2007/07/01 22:32:12 karl Exp $
 %
+% Copyright (C) 1999, 2007 Free Software Foundation, Inc.
+% 
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
-% any later version.
+% the Free Software Foundation; either version 3 of the license, or (at
+% your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %
 % Written by Karl Heinz Marbaise, 18. January 1999, <kama@hippo.fido.de>
 %%
diff --git a/Build/source/utils/texinfo/doc/txi-en.tex b/Build/source/utils/texinfo/doc/txi-en.tex
index 721c49a49f1..a81001c7be1 100644
--- a/Build/source/utils/texinfo/doc/txi-en.tex
+++ b/Build/source/utils/texinfo/doc/txi-en.tex
@@ -1,13 +1,13 @@
 % English non-translation for texinfo.tex.  This is read when a source
 % document says @documentlanguage en (which might happen after another
 % @documentlanguage).  The actual values are the same as defaults.
-% $Id: txi-en.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
+% $Id: txi-en.tex,v 1.5 2007/07/01 19:06:03 karl Exp $
 %
-% Copyright (C) 1999 Free Software Foundation.
+% Copyright (C) 1999, 2007 Free Software Foundation.
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
+% the Free Software Foundation; either version 3 of the License, or
 % (at your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 \gdef\putwordAppendix{Appendix}
 \gdef\putwordChapter{Chapter}
diff --git a/Build/source/utils/texinfo/doc/txi-es.tex b/Build/source/utils/texinfo/doc/txi-es.tex
index 334e2d1e109..54b399815fc 100644
--- a/Build/source/utils/texinfo/doc/txi-es.tex
+++ b/Build/source/utils/texinfo/doc/txi-es.tex
@@ -1,18 +1,19 @@
 % txi-es.tex -- TeX macros to handle Spanish language documents.
 %
-% Copyright (C) 1999 by Adrian Perez Jorge
-%
+% Copyright (C) 1999, 2007 by Adrian Perez Jorge
+% 
 % This txi-es.tex file is free software; you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
-% published by the Free Software Foundation; either version 2, or (at
-% your option) any later version.
+% published by the Free Software Foundation; either version 3 of the
+% License, or (at your option) any later version.
 %
 % This txi-es.tex file is distributed in the hope that it will be
 % useful, but WITHOUT ANY WARRANTY; without even the implied warranty
 % of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 % General Public License for more details.
 %
-
+% You should have received a copy of the GNU General Public License
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %
 % Set up fixed words for Spanish.
 %
diff --git a/Build/source/utils/texinfo/doc/txi-fr.tex b/Build/source/utils/texinfo/doc/txi-fr.tex
index 0a83f04ac0d..c8665cfcfa2 100644
--- a/Build/source/utils/texinfo/doc/txi-fr.tex
+++ b/Build/source/utils/texinfo/doc/txi-fr.tex
@@ -1,11 +1,11 @@
 % txi-fr.tex -- TeX macros to handle French language for texinfo.tex documents.
-% $Id: txi-fr.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
+% $Id: txi-fr.tex,v 1.5 2007/07/01 19:06:03 karl Exp $
 %
-% Copyright (C) 1999 Free Software Foundation.
+% Copyright (C) 1999, 2007 Free Software Foundation.
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
+% the Free Software Foundation; either version 3 of the License, or
 % (at your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 % Set up fixed words for French.
 % Translated by Laurent Bourbeau <bourbeau@progiciels-bpi.ca>
diff --git a/Build/source/utils/texinfo/doc/txi-it.tex b/Build/source/utils/texinfo/doc/txi-it.tex
index 28e51eaa3f0..6ba6bd82767 100644
--- a/Build/source/utils/texinfo/doc/txi-it.tex
+++ b/Build/source/utils/texinfo/doc/txi-it.tex
@@ -1,13 +1,13 @@
 % English non-translation for texinfo.tex.  This is read when a source
 % document says @documentlanguage en (which might happen after another
 % @documentlanguage).  The actual values are the same as defaults.
-% $Id: txi-it.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
+% $Id: txi-it.tex,v 1.5 2007/07/01 19:06:04 karl Exp $
 %
-% Copyright (C) 1999 Free Software Foundation.
+% Copyright (C) 1999, 2007 Free Software Foundation.
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
+% the Free Software Foundation; either version 3 of the License, or
 % (at your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 \gdef\putwordAppendix{Appendice}
 \gdef\putwordChapter{Capitolo}
diff --git a/Build/source/utils/texinfo/doc/txi-nb.tex b/Build/source/utils/texinfo/doc/txi-nb.tex
new file mode 100644
index 00000000000..9007d155232
--- /dev/null
+++ b/Build/source/utils/texinfo/doc/txi-nb.tex
@@ -0,0 +1,67 @@
+% Norwegian translation for texinfo.tex (1999-10-29, GNU Texinfo 4.0).
+% Enables the use of words like Kapittel instead of Chapter, etc.
+%
+% Copyright (C) 1999, 2007 Trond Endrest=F8l <endrestol@hotmail.com>
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 3 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%
+\gdef\putwordAppendix{Vedlegg}
+\gdef\putwordChapter{Kapittel}
+\gdef\putwordfile{fil}
+\gdef\putwordIndexIsEmpty{(Indeks er tom)}
+\gdef\putwordIndexNonexistent{(Indeks eksisterer ikke)}
+\gdef\putwordInfo{Info}
+\gdef\putwordMethodon{Metode p\aa}
+\gdef\putwordNoTitle{Ingen tittel}
+\gdef\putwordof{av}
+\gdef\putwordon{p\aa}
+\gdef\putwordpage{side}
+\gdef\putwordsection{avsnitt}
+\gdef\putwordSection{Avsnitt}
+\gdef\putwordsee{se}
+\gdef\putwordSee{Se}
+\gdef\putwordShortTOC{Kort innholdsfortegnelse}
+\gdef\putwordTOC{Innholdsfortegnelse}
+%
+\gdef\putwordMJan{januar}
+\gdef\putwordMFeb{februar}
+\gdef\putwordMMar{mars}
+\gdef\putwordMApr{april}
+\gdef\putwordMMay{mai}
+\gdef\putwordMJun{juni}
+\gdef\putwordMJul{juli}
+\gdef\putwordMAug{august}
+\gdef\putwordMSep{september}
+\gdef\putwordMOct{oktober}
+\gdef\putwordMNov{november}
+\gdef\putwordMDec{desember}
+%
+\gdef\putwordDefmac{Makro}
+\gdef\putwordDefspec{Spesiell form}
+\gdef\putwordDefivar{Forekomstvariabel}
+\gdef\putwordDefvar{Variabel}
+\gdef\putwordDefopt{Brukervalg}
+\gdef\putwordDeffunc{Funksjon}
+%
+% Redefine \today to produce Norwegian
+% preferred dates such as 28. januar 1999.
+%
+\gdef\today{%
+  \number\day.\space
+  \ifcase\month
+  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+  \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+  \fi
+  \space\number\year}
diff --git a/Build/source/utils/texinfo/doc/txi-nl.tex b/Build/source/utils/texinfo/doc/txi-nl.tex
index aab69f7ecb0..9cdfbe87146 100644
--- a/Build/source/utils/texinfo/doc/txi-nl.tex
+++ b/Build/source/utils/texinfo/doc/txi-nl.tex
@@ -1,11 +1,11 @@
 % Dutch translation for texinfo.tex.  
-% $Id: txi-nl.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
+% $Id: txi-nl.tex,v 1.5 2007/07/01 19:06:04 karl Exp $
 %
-% Copyright (C) 1999 Free Software Foundation.
+% Copyright (C) 1999, 2007 Free Software Foundation.
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
+% the Free Software Foundation; either version 3 of the License, or
 % (at your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 % Set up fixed words if not already set.
 \gdef\putwordAppendix{Appendix}
diff --git a/Build/source/utils/texinfo/doc/txi-pl.tex b/Build/source/utils/texinfo/doc/txi-pl.tex
index b5895a2942d..5b33489a9f1 100644
--- a/Build/source/utils/texinfo/doc/txi-pl.tex
+++ b/Build/source/utils/texinfo/doc/txi-pl.tex
@@ -1,11 +1,11 @@
 % txi-pl.tex -- adaptation to Polish for texinfo.tex.
-% $Id: txi-pl.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
+% $Id: txi-pl.tex,v 1.6 2007/07/01 19:06:04 karl Exp $
 %
-% Copyright (C) 2003 Free Software Foundation.
+% Copyright (C) 2003, 2006, 2007 Free Software Foundation.
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
+% the Free Software Foundation; either version 3 of the License, or
 % (at your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
@@ -14,32 +14,30 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-%
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+% 
 % Written by Wojciech Polak <polak@gnu.org> on 29-03-2003.
 % Modified by Staszek Wawrykiewicz <staw@gust.org.pl> on 01-04-2003.
 %
-\prefixing
 \gdef\putwordAppendix{Suplement}
-\gdef\putwordChapter{Rozdzia/l}
+\gdef\putwordChapter{Rozdzia³}
 \gdef\putwordfile{plik}
 \gdef\putwordin{w}
 \gdef\putwordIndexIsEmpty{(Skorowidz jest pusty)}
 \gdef\putwordIndexNonexistent{(Brak skorowidza)}
 \gdef\putwordInfo{Info}
-\gdef\putwordInstanceVariableof{Przyk/ladowa zmienna}
+\gdef\putwordInstanceVariableof{Przyk³adowa zmienna}
 \gdef\putwordMethodon{Metoda}
-\gdef\putwordNoTitle{Brak tytu/lu}
+\gdef\putwordNoTitle{Brak tytu³u}
 \gdef\putwordof{z}
 \gdef\putwordon{na}
 \gdef\putwordpage{strona}
-\gdef\putwordsection{cz/e/s/c}
-\gdef\putwordSection{Cz/e/s/c}
+\gdef\putwordsection{czê¶æ}
+\gdef\putwordSection{Czê¶æ}
 \gdef\putwordsee{zobacz}
 \gdef\putwordSee{Zobacz}
-\gdef\putwordShortTOC{Kr/otka zawarto/s/c}
-\gdef\putwordTOC{Spis tre/sci}
+\gdef\putwordShortTOC{Krótka zawarto¶æ}
+\gdef\putwordTOC{Spis tre¶ci}
 %
 \gdef\putwordMJan{stycznia}
 \gdef\putwordMFeb{lutego}
@@ -49,17 +47,16 @@
 \gdef\putwordMJun{czerwca}
 \gdef\putwordMJul{lipca}
 \gdef\putwordMAug{sierpnia}
-\gdef\putwordMSep{wrze/snia}
-\gdef\putwordMOct{pa/xdziernika}
+\gdef\putwordMSep{wrze¶nia}
+\gdef\putwordMOct{pa¼dziernika}
 \gdef\putwordMNov{listopada}
 \gdef\putwordMDec{grudnia}
 %
 \gdef\putwordDefmac{Makro}
 \gdef\putwordDefspec{Specjalna forma}
 \gdef\putwordDefvar{Zmienna}
-\gdef\putwordDefopt{Opcja u/zytkownika}
+\gdef\putwordDefopt{Opcja u¿ytkownika}
 \gdef\putwordDeffunc{Funkcja}
-\nonprefixing
 %
 % Produces Day Month Year style of output.
 %
diff --git a/Build/source/utils/texinfo/doc/txi-pt.tex b/Build/source/utils/texinfo/doc/txi-pt.tex
index c65bc5e1d5a..4a61765a7d4 100644
--- a/Build/source/utils/texinfo/doc/txi-pt.tex
+++ b/Build/source/utils/texinfo/doc/txi-pt.tex
@@ -1,11 +1,11 @@
 % txi-pt.tex -- adaptation to Portuguese for texinfo.tex.
 %
-% Copyright (C) 1999 Free Software Foundation, Inc.
+% Copyright (C) 1999, 2007 Free Software Foundation, Inc.
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
-% any later version.
+% the Free Software Foundation; either version 3 of the License, or (at
+% your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %
 % Written by Lalo Martins <lalo@webcom.com> at 05 August 1999
 %%
diff --git a/Build/source/utils/texinfo/doc/txi-ru.tex b/Build/source/utils/texinfo/doc/txi-ru.tex
new file mode 100644
index 00000000000..5dd80f6acae
--- /dev/null
+++ b/Build/source/utils/texinfo/doc/txi-ru.tex
@@ -0,0 +1,71 @@
+% Russian translation for texinfo.tex. 
+%
+% Copyright (C) 2005, 2007 Free Software Foundation.
+%
+% Author:
+%  Sergey Poznyakoff
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 3 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+%\include plainenc
+%
+\gdef\putwordAppendix{ðÒÉÌÏÖÅÎÉÅ}
+\gdef\putwordChapter{çÌÁ×Á}
+\gdef\putwordfile{ÆÁÊÌ}
+\gdef\putwordin{×}
+\gdef\putwordIndexIsEmpty{(éÎÄÅËÓ ÐÕÓÔ)}
+\gdef\putwordIndexNonexistent{(éÎÄÅËÓ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ)}
+\gdef\putwordInfo{Info}
+\gdef\putwordInstanceVariableof{ðÅÒÅÍÅÎÎÁÑ ËÌÁÓÓÁ} % hmm ??
+\gdef\putwordMethodon{íÅÔÏÄ}
+\gdef\putwordNoTitle{âÅÚ ÚÁÇÌÁ×ÉÑ}
+\gdef\putwordof{ÄÌÑ}  % (??) ëÁÔÅÇÏÒÉÑ X ÄÌÑ ËÌÁÓÓÁ Y 
+\gdef\putwordon{ÎÁÄ}  % ïÐÅÒÁÃÉÑ ÎÁÄ ...
+\gdef\putwordpage{ÓÔÒÁÎÉÃÁ}
+\gdef\putwordsection{ÒÁÚÄÅÌ}
+\gdef\putwordSection{òÁÚÄÅÌ}
+\gdef\putwordsee{ÓÍ.}
+\gdef\putwordSee{óÍ.}
+\gdef\putwordShortTOC{ëÒÁÔËÏÅ ÏÇÌÁ×ÌÅÎÉÅ}
+\gdef\putwordTOC{ïÇÌÁ×ÌÅÎÉÅ}
+%
+%% íÅÓÑÃÙ ÉÓÐÏÌØÚÕÀÔÓÑ ÔÏÌØËÏ × ÒÏÄÉÔÅÌØÎÏÍ ÐÁÄÅÖÅ (ÓÍ. ÎÉÖÅ today) 
+\gdef\putwordMJan{ÑÎ×ÁÒÑ}
+\gdef\putwordMFeb{ÆÅ×ÒÁÌÑ}
+\gdef\putwordMMar{ÍÁÒÔÁ}
+\gdef\putwordMApr{ÁÐÒÅÌÑ}
+\gdef\putwordMMay{ÍÁÑ}
+\gdef\putwordMJun{ÉÀÎØ}
+\gdef\putwordMJul{ÉÀÌÑ}
+\gdef\putwordMAug{Á×ÇÕÓÔÁ}
+\gdef\putwordMSep{ÓÅÎÔÑÂÒÑ}
+\gdef\putwordMOct{ÏËÔÑÂÒÑ}
+\gdef\putwordMNov{ÎÏÑÂÒÑ}
+\gdef\putwordMDec{ÄÅËÁÂÒÑ}
+%
+\gdef\putwordDefmac{íÁËÒÏÏÐÒÅÄÅÌÅÎÉÅ}
+\gdef\putwordDefspec{ïÓÏÂÁÑ ÆÏÒÍÁ}
+\gdef\putwordDefvar{ðÅÒÅÍÅÎÎÁÑ}
+\gdef\putwordDefopt{ïÐÃÉÑ ÐÏÌØÚÏ×ÁÔÅÌÑ}
+\gdef\putwordDeffunc{æÕÎËÃÉÑ}
+
+% Produces Day Month Year style of output.
+\def\today{%
+  \number\day\space
+  \ifcase\month
+  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+  \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+  \fi
+  \space\number\year}
diff --git a/Build/source/utils/texinfo/doc/txi-sr.tex b/Build/source/utils/texinfo/doc/txi-sr.tex
new file mode 100644
index 00000000000..9141a4b692a
--- /dev/null
+++ b/Build/source/utils/texinfo/doc/txi-sr.tex
@@ -0,0 +1,67 @@
+% Serbian-latin translation for texinfo.tex.
+%
+% Copyright (C) 2005, 2007 Free Software Foundation.
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 3 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+% 
+% Created by Predrag Rakic.
+
+\gdef\putwordAppendix{Prilog}
+\gdef\putwordChapter{Glava}
+\gdef\putwordfile{datoteka}
+\gdef\putwordin{u}
+\gdef\putwordIndexIsEmpty{(Indeks je prazan)}
+\gdef\putwordIndexNonexistent{(Indeks ne postoji)}
+\gdef\putwordInfo{Info}
+\gdef\putwordInstanceVariableof{Atribut klase}
+\gdef\putwordMethodon{Metod klase}
+\gdef\putwordNoTitle{Bez naslova}
+\gdef\putwordof{}
+\gdef\putwordon{}
+\gdef\putwordpage{strana}
+\gdef\putwordsection{poglavlje}
+\gdef\putwordSection{Poglavlje}
+\gdef\putwordsee{vidi}
+\gdef\putwordSee{Vidi}
+\gdef\putwordShortTOC{Kratak sadr\v{z}aj}
+\gdef\putwordTOC{Sadr\v{z}aj}
+%
+\gdef\putwordMJan{Januar}
+\gdef\putwordMFeb{Februar}
+\gdef\putwordMMar{Mart}
+\gdef\putwordMApr{April}
+\gdef\putwordMMay{Maj}
+\gdef\putwordMJun{Jun}
+\gdef\putwordMJul{Jul}
+\gdef\putwordMAug{Avgust}
+\gdef\putwordMSep{Septembar}
+\gdef\putwordMOct{Oktobar}
+\gdef\putwordMNov{Novembar}
+\gdef\putwordMDec{Decembar}
+%
+\gdef\putwordDefmac{Makro}
+\gdef\putwordDefspec{Posebna forma}
+\gdef\putwordDefvar{Promenljiva}
+\gdef\putwordDefopt{Korisni\v{c}ka opcija}
+\gdef\putwordDeffunc{Funkcija}
+
+% Produces Day Month Year style of output.
+\def\today{%
+  \number\day\space
+  \ifcase\month
+  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+  \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+  \fi
+  \space\number\year}
diff --git a/Build/source/utils/texinfo/doc/txi-tr.tex b/Build/source/utils/texinfo/doc/txi-tr.tex
index eafba9f9848..0bd7fcbea75 100644
--- a/Build/source/utils/texinfo/doc/txi-tr.tex
+++ b/Build/source/utils/texinfo/doc/txi-tr.tex
@@ -1,12 +1,12 @@
-% txi-en.tex -- adaptation to Turkish for texinfo.tex.
-% $Id: txi-tr.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
+% txi-tr.tex -- adaptation to Turkish for texinfo.tex.
+% $Id: txi-tr.tex,v 1.7 2007/07/01 22:32:12 karl Exp $
 %
-% Copyright (C) 2003 Free Software Foundation, Inc.
+% Copyright (C) 2003, 2007 Free Software Foundation, Inc.
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
-% any later version.
+% the Free Software Foundation; either version 3 of the License, or (at
+% your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %
 % Written by Alper Ersoy, 5 January 2003, <aersoy@tfz.net>
 %
diff --git a/Build/source/utils/texinfo/doc/txi-uk.tex b/Build/source/utils/texinfo/doc/txi-uk.tex
new file mode 100644
index 00000000000..8eb8cfa85bb
--- /dev/null
+++ b/Build/source/utils/texinfo/doc/txi-uk.tex
@@ -0,0 +1,68 @@
+% Ukrainian translation for texinfo.tex.
+%
+% Copyright (C) 2005, 2007 Free Software Foundation.
+%
+% Author:
+%  Sergey Poznyakoff
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 3 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\gdef\putwordAppendix{äÏÄÁÔÏË}
+\gdef\putwordChapter{òÏÚĦÌ}
+\gdef\putwordfile{ÆÁÊÌ}
+\gdef\putwordin{×}
+\gdef\putwordIndexIsEmpty{(¶ÎÄÅËÓ ÐÕÓÔÉÊ)}
+\gdef\putwordIndexNonexistent{(¶ÎÄÅËÓ ÎÅ ¦ÓÎÕ¤)}
+\gdef\putwordInfo{ÆÁÊÌ Info}
+\gdef\putwordInstanceVariableof{úͦÎÎÁ ËÌÁÓÕ}
+\gdef\putwordMethodon{íÅÔÏÄ }
+\gdef\putwordNoTitle{îÅÍÁ¤ ÎÁÚ×É}
+\gdef\putwordof{ÄÌÑ} % ?? 
+\gdef\putwordon{Ú}  % ïÐÅÒÁÃ¦Ñ Ú ËÌÁÓÏÍ ...
+\gdef\putwordpage{ÓÔÏÒ¦ÎËÁ}
+\gdef\putwordsection{ÞÁÓÔÉÎÁ}
+\gdef\putwordSection{þÁÓÔÉÎÁ}
+\gdef\putwordsee{ÄÉ×.}
+\gdef\putwordSee{äÉ×.}
+\gdef\putwordShortTOC{ëÏÒÏÔËÉÊ ÚͦÓÔ}
+\gdef\putwordTOC{úͦÓÔ}
+%
+\gdef\putwordMJan{Ó¦ÞÎÑ}
+\gdef\putwordMFeb{ÌÀÔÏÇÏ}
+\gdef\putwordMMar{ÂÅÒÅÚÎÑ}
+\gdef\putwordMApr{ËצÔÎÑ}
+\gdef\putwordMMay{ÔÒÁ×ÎÑ}
+\gdef\putwordMJun{ÞÅÒ×ÎÑ}
+\gdef\putwordMJul{ÌÉÐÎÑ}
+\gdef\putwordMAug{ÓÅÒÐÎÑ}
+\gdef\putwordMSep{×ÅÒÅÓÎÑ}
+\gdef\putwordMOct{ÖÏ×ÔÎÑ}
+\gdef\putwordMNov{ÌÉÓÔÏÐÁÄÁ}
+\gdef\putwordMDec{ÇÒÕÄÎÑ}
+%
+\gdef\putwordDefmac{íÁËÒÏÓ}
+\gdef\putwordDefspec{óÐÅæÁÌØÎÁ ÆÏÒÍÁ}
+\gdef\putwordDefvar{úͦÎÎÁ}
+\gdef\putwordDefopt{ïÐÃ¦Ñ ËÏÒÉÓÔÕ×ÁÞÁ}
+\gdef\putwordDeffunc{æÕÎËæÑ}
+
+% Produces Day Month Year style of output.
+\def\today{%
+  \number\day\space
+  \ifcase\month
+  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+  \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+  \fi
+  \space\number\year}
diff --git a/Build/source/utils/texinfo/doc/version-stnd.texi b/Build/source/utils/texinfo/doc/version-stnd.texi
index 045e1f425a9..a1b0be3185b 100644
--- a/Build/source/utils/texinfo/doc/version-stnd.texi
+++ b/Build/source/utils/texinfo/doc/version-stnd.texi
@@ -1,4 +1,4 @@
-@set UPDATED 17 January 2006
-@set UPDATED-MONTH January 2006
-@set EDITION 4.8
-@set VERSION 4.8
+@set UPDATED 5 March 2008
+@set UPDATED-MONTH March 2008
+@set EDITION 4.12
+@set VERSION 4.12
diff --git a/Build/source/utils/texinfo/doc/version.texi b/Build/source/utils/texinfo/doc/version.texi
index 045e1f425a9..da6f3285a4c 100644
--- a/Build/source/utils/texinfo/doc/version.texi
+++ b/Build/source/utils/texinfo/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 17 January 2006
-@set UPDATED-MONTH January 2006
-@set EDITION 4.8
-@set VERSION 4.8
+@set UPDATED 9 April 2008
+@set UPDATED-MONTH April 2008
+@set EDITION 4.12
+@set VERSION 4.12
diff --git a/Build/source/utils/texinfo/gnulib/lib/Makefile.am b/Build/source/utils/texinfo/gnulib/lib/Makefile.am
new file mode 100644
index 00000000000..997ecbd86de
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/Makefile.am
@@ -0,0 +1,797 @@
+## DO NOT EDIT! GENERATED AUTOMATICALLY!
+## Process this file with automake to produce Makefile.in.
+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argz getopt gettext mbscasecmp mbsncasecmp mbswidth memcpy memmove mkstemp strdup strerror xalloc xsetenv
+
+AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
+
+noinst_HEADERS =
+noinst_LIBRARIES =
+noinst_LTLIBRARIES =
+EXTRA_DIST =
+BUILT_SOURCES =
+SUFFIXES =
+MOSTLYCLEANFILES = core *.stackdump
+MOSTLYCLEANDIRS =
+CLEANFILES =
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
+
+AM_CPPFLAGS =
+
+noinst_LIBRARIES += libgnu.a
+
+libgnu_a_SOURCES =
+libgnu_a_LIBADD = $(gl_LIBOBJS)
+libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
+EXTRA_libgnu_a_SOURCES =
+
+## begin gnulib module alloca-opt
+
+BUILT_SOURCES += $(ALLOCA_H)
+
+# We need the following in order to create <alloca.h> when the system
+# doesn't have one that works with the given compiler.
+alloca.h: alloca.in.h
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/alloca.in.h; \
+	} > $@-t
+	mv -f $@-t $@
+MOSTLYCLEANFILES += alloca.h alloca.h-t
+
+EXTRA_DIST += alloca.in.h
+
+## end   gnulib module alloca-opt
+
+## begin gnulib module argz
+
+BUILT_SOURCES += $(ARGZ_H)
+
+# We need the following in order to create <argz.h> when the system
+# doesn't have one that works with the given compiler.
+argz.h: argz.in.h
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/argz.in.h; \
+	} > $@-t
+	mv -f $@-t $@
+MOSTLYCLEANFILES += argz.h argz.h-t
+
+EXTRA_DIST += argz.c argz.in.h
+
+EXTRA_libgnu_a_SOURCES += argz.c
+
+## end   gnulib module argz
+
+## begin gnulib module configmake
+
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
+# The Automake-defined pkg* macros are appended, in the order
+# listed in the Automake 1.10a+ documentation.
+configmake.h: Makefile
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  echo '#define PREFIX "$(prefix)"'; \
+	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
+	  echo '#define BINDIR "$(bindir)"'; \
+	  echo '#define SBINDIR "$(sbindir)"'; \
+	  echo '#define LIBEXECDIR "$(libexecdir)"'; \
+	  echo '#define DATAROOTDIR "$(datarootdir)"'; \
+	  echo '#define DATADIR "$(datadir)"'; \
+	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
+	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
+	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
+	  echo '#define INCLUDEDIR "$(includedir)"'; \
+	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
+	  echo '#define DOCDIR "$(docdir)"'; \
+	  echo '#define INFODIR "$(infodir)"'; \
+	  echo '#define HTMLDIR "$(htmldir)"'; \
+	  echo '#define DVIDIR "$(dvidir)"'; \
+	  echo '#define PDFDIR "$(pdfdir)"'; \
+	  echo '#define PSDIR "$(psdir)"'; \
+	  echo '#define LIBDIR "$(libdir)"'; \
+	  echo '#define LISPDIR "$(lispdir)"'; \
+	  echo '#define LOCALEDIR "$(localedir)"'; \
+	  echo '#define MANDIR "$(mandir)"'; \
+	  echo '#define MANEXT "$(manext)"'; \
+	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
+	} | sed '/""/d' > $@-t
+	mv $@-t $@
+BUILT_SOURCES += configmake.h
+CLEANFILES += configmake.h configmake.h-t
+
+## end   gnulib module configmake
+
+## begin gnulib module error
+
+
+EXTRA_DIST += error.c error.h
+
+EXTRA_libgnu_a_SOURCES += error.c
+
+## end   gnulib module error
+
+## begin gnulib module exitfail
+
+
+EXTRA_DIST += exitfail.c exitfail.h
+
+EXTRA_libgnu_a_SOURCES += exitfail.c
+
+## end   gnulib module exitfail
+
+## begin gnulib module getopt
+
+BUILT_SOURCES += $(GETOPT_H)
+
+# We need the following in order to create <getopt.h> when the system
+# doesn't have one that works with the given compiler.
+getopt.h: getopt.in.h
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/getopt.in.h; \
+	} > $@-t
+	mv -f $@-t $@
+MOSTLYCLEANFILES += getopt.h getopt.h-t
+
+EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h
+
+EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c
+
+## end   gnulib module getopt
+
+## begin gnulib module gettext
+
+# This is for those projects which use "gettextize --intl" to put a source-code
+# copy of libintl into their package. In such projects, every Makefile.am needs
+# -I$(top_builddir)/intl, so that <libintl.h> can be found in this directory.
+# For the Makefile.ams in other directories it is the maintainer's
+# responsibility; for the one from gnulib we do it here.
+# This option has no effect when the user disables NLS (because then the intl
+# directory contains no libintl.h file) or when the project does not use
+# "gettextize --intl".
+AM_CPPFLAGS += -I$(top_builddir)/intl
+
+EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
+
+## end   gnulib module gettext
+
+## begin gnulib module gettext-h
+
+libgnu_a_SOURCES += gettext.h
+
+## end   gnulib module gettext-h
+
+## begin gnulib module gettimeofday
+
+
+EXTRA_DIST += gettimeofday.c
+
+EXTRA_libgnu_a_SOURCES += gettimeofday.c
+
+## end   gnulib module gettimeofday
+
+## begin gnulib module havelib
+
+
+EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
+
+## end   gnulib module havelib
+
+## begin gnulib module intprops
+
+
+EXTRA_DIST += intprops.h
+
+## end   gnulib module intprops
+
+## begin gnulib module link-warning
+
+LINK_WARNING_H=$(top_srcdir)/build-aux/link-warning.h
+
+EXTRA_DIST += $(top_srcdir)/build-aux/link-warning.h
+
+## end   gnulib module link-warning
+
+## begin gnulib module localcharset
+
+libgnu_a_SOURCES += localcharset.h localcharset.c
+
+# We need the following in order to install a simple file in $(libdir)
+# which is shared with other installed packages. We use a list of referencing
+# packages so that "make uninstall" will remove the file if and only if it
+# is not used by another installed package.
+# On systems with glibc-2.1 or newer, the file is redundant, therefore we
+# avoid installing it.
+
+all-local: charset.alias ref-add.sed ref-del.sed
+
+charset_alias = $(DESTDIR)$(libdir)/charset.alias
+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+install-exec-local: all-local
+	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
+	if test -f $(charset_alias); then \
+	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	  rm -f $(charset_tmp) ; \
+	else \
+	  if test $(GLIBC21) = no; then \
+	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	    rm -f $(charset_tmp) ; \
+	  fi ; \
+	fi
+
+uninstall-local: all-local
+	if test -f $(charset_alias); then \
+	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+	  if grep '^# Packages using this file: $$' $(charset_tmp) \
+	      > /dev/null; then \
+	    rm -f $(charset_alias); \
+	  else \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+	  fi; \
+	  rm -f $(charset_tmp); \
+	fi
+
+charset.alias: config.charset
+	rm -f t-$@ $@
+	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
+	mv t-$@ $@
+
+SUFFIXES += .sed .sin
+.sin.sed:
+	rm -f t-$@ $@
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
+	mv t-$@ $@
+
+CLEANFILES += charset.alias ref-add.sed ref-del.sed
+
+EXTRA_DIST += config.charset ref-add.sin ref-del.sin
+
+## end   gnulib module localcharset
+
+## begin gnulib module malloc-posix
+
+
+EXTRA_DIST += malloc.c
+
+EXTRA_libgnu_a_SOURCES += malloc.c
+
+## end   gnulib module malloc-posix
+
+## begin gnulib module malloca
+
+libgnu_a_SOURCES += malloca.c
+
+EXTRA_DIST += malloca.h malloca.valgrind
+
+## end   gnulib module malloca
+
+## begin gnulib module mbchar
+
+libgnu_a_SOURCES += mbchar.c
+
+EXTRA_DIST += mbchar.h
+
+## end   gnulib module mbchar
+
+## begin gnulib module mbscasecmp
+
+libgnu_a_SOURCES += mbscasecmp.c
+
+## end   gnulib module mbscasecmp
+
+## begin gnulib module mbsncasecmp
+
+libgnu_a_SOURCES += mbsncasecmp.c
+
+## end   gnulib module mbsncasecmp
+
+## begin gnulib module mbswidth
+
+libgnu_a_SOURCES += mbswidth.h mbswidth.c
+
+## end   gnulib module mbswidth
+
+## begin gnulib module mbuiter
+
+libgnu_a_SOURCES += mbuiter.h
+
+## end   gnulib module mbuiter
+
+## begin gnulib module memchr
+
+
+EXTRA_DIST += memchr.c
+
+EXTRA_libgnu_a_SOURCES += memchr.c
+
+## end   gnulib module memchr
+
+## begin gnulib module memcpy
+
+
+EXTRA_DIST += memcpy.c
+
+EXTRA_libgnu_a_SOURCES += memcpy.c
+
+## end   gnulib module memcpy
+
+## begin gnulib module memmove
+
+
+EXTRA_DIST += memmove.c
+
+EXTRA_libgnu_a_SOURCES += memmove.c
+
+## end   gnulib module memmove
+
+## begin gnulib module mkstemp
+
+
+EXTRA_DIST += mkstemp.c
+
+EXTRA_libgnu_a_SOURCES += mkstemp.c
+
+## end   gnulib module mkstemp
+
+## begin gnulib module setenv
+
+
+EXTRA_DIST += setenv.c
+
+EXTRA_libgnu_a_SOURCES += setenv.c
+
+## end   gnulib module setenv
+
+## begin gnulib module stdbool
+
+BUILT_SOURCES += $(STDBOOL_H)
+
+# We need the following in order to create <stdbool.h> when the system
+# doesn't have one that works.
+stdbool.h: stdbool.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
+	} > $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += stdbool.h stdbool.h-t
+
+EXTRA_DIST += stdbool.in.h
+
+## end   gnulib module stdbool
+
+## begin gnulib module stdint
+
+BUILT_SOURCES += $(STDINT_H)
+
+# We need the following in order to create <stdint.h> when the system
+# doesn't have one that works with the given compiler.
+stdint.h: stdint.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
+	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
+	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
+	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
+	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
+	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
+	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
+	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+	      < $(srcdir)/stdint.in.h; \
+	} > $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += stdint.h stdint.h-t
+
+EXTRA_DIST += stdint.in.h
+
+## end   gnulib module stdint
+
+## begin gnulib module stdlib
+
+BUILT_SOURCES += stdlib.h
+
+# We need the following in order to create <stdlib.h> when the system
+# doesn't have one that works with the given compiler.
+stdlib.h: stdlib.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
+	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
+	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
+	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+	      -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
+	      -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
+	      -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
+	      -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
+	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
+	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
+	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
+	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
+	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
+	      -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
+	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
+	      -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
+	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
+	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
+	      -e 's|@''VOID_UNSETENV''@|$(VOID_UNSETENV)|g' \
+	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      < $(srcdir)/stdlib.in.h; \
+	} > $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += stdlib.h stdlib.h-t
+
+EXTRA_DIST += stdlib.in.h
+
+## end   gnulib module stdlib
+
+## begin gnulib module strdup
+
+
+EXTRA_DIST += strdup.c
+
+EXTRA_libgnu_a_SOURCES += strdup.c
+
+## end   gnulib module strdup
+
+## begin gnulib module streq
+
+
+EXTRA_DIST += streq.h
+
+## end   gnulib module streq
+
+## begin gnulib module strerror
+
+
+EXTRA_DIST += strerror.c
+
+EXTRA_libgnu_a_SOURCES += strerror.c
+
+## end   gnulib module strerror
+
+## begin gnulib module string
+
+BUILT_SOURCES += string.h
+
+# We need the following in order to create <string.h> when the system
+# doesn't have one that works with the given compiler.
+string.h: string.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
+	      -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
+	      -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
+	      -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
+	      -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
+	      -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
+	      -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
+	      -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
+	      -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
+	      -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
+	      -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
+	      -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
+	      -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
+	      -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
+	      -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
+	      -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
+	      -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
+	      -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
+	      -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
+	      -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
+	      -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
+	      -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
+	      -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
+	      -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \
+	      -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
+	      -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+	      -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
+	      -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
+	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
+	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
+	      -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
+	      -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \
+	      -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \
+	      -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \
+	      -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \
+	      -e 's|@''HAVE_STRNDUP''@|$(HAVE_STRNDUP)|g' \
+	      -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \
+	      -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \
+	      -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \
+	      -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
+	      -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
+	      -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
+	      -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \
+	      -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
+	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
+	      -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
+	      -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
+	      -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
+	      -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
+	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      < $(srcdir)/string.in.h; \
+	} > $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += string.h string.h-t
+
+EXTRA_DIST += string.in.h
+
+## end   gnulib module string
+
+## begin gnulib module strnlen1
+
+libgnu_a_SOURCES += strnlen1.h strnlen1.c
+
+## end   gnulib module strnlen1
+
+## begin gnulib module sys_stat
+
+BUILT_SOURCES += $(SYS_STAT_H)
+
+# We need the following in order to create <sys/stat.h> when the system
+# has one that is incomplete.
+sys/stat.h: sys_stat.in.h
+	@MKDIR_P@ sys
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
+	      -e 's|@''HAVE_IO_H''@|$(HAVE_IO_H)|g' \
+	      -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \
+	      -e 's|@''HAVE_DECL_MKDIR''@|$(HAVE_DECL_MKDIR)|g' \
+	      < $(srcdir)/sys_stat.in.h; \
+	} > $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t
+MOSTLYCLEANDIRS += sys
+
+EXTRA_DIST += sys_stat.in.h
+
+## end   gnulib module sys_stat
+
+## begin gnulib module sys_time
+
+BUILT_SOURCES += $(SYS_TIME_H)
+
+# We need the following in order to create <sys/time.h> when the system
+# doesn't have one that works with the given compiler.
+sys/time.h: sys_time.in.h
+	@MKDIR_P@ sys
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
+	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
+	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
+	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
+	      < $(srcdir)/sys_time.in.h; \
+	} > $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += sys/time.h sys/time.h-t
+
+EXTRA_DIST += sys_time.in.h
+
+## end   gnulib module sys_time
+
+## begin gnulib module tempname
+
+
+EXTRA_DIST += tempname.c tempname.h
+
+EXTRA_libgnu_a_SOURCES += tempname.c
+
+## end   gnulib module tempname
+
+## begin gnulib module unistd
+
+BUILT_SOURCES += unistd.h
+
+# We need the following in order to create an empty placeholder for
+# <unistd.h> when the system doesn't have one.
+unistd.h: unistd.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
+	      -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
+	      -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+	      -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
+	      -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
+	      -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
+	      -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
+	      -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
+	      -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
+	      -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
+	      -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
+	      -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+	      -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
+	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
+	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
+	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
+	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
+	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
+	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
+	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
+	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+	      -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
+	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
+	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
+	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
+	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
+	      < $(srcdir)/unistd.in.h; \
+	} > $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += unistd.h unistd.h-t
+
+EXTRA_DIST += unistd.in.h
+
+## end   gnulib module unistd
+
+## begin gnulib module unitypes
+
+
+EXTRA_DIST += unitypes.h
+
+## end   gnulib module unitypes
+
+## begin gnulib module uniwidth/base
+
+
+EXTRA_DIST += localcharset.h uniwidth.h
+
+## end   gnulib module uniwidth/base
+
+## begin gnulib module uniwidth/width
+
+libgnu_a_SOURCES += uniwidth/width.c
+
+EXTRA_DIST += uniwidth/cjk.h
+
+## end   gnulib module uniwidth/width
+
+## begin gnulib module unsetenv
+
+
+EXTRA_DIST += unsetenv.c
+
+EXTRA_libgnu_a_SOURCES += unsetenv.c
+
+## end   gnulib module unsetenv
+
+## begin gnulib module wchar
+
+BUILT_SOURCES += $(WCHAR_H)
+
+# We need the following in order to create <wchar.h> when the system
+# version does not work standalone.
+wchar.h: wchar.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
+	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
+	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
+	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	    < $(srcdir)/wchar.in.h; \
+	} > $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += wchar.h wchar.h-t
+
+EXTRA_DIST += wchar.in.h
+
+## end   gnulib module wchar
+
+## begin gnulib module wctype
+
+BUILT_SOURCES += $(WCTYPE_H)
+
+# We need the following in order to create <wctype.h> when the system
+# doesn't have one that works with the given compiler.
+wctype.h: wctype.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
+	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
+	      < $(srcdir)/wctype.in.h; \
+	} > $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += wctype.h wctype.h-t
+
+EXTRA_DIST += wctype.in.h
+
+## end   gnulib module wctype
+
+## begin gnulib module wcwidth
+
+
+EXTRA_DIST += wcwidth.c
+
+EXTRA_libgnu_a_SOURCES += wcwidth.c
+
+## end   gnulib module wcwidth
+
+## begin gnulib module xalloc
+
+
+EXTRA_DIST += xalloc.h xmalloc.c
+
+EXTRA_libgnu_a_SOURCES += xmalloc.c
+
+## end   gnulib module xalloc
+
+## begin gnulib module xalloc-die
+
+libgnu_a_SOURCES += xalloc-die.c
+
+## end   gnulib module xalloc-die
+
+## begin gnulib module xsetenv
+
+libgnu_a_SOURCES += xsetenv.h xsetenv.c
+
+## end   gnulib module xsetenv
+
+
+mostlyclean-local: mostlyclean-generic
+	@for dir in '' $(MOSTLYCLEANDIRS); do \
+	  if test -n "$$dir" && test -d $$dir; then \
+	    echo "rmdir $$dir"; rmdir $$dir; \
+	  fi; \
+	done; \
+	:
diff --git a/Build/source/utils/texinfo/gnulib/lib/Makefile.in b/Build/source/utils/texinfo/gnulib/lib/Makefile.in
new file mode 100644
index 00000000000..ae687a1e239
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/Makefile.in
@@ -0,0 +1,1130 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argz getopt gettext mbscasecmp mbsncasecmp mbswidth memcpy memmove mkstemp strdup strerror xalloc xsetenv
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = gnulib/lib
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
+	$(top_srcdir)/gnulib/m4/argz.m4 \
+	$(top_srcdir)/gnulib/m4/codeset.m4 \
+	$(top_srcdir)/gnulib/m4/eealloc.m4 \
+	$(top_srcdir)/gnulib/m4/environ.m4 \
+	$(top_srcdir)/gnulib/m4/error.m4 \
+	$(top_srcdir)/gnulib/m4/exitfail.m4 \
+	$(top_srcdir)/gnulib/m4/extensions.m4 \
+	$(top_srcdir)/gnulib/m4/getopt.m4 \
+	$(top_srcdir)/gnulib/m4/gettext.m4 \
+	$(top_srcdir)/gnulib/m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib/m4/glibc21.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib/m4/iconv.m4 \
+	$(top_srcdir)/gnulib/m4/include_next.m4 \
+	$(top_srcdir)/gnulib/m4/inline.m4 \
+	$(top_srcdir)/gnulib/m4/intlmacosx.m4 \
+	$(top_srcdir)/gnulib/m4/lib-ld.m4 \
+	$(top_srcdir)/gnulib/m4/lib-link.m4 \
+	$(top_srcdir)/gnulib/m4/lib-prefix.m4 \
+	$(top_srcdir)/gnulib/m4/localcharset.m4 \
+	$(top_srcdir)/gnulib/m4/longlong.m4 \
+	$(top_srcdir)/gnulib/m4/malloc.m4 \
+	$(top_srcdir)/gnulib/m4/malloca.m4 \
+	$(top_srcdir)/gnulib/m4/mbchar.m4 \
+	$(top_srcdir)/gnulib/m4/mbiter.m4 \
+	$(top_srcdir)/gnulib/m4/mbrtowc.m4 \
+	$(top_srcdir)/gnulib/m4/mbscasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbsncasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbstate_t.m4 \
+	$(top_srcdir)/gnulib/m4/mbswidth.m4 \
+	$(top_srcdir)/gnulib/m4/memchr.m4 \
+	$(top_srcdir)/gnulib/m4/memcpy.m4 \
+	$(top_srcdir)/gnulib/m4/memmove.m4 \
+	$(top_srcdir)/gnulib/m4/mkstemp.m4 \
+	$(top_srcdir)/gnulib/m4/nls.m4 \
+	$(top_srcdir)/gnulib/m4/onceonly.m4 \
+	$(top_srcdir)/gnulib/m4/po.m4 \
+	$(top_srcdir)/gnulib/m4/progtest.m4 \
+	$(top_srcdir)/gnulib/m4/setenv.m4 \
+	$(top_srcdir)/gnulib/m4/stdbool.m4 \
+	$(top_srcdir)/gnulib/m4/stdint.m4 \
+	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
+	$(top_srcdir)/gnulib/m4/strdup.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
+	$(top_srcdir)/gnulib/m4/string_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_time_h.m4 \
+	$(top_srcdir)/gnulib/m4/tempname.m4 \
+	$(top_srcdir)/gnulib/m4/unistd_h.m4 \
+	$(top_srcdir)/gnulib/m4/wchar.m4 \
+	$(top_srcdir)/gnulib/m4/wchar_t.m4 \
+	$(top_srcdir)/gnulib/m4/wctype.m4 \
+	$(top_srcdir)/gnulib/m4/wcwidth.m4 \
+	$(top_srcdir)/gnulib/m4/wint_t.m4 \
+	$(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libgnu_a_AR = $(AR) $(ARFLAGS)
+am__DEPENDENCIES_1 =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libgnu_a_OBJECTS = localcharset.$(OBJEXT) malloca.$(OBJEXT) \
+	mbchar.$(OBJEXT) mbscasecmp.$(OBJEXT) mbsncasecmp.$(OBJEXT) \
+	mbswidth.$(OBJEXT) strnlen1.$(OBJEXT) uniwidth/width.$(OBJEXT) \
+	xalloc-die.$(OBJEXT) xsetenv.$(OBJEXT)
+libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES)
+DIST_SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H = @ALLOCA_H@
+AMTAR = @AMTAR@
+ARGZ_H = @ARGZ_H@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETOPT_H = @GETOPT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GREP = @GREP@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_IO_H = @HAVE_IO_H@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRNDUP = @HAVE_STRNDUP@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRSEP = @HAVE_STRSEP@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNSETENV = @HAVE_UNSETENV@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE__BOOL = @HAVE__BOOL@
+HELP2MAN = @HELP2MAN@
+HEVEA = @HEVEA@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POSUB = @POSUB@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+SYS_STAT_H = @SYS_STAT_H@
+SYS_TIME_H = @SYS_TIME_H@
+TERMLIBS = @TERMLIBS@
+TEX = @TEX@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VOID_UNSETENV = @VOID_UNSETENV@
+WCHAR_H = @WCHAR_H@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WCTYPE_H = @WCTYPE_H@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+native_tools = @native_tools@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
+noinst_HEADERS = 
+noinst_LIBRARIES = libgnu.a
+noinst_LTLIBRARIES = 
+EXTRA_DIST = alloca.in.h argz.c argz.in.h error.c error.h exitfail.c \
+	exitfail.h getopt.c getopt.in.h getopt1.c getopt_int.h \
+	$(top_srcdir)/build-aux/config.rpath gettimeofday.c \
+	$(top_srcdir)/build-aux/config.rpath intprops.h \
+	$(top_srcdir)/build-aux/link-warning.h config.charset \
+	ref-add.sin ref-del.sin malloc.c malloca.h malloca.valgrind \
+	mbchar.h memchr.c memcpy.c memmove.c mkstemp.c setenv.c \
+	stdbool.in.h stdint.in.h stdlib.in.h strdup.c streq.h \
+	strerror.c string.in.h sys_stat.in.h sys_time.in.h tempname.c \
+	tempname.h unistd.in.h unitypes.h localcharset.h uniwidth.h \
+	uniwidth/cjk.h unsetenv.c wchar.in.h wctype.in.h wcwidth.c \
+	xalloc.h xmalloc.c
+BUILT_SOURCES = $(ALLOCA_H) $(ARGZ_H) configmake.h $(GETOPT_H) \
+	$(STDBOOL_H) $(STDINT_H) stdlib.h string.h $(SYS_STAT_H) \
+	$(SYS_TIME_H) unistd.h $(WCHAR_H) $(WCTYPE_H)
+SUFFIXES = .sed .sin
+MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t argz.h \
+	argz.h-t getopt.h getopt.h-t stdbool.h stdbool.h-t stdint.h \
+	stdint.h-t stdlib.h stdlib.h-t string.h string.h-t sys/stat.h \
+	sys/stat.h-t sys/time.h sys/time.h-t unistd.h unistd.h-t \
+	wchar.h wchar.h-t wctype.h wctype.h-t
+MOSTLYCLEANDIRS = sys
+CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
+	ref-del.sed
+DISTCLEANFILES = 
+MAINTAINERCLEANFILES = 
+
+# This is for those projects which use "gettextize --intl" to put a source-code
+# copy of libintl into their package. In such projects, every Makefile.am needs
+# -I$(top_builddir)/intl, so that <libintl.h> can be found in this directory.
+# For the Makefile.ams in other directories it is the maintainer's
+# responsibility; for the one from gnulib we do it here.
+# This option has no effect when the user disables NLS (because then the intl
+# directory contains no libintl.h file) or when the project does not use
+# "gettextize --intl".
+AM_CPPFLAGS = -I$(top_builddir)/intl
+libgnu_a_SOURCES = gettext.h localcharset.h localcharset.c malloca.c \
+	mbchar.c mbscasecmp.c mbsncasecmp.c mbswidth.h mbswidth.c \
+	mbuiter.h strnlen1.h strnlen1.c uniwidth/width.c xalloc-die.c \
+	xsetenv.h xsetenv.c
+libgnu_a_LIBADD = $(gl_LIBOBJS)
+libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
+EXTRA_libgnu_a_SOURCES = argz.c error.c exitfail.c getopt.c getopt1.c \
+	gettimeofday.c malloc.c memchr.c memcpy.c memmove.c mkstemp.c \
+	setenv.c strdup.c strerror.c tempname.c unsetenv.c wcwidth.c \
+	xmalloc.c
+LINK_WARNING_H = $(top_srcdir)/build-aux/link-warning.h
+charset_alias = $(DESTDIR)$(libdir)/charset.alias
+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .sed .sin .c .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits  gnulib/lib/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  gnulib/lib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+uniwidth/$(am__dirstamp):
+	@$(MKDIR_P) uniwidth
+	@: > uniwidth/$(am__dirstamp)
+uniwidth/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) uniwidth/$(DEPDIR)
+	@: > uniwidth/$(DEPDIR)/$(am__dirstamp)
+uniwidth/width.$(OBJEXT): uniwidth/$(am__dirstamp) \
+	uniwidth/$(DEPDIR)/$(am__dirstamp)
+libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) 
+	-rm -f libgnu.a
+	$(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD)
+	$(RANLIB) libgnu.a
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f uniwidth/width.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/argz.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbchar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbscasecmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsncasecmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbswidth.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memcpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memmove.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkstemp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strdup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcwidth.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsetenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@uniwidth/$(DEPDIR)/width.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local
+installdirs:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f uniwidth/$(DEPDIR)/$(am__dirstamp)
+	-rm -f uniwidth/$(am__dirstamp)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR) uniwidth/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-exec-am: install-exec-local
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR) uniwidth/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-local
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-local
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
+	clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \
+	ctags distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-local
+
+
+# We need the following in order to create <alloca.h> when the system
+# doesn't have one that works with the given compiler.
+alloca.h: alloca.in.h
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/alloca.in.h; \
+	} > $@-t
+	mv -f $@-t $@
+
+# We need the following in order to create <argz.h> when the system
+# doesn't have one that works with the given compiler.
+argz.h: argz.in.h
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/argz.in.h; \
+	} > $@-t
+	mv -f $@-t $@
+
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
+# The Automake-defined pkg* macros are appended, in the order
+# listed in the Automake 1.10a+ documentation.
+configmake.h: Makefile
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  echo '#define PREFIX "$(prefix)"'; \
+	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
+	  echo '#define BINDIR "$(bindir)"'; \
+	  echo '#define SBINDIR "$(sbindir)"'; \
+	  echo '#define LIBEXECDIR "$(libexecdir)"'; \
+	  echo '#define DATAROOTDIR "$(datarootdir)"'; \
+	  echo '#define DATADIR "$(datadir)"'; \
+	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
+	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
+	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
+	  echo '#define INCLUDEDIR "$(includedir)"'; \
+	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
+	  echo '#define DOCDIR "$(docdir)"'; \
+	  echo '#define INFODIR "$(infodir)"'; \
+	  echo '#define HTMLDIR "$(htmldir)"'; \
+	  echo '#define DVIDIR "$(dvidir)"'; \
+	  echo '#define PDFDIR "$(pdfdir)"'; \
+	  echo '#define PSDIR "$(psdir)"'; \
+	  echo '#define LIBDIR "$(libdir)"'; \
+	  echo '#define LISPDIR "$(lispdir)"'; \
+	  echo '#define LOCALEDIR "$(localedir)"'; \
+	  echo '#define MANDIR "$(mandir)"'; \
+	  echo '#define MANEXT "$(manext)"'; \
+	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
+	} | sed '/""/d' > $@-t
+	mv $@-t $@
+
+# We need the following in order to create <getopt.h> when the system
+# doesn't have one that works with the given compiler.
+getopt.h: getopt.in.h
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/getopt.in.h; \
+	} > $@-t
+	mv -f $@-t $@
+
+# We need the following in order to install a simple file in $(libdir)
+# which is shared with other installed packages. We use a list of referencing
+# packages so that "make uninstall" will remove the file if and only if it
+# is not used by another installed package.
+# On systems with glibc-2.1 or newer, the file is redundant, therefore we
+# avoid installing it.
+
+all-local: charset.alias ref-add.sed ref-del.sed
+install-exec-local: all-local
+	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
+	if test -f $(charset_alias); then \
+	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	  rm -f $(charset_tmp) ; \
+	else \
+	  if test $(GLIBC21) = no; then \
+	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	    rm -f $(charset_tmp) ; \
+	  fi ; \
+	fi
+
+uninstall-local: all-local
+	if test -f $(charset_alias); then \
+	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+	  if grep '^# Packages using this file: $$' $(charset_tmp) \
+	      > /dev/null; then \
+	    rm -f $(charset_alias); \
+	  else \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+	  fi; \
+	  rm -f $(charset_tmp); \
+	fi
+
+charset.alias: config.charset
+	rm -f t-$@ $@
+	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
+	mv t-$@ $@
+.sin.sed:
+	rm -f t-$@ $@
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
+	mv t-$@ $@
+
+# We need the following in order to create <stdbool.h> when the system
+# doesn't have one that works.
+stdbool.h: stdbool.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
+	} > $@-t
+	mv $@-t $@
+
+# We need the following in order to create <stdint.h> when the system
+# doesn't have one that works with the given compiler.
+stdint.h: stdint.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
+	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
+	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
+	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
+	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
+	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
+	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
+	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+	      < $(srcdir)/stdint.in.h; \
+	} > $@-t
+	mv $@-t $@
+
+# We need the following in order to create <stdlib.h> when the system
+# doesn't have one that works with the given compiler.
+stdlib.h: stdlib.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
+	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
+	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
+	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+	      -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
+	      -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
+	      -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
+	      -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
+	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
+	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
+	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
+	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
+	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
+	      -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
+	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
+	      -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
+	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
+	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
+	      -e 's|@''VOID_UNSETENV''@|$(VOID_UNSETENV)|g' \
+	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      < $(srcdir)/stdlib.in.h; \
+	} > $@-t
+	mv $@-t $@
+
+# We need the following in order to create <string.h> when the system
+# doesn't have one that works with the given compiler.
+string.h: string.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
+	      -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
+	      -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
+	      -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
+	      -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
+	      -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
+	      -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \
+	      -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
+	      -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
+	      -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
+	      -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
+	      -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
+	      -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
+	      -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
+	      -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
+	      -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
+	      -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
+	      -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
+	      -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
+	      -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
+	      -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
+	      -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
+	      -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
+	      -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
+	      -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \
+	      -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
+	      -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+	      -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
+	      -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
+	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
+	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
+	      -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
+	      -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \
+	      -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \
+	      -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \
+	      -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \
+	      -e 's|@''HAVE_STRNDUP''@|$(HAVE_STRNDUP)|g' \
+	      -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \
+	      -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \
+	      -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \
+	      -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
+	      -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
+	      -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
+	      -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \
+	      -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
+	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
+	      -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
+	      -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
+	      -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
+	      -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
+	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      < $(srcdir)/string.in.h; \
+	} > $@-t
+	mv $@-t $@
+
+# We need the following in order to create <sys/stat.h> when the system
+# has one that is incomplete.
+sys/stat.h: sys_stat.in.h
+	@MKDIR_P@ sys
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
+	      -e 's|@''HAVE_IO_H''@|$(HAVE_IO_H)|g' \
+	      -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \
+	      -e 's|@''HAVE_DECL_MKDIR''@|$(HAVE_DECL_MKDIR)|g' \
+	      < $(srcdir)/sys_stat.in.h; \
+	} > $@-t
+	mv $@-t $@
+
+# We need the following in order to create <sys/time.h> when the system
+# doesn't have one that works with the given compiler.
+sys/time.h: sys_time.in.h
+	@MKDIR_P@ sys
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
+	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
+	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
+	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
+	      < $(srcdir)/sys_time.in.h; \
+	} > $@-t
+	mv $@-t $@
+
+# We need the following in order to create an empty placeholder for
+# <unistd.h> when the system doesn't have one.
+unistd.h: unistd.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
+	      -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
+	      -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+	      -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
+	      -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
+	      -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
+	      -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
+	      -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
+	      -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
+	      -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
+	      -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
+	      -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+	      -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
+	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
+	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
+	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
+	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
+	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
+	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
+	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
+	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+	      -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
+	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
+	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
+	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
+	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
+	      < $(srcdir)/unistd.in.h; \
+	} > $@-t
+	mv $@-t $@
+
+# We need the following in order to create <wchar.h> when the system
+# version does not work standalone.
+wchar.h: wchar.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
+	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
+	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
+	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	    < $(srcdir)/wchar.in.h; \
+	} > $@-t
+	mv $@-t $@
+
+# We need the following in order to create <wctype.h> when the system
+# doesn't have one that works with the given compiler.
+wctype.h: wctype.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
+	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
+	      < $(srcdir)/wctype.in.h; \
+	} > $@-t
+	mv $@-t $@
+
+mostlyclean-local: mostlyclean-generic
+	@for dir in '' $(MOSTLYCLEANDIRS); do \
+	  if test -n "$$dir" && test -d $$dir; then \
+	    echo "rmdir $$dir"; rmdir $$dir; \
+	  fi; \
+	done; \
+	:
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/Build/source/utils/texinfo/gnulib/lib/alloca.in.h b/Build/source/utils/texinfo/gnulib/lib/alloca.in.h
new file mode 100644
index 00000000000..6269607a475
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/alloca.in.h
@@ -0,0 +1,56 @@
+/* Memory allocation on the stack.
+
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2008 Free Software
+   Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+/* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
+   means there is a real alloca function.  */
+#ifndef _GL_ALLOCA_H
+#define _GL_ALLOCA_H
+
+/* alloca (N) returns a pointer to N bytes of memory
+   allocated on the stack, which will last until the function returns.
+   Use of alloca should be avoided:
+     - inside arguments of function calls - undefined behaviour,
+     - in inline functions - the allocation may actually last until the
+       calling function returns,
+     - for huge N (say, N >= 65536) - you never know how large (or small)
+       the stack is, and when the stack cannot fulfill the memory allocation
+       request, the program just crashes.
+ */
+
+#ifndef alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _AIX
+#  define alloca __alloca
+# elif defined _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# elif defined __DECC && defined __VMS
+#  define alloca __ALLOCA
+# else
+#  include <stddef.h>
+#  ifdef  __cplusplus
+extern "C"
+#  endif
+void *alloca (size_t);
+# endif
+#endif
+
+#endif /* _GL_ALLOCA_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/argz.c b/Build/source/utils/texinfo/gnulib/lib/argz.c
new file mode 100644
index 00000000000..eb83167d5ef
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/argz.c
@@ -0,0 +1,254 @@
+/* argz.c -- argz implementation for non-glibc systems
+
+   Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Written by Gary V. Vaughan, 2004
+
+   NOTE: The canonical source of this file is maintained with the
+   GNU Libtool package.  Report bugs to bug-libtool@gnu.org.
+
+GNU Libltdl is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later version.
+
+As a special exception to the GNU General Public License,
+if you distribute this file as part of a program or library that
+is built using GNU Libtool, you may include this file under the
+same distribution terms that you use for the rest of that program.
+
+GNU Libltdl is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
+copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
+or obtained by writing to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#if defined(LTDL) && defined LT_CONFIG_H
+#  include LT_CONFIG_H
+#else
+#  include <config.h>
+#endif
+
+#include <argz.h>
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <string.h>
+
+#define EOS_CHAR '\0'
+
+error_t
+argz_append (char **pargz, size_t *pargz_len, const char *buf, size_t buf_len)
+{
+  size_t argz_len;
+  char  *argz;
+
+  assert (pargz);
+  assert (pargz_len);
+  assert ((*pargz && *pargz_len) || (!*pargz && !*pargz_len));
+
+  /* If nothing needs to be appended, no more work is required.  */
+  if (buf_len == 0)
+    return 0;
+
+  /* Ensure there is enough room to append BUF_LEN.  */
+  argz_len = *pargz_len + buf_len;
+  argz = (char *) realloc (*pargz, argz_len);
+  if (!argz)
+    return ENOMEM;
+
+  /* Copy characters from BUF after terminating '\0' in ARGZ.  */
+  memcpy (argz + *pargz_len, buf, buf_len);
+
+  /* Assign new values.  */
+  *pargz = argz;
+  *pargz_len = argz_len;
+
+  return 0;
+}
+
+
+/* Add a string to the argz vector.  */
+error_t
+argz_add (char **pargz, size_t *pargz_len, const char *str)
+{
+  return argz_append (pargz, pargz_len, str, strlen (str) + 1);
+}
+
+
+error_t
+argz_create_sep (const char *str, int delim, char **pargz, size_t *pargz_len)
+{
+  size_t argz_len;
+  char *argz = 0;
+
+  assert (str);
+  assert (pargz);
+  assert (pargz_len);
+
+  /* Make a copy of STR, but replacing each occurrence of
+     DELIM with '\0'.  */
+  argz_len = 1+ strlen (str);
+  if (argz_len)
+    {
+      const char *p;
+      char *q;
+
+      argz = (char *) malloc (argz_len);
+      if (!argz)
+	return ENOMEM;
+
+      for (p = str, q = argz; *p != EOS_CHAR; ++p)
+	{
+	  if (*p == delim)
+	    {
+	      /* Ignore leading delimiters, and fold consecutive
+		 delimiters in STR into a single '\0' in ARGZ.  */
+	      if ((q > argz) && (q[-1] != EOS_CHAR))
+		*q++ = EOS_CHAR;
+	      else
+		--argz_len;
+	    }
+	  else
+	    *q++ = *p;
+	}
+      /* Copy terminating EOS_CHAR.  */
+      *q = *p;
+    }
+
+  /* If ARGZ_LEN has shrunk to nothing, release ARGZ's memory.  */
+  if (!argz_len)
+    argz = (free (argz), (char *) 0);
+
+  /* Assign new values.  */
+  *pargz = argz;
+  *pargz_len = argz_len;
+
+  return 0;
+}
+
+
+error_t
+argz_insert (char **pargz, size_t *pargz_len, char *before, const char *entry)
+{
+  assert (pargz);
+  assert (pargz_len);
+  assert (entry && *entry);
+
+  /* No BEFORE address indicates ENTRY should be inserted after the
+     current last element.  */
+  if (!before)
+    return argz_append (pargz, pargz_len, entry, 1+ strlen (entry));
+
+  /* This probably indicates a programmer error, but to preserve
+     semantics, scan back to the start of an entry if BEFORE points
+     into the middle of it.  */
+  while ((before > *pargz) && (before[-1] != EOS_CHAR))
+    --before;
+
+  {
+    size_t entry_len	= 1+ strlen (entry);
+    size_t argz_len	= *pargz_len + entry_len;
+    size_t offset	= before - *pargz;
+    char   *argz	= (char *) realloc (*pargz, argz_len);
+
+    if (!argz)
+      return ENOMEM;
+
+    /* Make BEFORE point to the equivalent offset in ARGZ that it
+       used to have in *PARGZ incase realloc() moved the block.  */
+    before = argz + offset;
+
+    /* Move the ARGZ entries starting at BEFORE up into the new
+       space at the end -- making room to copy ENTRY into the
+       resulting gap.  */
+    memmove (before + entry_len, before, *pargz_len - offset);
+    memcpy  (before, entry, entry_len);
+
+    /* Assign new values.  */
+    *pargz = argz;
+    *pargz_len = argz_len;
+  }
+
+  return 0;
+}
+
+
+char *
+argz_next (char *argz, size_t argz_len, const char *entry)
+{
+  assert ((argz && argz_len) || (!argz && !argz_len));
+
+  if (entry)
+    {
+      /* Either ARGZ/ARGZ_LEN is empty, or ENTRY points into an address
+	 within the ARGZ vector.  */
+      assert ((!argz && !argz_len)
+	      || ((argz <= entry) && (entry < (argz + argz_len))));
+
+      /* Move to the char immediately after the terminating
+	 '\0' of ENTRY.  */
+      entry = 1+ strchr (entry, EOS_CHAR);
+
+      /* Return either the new ENTRY, or else NULL if ARGZ is
+	 exhausted.  */
+      return (entry >= argz + argz_len) ? 0 : (char *) entry;
+    }
+  else
+    {
+      /* This should probably be flagged as a programmer error,
+	 since starting an argz_next loop with the iterator set
+	 to ARGZ is safer.  To preserve semantics, handle the NULL
+	 case by returning the start of ARGZ (if any).  */
+      if (argz_len > 0)
+	return argz;
+      else
+	return 0;
+    }
+}
+
+
+void
+argz_stringify (char *argz, size_t argz_len, int sep)
+{
+  assert ((argz && argz_len) || (!argz && !argz_len));
+
+  if (sep)
+    {
+      --argz_len;		/* don't stringify the terminating EOS */
+      while (--argz_len > 0)
+	{
+	  if (argz[argz_len] == EOS_CHAR)
+	    argz[argz_len] = sep;
+	}
+    }
+}
+
+
+/* Count number of elements (null bytes) in argz vector.  */
+
+size_t
+argz_count (const char *argz, size_t argz_len)
+{
+  size_t count = 0;
+
+  assert ((argz && argz_len) || (!argz && !argz_len));
+  
+  while (argz_len > 0)
+    {
+      size_t part_len = strlen (argz);
+      argz += part_len + 1;
+      argz_len -= part_len + 1;
+      count++;
+    }
+  
+  return count;
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/argz.in.h b/Build/source/utils/texinfo/gnulib/lib/argz.in.h
new file mode 100644
index 00000000000..fe9ee9ff754
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/argz.in.h
@@ -0,0 +1,71 @@
+/* lt__argz.h -- internal argz interface for non-glibc systems
+
+   Copyright (C) 2004, 2007, 2008 Free Software Foundation, Inc.
+   Written by Gary V. Vaughan, 2004
+
+   NOTE: The canonical source of this file is maintained with the
+   GNU Libtool package.  Report bugs to bug-libtool@gnu.org.
+
+GNU Libltdl is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later version.
+
+As a special exception to the GNU General Public License,
+if you distribute this file as part of a program or library that
+is built using GNU Libtool, you may include this file under the
+same distribution terms that you use for the rest of that program.
+
+GNU Libltdl is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
+copy can be downloaded from http://www.gnu.org/licenses/lgpl.html,
+or obtained by writing to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#if !defined(LT__ARGZ_H)
+#define LT__ARGZ_H 1
+
+#include <stdlib.h>
+#define __need_error_t
+#include <errno.h>
+#include <sys/types.h>
+
+#if defined(LTDL)
+#  include "lt__glibc.h"
+#  include "lt_system.h"
+#else
+#  define LT_SCOPE
+#endif
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+LT_SCOPE error_t argz_append	(char **pargz, size_t *pargz_len,
+				 const char *buf, size_t buf_len);
+LT_SCOPE error_t argz_add       (char **pargz, size_t *pargz_len,
+                                 const char *str);
+LT_SCOPE error_t argz_create_sep(const char *str, int delim,
+				 char **pargz, size_t *pargz_len);
+LT_SCOPE error_t argz_insert	(char **pargz, size_t *pargz_len,
+				 char *before, const char *entry);
+LT_SCOPE char *	 argz_next	(char *argz, size_t argz_len,
+				 const char *entry);
+LT_SCOPE void	 argz_stringify	(char *argz, size_t argz_len, int sep);
+LT_SCOPE size_t  argz_count     (const char *argz, size_t argz_len);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#if !defined(LTDL)
+#  undef LT_SCOPE
+#endif
+
+#endif /*!defined(LT__ARGZ_H)*/
diff --git a/Build/source/utils/texinfo/gnulib/lib/config.charset b/Build/source/utils/texinfo/gnulib/lib/config.charset
new file mode 100755
index 00000000000..c2337887bc3
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/config.charset
@@ -0,0 +1,649 @@
+#! /bin/sh
+# Output a system dependent table of character encoding aliases.
+#
+#   Copyright (C) 2000-2004, 2006-2007 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The table consists of lines of the form
+#    ALIAS  CANONICAL
+#
+# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
+# ALIAS is compared in a case sensitive way.
+#
+# CANONICAL is the GNU canonical name for this character encoding.
+# It must be an encoding supported by libiconv. Support by GNU libc is
+# also desirable. CANONICAL is case insensitive. Usually an upper case
+# MIME charset name is preferred.
+# The current list of GNU canonical charset names is as follows.
+#
+#       name              MIME?             used by which systems
+#   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin
+#   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin
+#   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin
+#   ISO-8859-3              Y   glibc solaris
+#   ISO-8859-4              Y   osf solaris freebsd netbsd openbsd darwin
+#   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin
+#   ISO-8859-6              Y   glibc aix hpux solaris
+#   ISO-8859-7              Y   glibc aix hpux irix osf solaris netbsd openbsd darwin
+#   ISO-8859-8              Y   glibc aix hpux osf solaris
+#   ISO-8859-9              Y   glibc aix hpux irix osf solaris darwin
+#   ISO-8859-13                 glibc netbsd openbsd darwin
+#   ISO-8859-14                 glibc
+#   ISO-8859-15                 glibc aix osf solaris freebsd netbsd openbsd darwin
+#   KOI8-R                  Y   glibc solaris freebsd netbsd openbsd darwin
+#   KOI8-U                  Y   glibc freebsd netbsd openbsd darwin
+#   KOI8-T                      glibc
+#   CP437                       dos
+#   CP775                       dos
+#   CP850                       aix osf dos
+#   CP852                       dos
+#   CP855                       dos
+#   CP856                       aix
+#   CP857                       dos
+#   CP861                       dos
+#   CP862                       dos
+#   CP864                       dos
+#   CP865                       dos
+#   CP866                       freebsd netbsd openbsd darwin dos
+#   CP869                       dos
+#   CP874                       woe32 dos
+#   CP922                       aix
+#   CP932                       aix woe32 dos
+#   CP943                       aix
+#   CP949                       osf woe32 dos
+#   CP950                       woe32 dos
+#   CP1046                      aix
+#   CP1124                      aix
+#   CP1125                      dos
+#   CP1129                      aix
+#   CP1250                      woe32
+#   CP1251                      glibc solaris netbsd openbsd darwin woe32
+#   CP1252                      aix woe32
+#   CP1253                      woe32
+#   CP1254                      woe32
+#   CP1255                      glibc woe32
+#   CP1256                      woe32
+#   CP1257                      woe32
+#   GB2312                  Y   glibc aix hpux irix solaris freebsd netbsd darwin
+#   EUC-JP                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
+#   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
+#   EUC-TW                      glibc aix hpux irix osf solaris netbsd
+#   BIG5                    Y   glibc aix hpux osf solaris freebsd netbsd darwin
+#   BIG5-HKSCS                  glibc solaris
+#   GBK                         glibc aix osf solaris woe32 dos
+#   GB18030                     glibc solaris netbsd
+#   SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
+#   JOHAB                       glibc solaris woe32
+#   TIS-620                     glibc aix hpux osf solaris
+#   VISCII                  Y   glibc
+#   TCVN5712-1                  glibc
+#   GEORGIAN-PS                 glibc
+#   HP-ROMAN8                   hpux
+#   HP-ARABIC8                  hpux
+#   HP-GREEK8                   hpux
+#   HP-HEBREW8                  hpux
+#   HP-TURKISH8                 hpux
+#   HP-KANA8                    hpux
+#   DEC-KANJI                   osf
+#   DEC-HANYU                   osf
+#   UTF-8                   Y   glibc aix hpux osf solaris netbsd darwin
+#
+# Note: Names which are not marked as being a MIME name should not be used in
+# Internet protocols for information interchange (mail, news, etc.).
+#
+# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
+# must understand both names and treat them as equivalent.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+
+host="$1"
+os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
+echo "# This file contains a table of character encoding aliases,"
+echo "# suitable for operating system '${os}'."
+echo "# It was automatically generated from config.charset."
+# List of references, updated during installation:
+echo "# Packages using this file: "
+case "$os" in
+    linux-gnulibc1*)
+	# Linux libc5 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "C ASCII"
+	echo "POSIX ASCII"
+	for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
+	         en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
+	         en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
+	         es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
+	         et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
+	         fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
+	         it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
+	         sv_FI sv_SE; do
+	  echo "$l ISO-8859-1"
+	  echo "$l.iso-8859-1 ISO-8859-1"
+	  echo "$l.iso-8859-15 ISO-8859-15"
+	  echo "$l.iso-8859-15@euro ISO-8859-15"
+	  echo "$l@euro ISO-8859-15"
+	  echo "$l.cp-437 CP437"
+	  echo "$l.cp-850 CP850"
+	  echo "$l.cp-1252 CP1252"
+	  echo "$l.cp-1252@euro CP1252"
+	  #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
+	  echo "$l.utf-8 UTF-8"
+	  echo "$l.utf-8@euro UTF-8"
+	done
+	for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
+	         sl_SI sr sr_CS sr_YU; do
+	  echo "$l ISO-8859-2"
+	  echo "$l.iso-8859-2 ISO-8859-2"
+	  echo "$l.cp-852 CP852"
+	  echo "$l.cp-1250 CP1250"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in mk mk_MK ru ru_RU; do
+	  echo "$l ISO-8859-5"
+	  echo "$l.iso-8859-5 ISO-8859-5"
+	  echo "$l.koi8-r KOI8-R"
+	  echo "$l.cp-866 CP866"
+	  echo "$l.cp-1251 CP1251"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in ar ar_SA; do
+	  echo "$l ISO-8859-6"
+	  echo "$l.iso-8859-6 ISO-8859-6"
+	  echo "$l.cp-864 CP864"
+	  #echo "$l.cp-868 CP868" # not a commonly used encoding
+	  echo "$l.cp-1256 CP1256"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in el el_GR gr gr_GR; do
+	  echo "$l ISO-8859-7"
+	  echo "$l.iso-8859-7 ISO-8859-7"
+	  echo "$l.cp-869 CP869"
+	  echo "$l.cp-1253 CP1253"
+	  echo "$l.cp-1253@euro CP1253"
+	  echo "$l.utf-8 UTF-8"
+	  echo "$l.utf-8@euro UTF-8"
+	done
+	for l in he he_IL iw iw_IL; do
+	  echo "$l ISO-8859-8"
+	  echo "$l.iso-8859-8 ISO-8859-8"
+	  echo "$l.cp-862 CP862"
+	  echo "$l.cp-1255 CP1255"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in tr tr_TR; do
+	  echo "$l ISO-8859-9"
+	  echo "$l.iso-8859-9 ISO-8859-9"
+	  echo "$l.cp-857 CP857"
+	  echo "$l.cp-1254 CP1254"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in lt lt_LT lv lv_LV; do
+	  #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
+	  echo "$l ISO-8859-13"
+	done
+	for l in ru_UA uk uk_UA; do
+	  echo "$l KOI8-U"
+	done
+	for l in zh zh_CN; do
+	  #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
+	  echo "$l GB2312"
+	done
+	for l in ja ja_JP ja_JP.EUC; do
+	  echo "$l EUC-JP"
+	done
+	for l in ko ko_KR; do
+	  echo "$l EUC-KR"
+	done
+	for l in th th_TH; do
+	  echo "$l TIS-620"
+	done
+	for l in fa fa_IR; do
+	  #echo "$l ISIRI-3342" # a broken encoding
+	  echo "$l.utf-8 UTF-8"
+	done
+	;;
+    linux* | *-gnu*)
+	# With glibc-2.1 or newer, we don't need any canonicalization,
+	# because glibc has iconv and both glibc and libiconv support all
+	# GNU canonical names directly. Therefore, the Makefile does not
+	# need to install the alias file at all.
+	# The following applies only to glibc-2.0.x and older libcs.
+	echo "ISO_646.IRV:1983 ASCII"
+	;;
+    aix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-6 ISO-8859-6"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "IBM-850 CP850"
+	echo "IBM-856 CP856"
+	echo "IBM-921 ISO-8859-13"
+	echo "IBM-922 CP922"
+	echo "IBM-932 CP932"
+	echo "IBM-943 CP943"
+	echo "IBM-1046 CP1046"
+	echo "IBM-1124 CP1124"
+	echo "IBM-1129 CP1129"
+	echo "IBM-1252 CP1252"
+	echo "IBM-eucCN GB2312"
+	echo "IBM-eucJP EUC-JP"
+	echo "IBM-eucKR EUC-KR"
+	echo "IBM-eucTW EUC-TW"
+	echo "big5 BIG5"
+	echo "GBK GBK"
+	echo "TIS-620 TIS-620"
+	echo "UTF-8 UTF-8"
+	;;
+    hpux*)
+	echo "iso88591 ISO-8859-1"
+	echo "iso88592 ISO-8859-2"
+	echo "iso88595 ISO-8859-5"
+	echo "iso88596 ISO-8859-6"
+	echo "iso88597 ISO-8859-7"
+	echo "iso88598 ISO-8859-8"
+	echo "iso88599 ISO-8859-9"
+	echo "iso885915 ISO-8859-15"
+	echo "roman8 HP-ROMAN8"
+	echo "arabic8 HP-ARABIC8"
+	echo "greek8 HP-GREEK8"
+	echo "hebrew8 HP-HEBREW8"
+	echo "turkish8 HP-TURKISH8"
+	echo "kana8 HP-KANA8"
+	echo "tis620 TIS-620"
+	echo "big5 BIG5"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "hp15CN GB2312"
+	#echo "ccdc ?" # what is this?
+	echo "SJIS SHIFT_JIS"
+	echo "utf8 UTF-8"
+	;;
+    irix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "eucCN GB2312"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	;;
+    osf*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "cp850 CP850"
+	echo "big5 BIG5"
+	echo "dechanyu DEC-HANYU"
+	echo "dechanzi GB2312"
+	echo "deckanji DEC-KANJI"
+	echo "deckorean EUC-KR"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "GBK GBK"
+	echo "KSC5601 CP949"
+	echo "sdeckanji EUC-JP"
+	echo "SJIS SHIFT_JIS"
+	echo "TACTIS TIS-620"
+	echo "UTF-8 UTF-8"
+	;;
+    solaris*)
+	echo "646 ASCII"
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-3 ISO-8859-3"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-6 ISO-8859-6"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "koi8-r KOI8-R"
+	echo "ansi-1251 CP1251"
+	echo "BIG5 BIG5"
+	echo "Big5-HKSCS BIG5-HKSCS"
+	echo "gb2312 GB2312"
+	echo "GBK GBK"
+	echo "GB18030 GB18030"
+	echo "cns11643 EUC-TW"
+	echo "5601 EUC-KR"
+	echo "ko_KR.johap92 JOHAB"
+	echo "eucJP EUC-JP"
+	echo "PCK SHIFT_JIS"
+	echo "TIS620.2533 TIS-620"
+	#echo "sun_eu_greek ?" # what is this?
+	echo "UTF-8 UTF-8"
+	;;
+    freebsd* | os2*)
+	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	# Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
+	# reuse FreeBSD's locale data for OS/2.
+	echo "C ASCII"
+	echo "US-ASCII ASCII"
+	for l in la_LN lt_LN; do
+	  echo "$l.ASCII ASCII"
+	done
+	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
+	  echo "$l.ISO_8859-1 ISO-8859-1"
+	  echo "$l.DIS_8859-15 ISO-8859-15"
+	done
+	for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
+	  echo "$l.ISO_8859-2 ISO-8859-2"
+	done
+	for l in la_LN lt_LT; do
+	  echo "$l.ISO_8859-4 ISO-8859-4"
+	done
+	for l in ru_RU ru_SU; do
+	  echo "$l.KOI8-R KOI8-R"
+	  echo "$l.ISO_8859-5 ISO-8859-5"
+	  echo "$l.CP866 CP866"
+	done
+	echo "uk_UA.KOI8-U KOI8-U"
+	echo "zh_TW.BIG5 BIG5"
+	echo "zh_TW.Big5 BIG5"
+	echo "zh_CN.EUC GB2312"
+	echo "ja_JP.EUC EUC-JP"
+	echo "ja_JP.SJIS SHIFT_JIS"
+	echo "ja_JP.Shift_JIS SHIFT_JIS"
+	echo "ko_KR.EUC EUC-KR"
+	;;
+    netbsd*)
+	echo "646 ASCII"
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-13 ISO-8859-13"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "eucCN GB2312"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "BIG5 BIG5"
+	echo "SJIS SHIFT_JIS"
+	;;
+    openbsd*)
+	echo "646 ASCII"
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-13 ISO-8859-13"
+	echo "ISO8859-15 ISO-8859-15"
+	;;
+    darwin[56]*)
+	# Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "C ASCII"
+	for l in en_AU en_CA en_GB en_US la_LN; do
+	  echo "$l.US-ASCII ASCII"
+	done
+	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
+	         nl_NL no_NO pt_PT sv_SE; do
+	  echo "$l ISO-8859-1"
+	  echo "$l.ISO8859-1 ISO-8859-1"
+	  echo "$l.ISO8859-15 ISO-8859-15"
+	done
+	for l in la_LN; do
+	  echo "$l.ISO8859-1 ISO-8859-1"
+	  echo "$l.ISO8859-15 ISO-8859-15"
+	done
+	for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
+	  echo "$l.ISO8859-2 ISO-8859-2"
+	done
+	for l in la_LN lt_LT; do
+	  echo "$l.ISO8859-4 ISO-8859-4"
+	done
+	for l in ru_RU; do
+	  echo "$l.KOI8-R KOI8-R"
+	  echo "$l.ISO8859-5 ISO-8859-5"
+	  echo "$l.CP866 CP866"
+	done
+	for l in bg_BG; do
+	  echo "$l.CP1251 CP1251"
+	done
+	echo "uk_UA.KOI8-U KOI8-U"
+	echo "zh_TW.BIG5 BIG5"
+	echo "zh_TW.Big5 BIG5"
+	echo "zh_CN.EUC GB2312"
+	echo "ja_JP.EUC EUC-JP"
+	echo "ja_JP.SJIS SHIFT_JIS"
+	echo "ko_KR.EUC EUC-KR"
+	;;
+    darwin*)
+	# Darwin 7.5 has nl_langinfo(CODESET), but it is useless:
+	# - It returns the empty string when LANG is set to a locale of the
+	#   form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
+	#   LC_CTYPE file.
+	# - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
+	#   the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
+	# - The documentation says:
+	#     "... all code that calls BSD system routines should ensure
+	#      that the const *char parameters of these routines are in UTF-8
+	#      encoding. All BSD system functions expect their string
+	#      parameters to be in UTF-8 encoding and nothing else."
+	#   It also says
+	#     "An additional caveat is that string parameters for files,
+	#      paths, and other file-system entities must be in canonical
+	#      UTF-8. In a canonical UTF-8 Unicode string, all decomposable
+	#      characters are decomposed ..."
+	#   but this is not true: You can pass non-decomposed UTF-8 strings
+	#   to file system functions, and it is the OS which will convert
+	#   them to decomposed UTF-8 before accessing the file system.
+	# - The Apple Terminal application displays UTF-8 by default.
+	# - However, other applications are free to use different encodings:
+	#   - xterm uses ISO-8859-1 by default.
+	#   - TextEdit uses MacRoman by default.
+	# We prefer UTF-8 over decomposed UTF-8-MAC because one should
+	# minimize the use of decomposed Unicode. Unfortunately, through the
+	# Darwin file system, decomposed UTF-8 strings are leaked into user
+	# space nevertheless.
+	echo "* UTF-8"
+	;;
+    beos*)
+	# BeOS has a single locale, and it has UTF-8 encoding.
+	echo "* UTF-8"
+	;;
+    msdosdjgpp*)
+	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "#"
+	echo "# The encodings given here may not all be correct."
+	echo "# If you find that the encoding given for your language and"
+	echo "# country is not the one your DOS machine actually uses, just"
+	echo "# correct it in this file, and send a mail to"
+	echo "# Juan Manuel Guerrero <juan.guerrero@gmx.de>"
+	echo "# and Bruno Haible <bruno@clisp.org>."
+	echo "#"
+	echo "C ASCII"
+	# ISO-8859-1 languages
+	echo "ca CP850"
+	echo "ca_ES CP850"
+	echo "da CP865"    # not CP850 ??
+	echo "da_DK CP865" # not CP850 ??
+	echo "de CP850"
+	echo "de_AT CP850"
+	echo "de_CH CP850"
+	echo "de_DE CP850"
+	echo "en CP850"
+	echo "en_AU CP850" # not CP437 ??
+	echo "en_CA CP850"
+	echo "en_GB CP850"
+	echo "en_NZ CP437"
+	echo "en_US CP437"
+	echo "en_ZA CP850" # not CP437 ??
+	echo "es CP850"
+	echo "es_AR CP850"
+	echo "es_BO CP850"
+	echo "es_CL CP850"
+	echo "es_CO CP850"
+	echo "es_CR CP850"
+	echo "es_CU CP850"
+	echo "es_DO CP850"
+	echo "es_EC CP850"
+	echo "es_ES CP850"
+	echo "es_GT CP850"
+	echo "es_HN CP850"
+	echo "es_MX CP850"
+	echo "es_NI CP850"
+	echo "es_PA CP850"
+	echo "es_PY CP850"
+	echo "es_PE CP850"
+	echo "es_SV CP850"
+	echo "es_UY CP850"
+	echo "es_VE CP850"
+	echo "et CP850"
+	echo "et_EE CP850"
+	echo "eu CP850"
+	echo "eu_ES CP850"
+	echo "fi CP850"
+	echo "fi_FI CP850"
+	echo "fr CP850"
+	echo "fr_BE CP850"
+	echo "fr_CA CP850"
+	echo "fr_CH CP850"
+	echo "fr_FR CP850"
+	echo "ga CP850"
+	echo "ga_IE CP850"
+	echo "gd CP850"
+	echo "gd_GB CP850"
+	echo "gl CP850"
+	echo "gl_ES CP850"
+	echo "id CP850"    # not CP437 ??
+	echo "id_ID CP850" # not CP437 ??
+	echo "is CP861"    # not CP850 ??
+	echo "is_IS CP861" # not CP850 ??
+	echo "it CP850"
+	echo "it_CH CP850"
+	echo "it_IT CP850"
+	echo "lt CP775"
+	echo "lt_LT CP775"
+	echo "lv CP775"
+	echo "lv_LV CP775"
+	echo "nb CP865"    # not CP850 ??
+	echo "nb_NO CP865" # not CP850 ??
+	echo "nl CP850"
+	echo "nl_BE CP850"
+	echo "nl_NL CP850"
+	echo "nn CP865"    # not CP850 ??
+	echo "nn_NO CP865" # not CP850 ??
+	echo "no CP865"    # not CP850 ??
+	echo "no_NO CP865" # not CP850 ??
+	echo "pt CP850"
+	echo "pt_BR CP850"
+	echo "pt_PT CP850"
+	echo "sv CP850"
+	echo "sv_SE CP850"
+	# ISO-8859-2 languages
+	echo "cs CP852"
+	echo "cs_CZ CP852"
+	echo "hr CP852"
+	echo "hr_HR CP852"
+	echo "hu CP852"
+	echo "hu_HU CP852"
+	echo "pl CP852"
+	echo "pl_PL CP852"
+	echo "ro CP852"
+	echo "ro_RO CP852"
+	echo "sk CP852"
+	echo "sk_SK CP852"
+	echo "sl CP852"
+	echo "sl_SI CP852"
+	echo "sq CP852"
+	echo "sq_AL CP852"
+	echo "sr CP852"    # CP852 or CP866 or CP855 ??
+	echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
+	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
+	# ISO-8859-3 languages
+	echo "mt CP850"
+	echo "mt_MT CP850"
+	# ISO-8859-5 languages
+	echo "be CP866"
+	echo "be_BE CP866"
+	echo "bg CP866"    # not CP855 ??
+	echo "bg_BG CP866" # not CP855 ??
+	echo "mk CP866"    # not CP855 ??
+	echo "mk_MK CP866" # not CP855 ??
+	echo "ru CP866"
+	echo "ru_RU CP866"
+	echo "uk CP1125"
+	echo "uk_UA CP1125"
+	# ISO-8859-6 languages
+	echo "ar CP864"
+	echo "ar_AE CP864"
+	echo "ar_DZ CP864"
+	echo "ar_EG CP864"
+	echo "ar_IQ CP864"
+	echo "ar_IR CP864"
+	echo "ar_JO CP864"
+	echo "ar_KW CP864"
+	echo "ar_MA CP864"
+	echo "ar_OM CP864"
+	echo "ar_QA CP864"
+	echo "ar_SA CP864"
+	echo "ar_SY CP864"
+	# ISO-8859-7 languages
+	echo "el CP869"
+	echo "el_GR CP869"
+	# ISO-8859-8 languages
+	echo "he CP862"
+	echo "he_IL CP862"
+	# ISO-8859-9 languages
+	echo "tr CP857"
+	echo "tr_TR CP857"
+	# Japanese
+	echo "ja CP932"
+	echo "ja_JP CP932"
+	# Chinese
+	echo "zh_CN GBK"
+	echo "zh_TW CP950" # not CP938 ??
+	# Korean
+	echo "kr CP949"    # not CP934 ??
+	echo "kr_KR CP949" # not CP934 ??
+	# Thai
+	echo "th CP874"
+	echo "th_TH CP874"
+	# Other
+	echo "eo CP850"
+	echo "eo_EO CP850"
+	;;
+esac
diff --git a/Build/source/utils/texinfo/gnulib/lib/error.c b/Build/source/utils/texinfo/gnulib/lib/error.c
new file mode 100644
index 00000000000..3177bd5d2cb
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/error.c
@@ -0,0 +1,338 @@
+/* Error handler for noninteractive utilities
+   Copyright (C) 1990-1998, 2000-2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
+
+#if !_LIBC
+# include <config.h>
+#endif
+
+#include "error.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if !_LIBC && ENABLE_NLS
+# include "gettext.h"
+# define _(msgid) gettext (msgid)
+#endif
+
+#ifdef _LIBC
+# include <libintl.h>
+# include <stdbool.h>
+# include <stdint.h>
+# include <wchar.h>
+# define mbsrtowcs __mbsrtowcs
+#endif
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
+#ifndef _
+# define _(String) String
+#endif
+
+/* If NULL, error will flush stdout, then print on stderr the program
+   name, a colon and a space.  Otherwise, error will call this
+   function without parameters instead.  */
+void (*error_print_progname) (void);
+
+/* This variable is incremented each time `error' is called.  */
+unsigned int error_message_count;
+
+#ifdef _LIBC
+/* In the GNU C library, there is a predefined variable for this.  */
+
+# define program_name program_invocation_name
+# include <errno.h>
+# include <limits.h>
+# include <libio/libioP.h>
+
+/* In GNU libc we want do not want to use the common name `error' directly.
+   Instead make it a weak alias.  */
+extern void __error (int status, int errnum, const char *message, ...)
+     __attribute__ ((__format__ (__printf__, 3, 4)));
+extern void __error_at_line (int status, int errnum, const char *file_name,
+			     unsigned int line_number, const char *message,
+			     ...)
+     __attribute__ ((__format__ (__printf__, 5, 6)));;
+# define error __error
+# define error_at_line __error_at_line
+
+# include <libio/iolibio.h>
+# define fflush(s) INTUSE(_IO_fflush) (s)
+# undef putc
+# define putc(c, fp) INTUSE(_IO_putc) (c, fp)
+
+# include <bits/libc-lock.h>
+
+#else /* not _LIBC */
+
+# if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
+#  ifndef HAVE_DECL_STRERROR_R
+"this configure-time declaration test was not run"
+#  endif
+char *strerror_r ();
+# endif
+
+/* The calling program should define program_name and set it to the
+   name of the executing program.  */
+extern char *program_name;
+
+# if HAVE_STRERROR_R || defined strerror_r
+#  define __strerror_r strerror_r
+# endif	/* HAVE_STRERROR_R || defined strerror_r */
+#endif	/* not _LIBC */
+
+static void
+print_errno_message (int errnum)
+{
+  char const *s;
+
+#if defined HAVE_STRERROR_R || _LIBC
+  char errbuf[1024];
+# if STRERROR_R_CHAR_P || _LIBC
+  s = __strerror_r (errnum, errbuf, sizeof errbuf);
+# else
+  if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
+    s = errbuf;
+  else
+    s = 0;
+# endif
+#else
+  s = strerror (errnum);
+#endif
+
+#if !_LIBC
+  if (! s)
+    s = _("Unknown system error");
+#endif
+
+#if _LIBC
+  __fxprintf (NULL, ": %s", s);
+#else
+  fprintf (stderr, ": %s", s);
+#endif
+}
+
+static void
+error_tail (int status, int errnum, const char *message, va_list args)
+{
+#if _LIBC
+  if (_IO_fwide (stderr, 0) > 0)
+    {
+# define ALLOCA_LIMIT 2000
+      size_t len = strlen (message) + 1;
+      wchar_t *wmessage = NULL;
+      mbstate_t st;
+      size_t res;
+      const char *tmp;
+      bool use_malloc = false;
+
+      while (1)
+	{
+	  if (__libc_use_alloca (len * sizeof (wchar_t)))
+	    wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));
+	  else
+	    {
+	      if (!use_malloc)
+		wmessage = NULL;
+
+	      wchar_t *p = (wchar_t *) realloc (wmessage,
+						len * sizeof (wchar_t));
+	      if (p == NULL)
+		{
+		  free (wmessage);
+		  fputws_unlocked (L"out of memory\n", stderr);
+		  return;
+		}
+	      wmessage = p;
+	      use_malloc = true;
+	    }
+
+	  memset (&st, '\0', sizeof (st));
+	  tmp = message;
+
+	  res = mbsrtowcs (wmessage, &tmp, len, &st);
+	  if (res != len)
+	    break;
+
+	  if (__builtin_expect (len >= SIZE_MAX / 2, 0))
+	    {
+	      /* This really should not happen if everything is fine.  */
+	      res = (size_t) -1;
+	      break;
+	    }
+
+	  len *= 2;
+	}
+
+      if (res == (size_t) -1)
+	{
+	  /* The string cannot be converted.  */
+	  if (use_malloc)
+	    {
+	      free (wmessage);
+	      use_malloc = false;
+	    }
+	  wmessage = (wchar_t *) L"???";
+	}
+
+      __vfwprintf (stderr, wmessage, args);
+
+      if (use_malloc)
+	free (wmessage);
+    }
+  else
+#endif
+    vfprintf (stderr, message, args);
+  va_end (args);
+
+  ++error_message_count;
+  if (errnum)
+    print_errno_message (errnum);
+#if _LIBC
+  __fxprintf (NULL, "\n");
+#else
+  putc ('\n', stderr);
+#endif
+  fflush (stderr);
+  if (status)
+    exit (status);
+}
+
+
+/* Print the program name and error message MESSAGE, which is a printf-style
+   format string with optional args.
+   If ERRNUM is nonzero, print its corresponding system error message.
+   Exit with status STATUS if it is nonzero.  */
+void
+error (int status, int errnum, const char *message, ...)
+{
+  va_list args;
+
+#if defined _LIBC && defined __libc_ptf_call
+  /* We do not want this call to be cut short by a thread
+     cancellation.  Therefore disable cancellation for now.  */
+  int state = PTHREAD_CANCEL_ENABLE;
+  __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
+		   0);
+#endif
+
+  fflush (stdout);
+#ifdef _LIBC
+  _IO_flockfile (stderr);
+#endif
+  if (error_print_progname)
+    (*error_print_progname) ();
+  else
+    {
+#if _LIBC
+      __fxprintf (NULL, "%s: ", program_name);
+#else
+      fprintf (stderr, "%s: ", program_name);
+#endif
+    }
+
+  va_start (args, message);
+  error_tail (status, errnum, message, args);
+
+#ifdef _LIBC
+  _IO_funlockfile (stderr);
+# ifdef __libc_ptf_call
+  __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+# endif
+#endif
+}
+
+/* Sometimes we want to have at most one error per line.  This
+   variable controls whether this mode is selected or not.  */
+int error_one_per_line;
+
+void
+error_at_line (int status, int errnum, const char *file_name,
+	       unsigned int line_number, const char *message, ...)
+{
+  va_list args;
+
+  if (error_one_per_line)
+    {
+      static const char *old_file_name;
+      static unsigned int old_line_number;
+
+      if (old_line_number == line_number
+	  && (file_name == old_file_name
+	      || strcmp (old_file_name, file_name) == 0))
+	/* Simply return and print nothing.  */
+	return;
+
+      old_file_name = file_name;
+      old_line_number = line_number;
+    }
+
+#if defined _LIBC && defined __libc_ptf_call
+  /* We do not want this call to be cut short by a thread
+     cancellation.  Therefore disable cancellation for now.  */
+  int state = PTHREAD_CANCEL_ENABLE;
+  __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
+		   0);
+#endif
+
+  fflush (stdout);
+#ifdef _LIBC
+  _IO_flockfile (stderr);
+#endif
+  if (error_print_progname)
+    (*error_print_progname) ();
+  else
+    {
+#if _LIBC
+      __fxprintf (NULL, "%s:", program_name);
+#else
+      fprintf (stderr, "%s:", program_name);
+#endif
+    }
+
+#if _LIBC
+  __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ",
+	      file_name, line_number);
+#else
+  fprintf (stderr, file_name != NULL ? "%s:%d: " : " ",
+	   file_name, line_number);
+#endif
+
+  va_start (args, message);
+  error_tail (status, errnum, message, args);
+
+#ifdef _LIBC
+  _IO_funlockfile (stderr);
+# ifdef __libc_ptf_call
+  __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+# endif
+#endif
+}
+
+#ifdef _LIBC
+/* Make the weak alias.  */
+# undef error
+# undef error_at_line
+weak_alias (__error, error)
+weak_alias (__error_at_line, error_at_line)
+#endif
diff --git a/Build/source/utils/texinfo/gnulib/lib/error.h b/Build/source/utils/texinfo/gnulib/lib/error.h
new file mode 100644
index 00000000000..6d49681146d
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/error.h
@@ -0,0 +1,65 @@
+/* Declaration for error-reporting function
+   Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _ERROR_H
+#define _ERROR_H 1
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+#  define __attribute__(Spec) /* empty */
+# endif
+/* The __-protected variants of `format' and `printf' attributes
+   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __format__ format
+#  define __printf__ printf
+# endif
+#endif
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* Print a message with `fprintf (stderr, FORMAT, ...)';
+   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
+   If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
+
+extern void error (int __status, int __errnum, const char *__format, ...)
+     __attribute__ ((__format__ (__printf__, 3, 4)));
+
+extern void error_at_line (int __status, int __errnum, const char *__fname,
+			   unsigned int __lineno, const char *__format, ...)
+     __attribute__ ((__format__ (__printf__, 5, 6)));
+
+/* If NULL, error will flush stdout, then print on stderr the program
+   name, a colon and a space.  Otherwise, error will call this
+   function without parameters instead.  */
+extern void (*error_print_progname) (void);
+
+/* This variable is incremented each time `error' is called.  */
+extern unsigned int error_message_count;
+
+/* Sometimes we want to have at most one error per line.  This
+   variable controls whether this mode is selected or not.  */
+extern int error_one_per_line;
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* error.h */
diff --git a/Build/source/utils/texinfo/gnulib/lib/exitfail.c b/Build/source/utils/texinfo/gnulib/lib/exitfail.c
new file mode 100644
index 00000000000..6d1fe4aea0f
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/exitfail.c
@@ -0,0 +1,24 @@
+/* Failure exit status
+
+   Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "exitfail.h"
+
+#include <stdlib.h>
+
+int volatile exit_failure = EXIT_FAILURE;
diff --git a/Build/source/utils/texinfo/gnulib/lib/exitfail.h b/Build/source/utils/texinfo/gnulib/lib/exitfail.h
new file mode 100644
index 00000000000..713f2591a79
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/exitfail.h
@@ -0,0 +1,18 @@
+/* Failure exit status
+
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+extern int volatile exit_failure;
diff --git a/Build/source/utils/texinfo/gnulib/lib/getopt.c b/Build/source/utils/texinfo/gnulib/lib/getopt.c
new file mode 100644
index 00000000000..f1e6d1f7c70
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/getopt.c
@@ -0,0 +1,1186 @@
+/* Getopt for GNU.
+   NOTE: getopt is now part of the C library, so if you don't know what
+   "Keep this file name-space clean" means, talk to drepper@gnu.org
+   before changing it!
+   Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006,2008
+	Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _LIBC
+# include <config.h>
+#endif
+
+#include "getopt.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "gettext.h"
+# define _(msgid) gettext (msgid)
+#endif
+
+#if defined _LIBC && defined USE_IN_LIBIO
+# include <wchar.h>
+#endif
+
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
+/* Unlike standard Unix `getopt', functions like `getopt_long'
+   let the user intersperse the options with the other arguments.
+
+   As `getopt_long' works, it permutes the elements of ARGV so that,
+   when it is done, all the options precede everything else.  Thus
+   all application programs are extended to handle flexible argument order.
+
+   Using `getopt' or setting the environment variable POSIXLY_CORRECT
+   disables permutation.
+   Then the application's behavior is completely standard.
+
+   GNU application programs can use a third alternative mode in which
+   they can distinguish the relative order of options and other arguments.  */
+
+#include "getopt_int.h"
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+/* 1003.2 says this must be 1 before any call.  */
+int optind = 1;
+
+/* Callers store zero here to inhibit the error message
+   for unrecognized options.  */
+
+int opterr = 1;
+
+/* Set to an option character which was unrecognized.
+   This must be initialized on some systems to avoid linking in the
+   system's own getopt implementation.  */
+
+int optopt = '?';
+
+/* Keep a global copy of all internal members of getopt_data.  */
+
+static struct _getopt_data getopt_data;
+
+
+#if defined HAVE_DECL_GETENV && !HAVE_DECL_GETENV
+extern char *getenv ();
+#endif
+
+#ifdef _LIBC
+/* Stored original parameters.
+   XXX This is no good solution.  We should rather copy the args so
+   that we can compare them later.  But we must not use malloc(3).  */
+extern int __libc_argc;
+extern char **__libc_argv;
+
+/* Bash 2.0 gives us an environment variable containing flags
+   indicating ARGV elements that should not be considered arguments.  */
+
+# ifdef USE_NONOPTION_FLAGS
+/* Defined in getopt_init.c  */
+extern char *__getopt_nonoption_flags;
+# endif
+
+# ifdef USE_NONOPTION_FLAGS
+#  define SWAP_FLAGS(ch1, ch2) \
+  if (d->__nonoption_flags_len > 0)					      \
+    {									      \
+      char __tmp = __getopt_nonoption_flags[ch1];			      \
+      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
+      __getopt_nonoption_flags[ch2] = __tmp;				      \
+    }
+# else
+#  define SWAP_FLAGS(ch1, ch2)
+# endif
+#else	/* !_LIBC */
+# define SWAP_FLAGS(ch1, ch2)
+#endif	/* _LIBC */
+
+/* Exchange two adjacent subsequences of ARGV.
+   One subsequence is elements [first_nonopt,last_nonopt)
+   which contains all the non-options that have been skipped so far.
+   The other is elements [last_nonopt,optind), which contains all
+   the options processed since those non-options were skipped.
+
+   `first_nonopt' and `last_nonopt' are relocated so that they describe
+   the new indices of the non-options in ARGV after they are moved.  */
+
+static void
+exchange (char **argv, struct _getopt_data *d)
+{
+  int bottom = d->__first_nonopt;
+  int middle = d->__last_nonopt;
+  int top = d->optind;
+  char *tem;
+
+  /* Exchange the shorter segment with the far end of the longer segment.
+     That puts the shorter segment into the right place.
+     It leaves the longer segment in the right place overall,
+     but it consists of two parts that need to be swapped next.  */
+
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+  /* First make sure the handling of the `__getopt_nonoption_flags'
+     string can work normally.  Our top argument must be in the range
+     of the string.  */
+  if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
+    {
+      /* We must extend the array.  The user plays games with us and
+	 presents new arguments.  */
+      char *new_str = malloc (top + 1);
+      if (new_str == NULL)
+	d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0;
+      else
+	{
+	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
+			     d->__nonoption_flags_max_len),
+		  '\0', top + 1 - d->__nonoption_flags_max_len);
+	  d->__nonoption_flags_max_len = top + 1;
+	  __getopt_nonoption_flags = new_str;
+	}
+    }
+#endif
+
+  while (top > middle && middle > bottom)
+    {
+      if (top - middle > middle - bottom)
+	{
+	  /* Bottom segment is the short one.  */
+	  int len = middle - bottom;
+	  register int i;
+
+	  /* Swap it with the top part of the top segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[top - (middle - bottom) + i];
+	      argv[top - (middle - bottom) + i] = tem;
+	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
+	    }
+	  /* Exclude the moved bottom segment from further swapping.  */
+	  top -= len;
+	}
+      else
+	{
+	  /* Top segment is the short one.  */
+	  int len = top - middle;
+	  register int i;
+
+	  /* Swap it with the bottom part of the bottom segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[middle + i];
+	      argv[middle + i] = tem;
+	      SWAP_FLAGS (bottom + i, middle + i);
+	    }
+	  /* Exclude the moved top segment from further swapping.  */
+	  bottom += len;
+	}
+    }
+
+  /* Update records for the slots the non-options now occupy.  */
+
+  d->__first_nonopt += (d->optind - d->__last_nonopt);
+  d->__last_nonopt = d->optind;
+}
+
+/* Initialize the internal data when the first call is made.  */
+
+static const char *
+_getopt_initialize (int argc, char **argv, const char *optstring,
+		    int posixly_correct, struct _getopt_data *d)
+{
+  /* Start processing options with ARGV-element 1 (since ARGV-element 0
+     is the program name); the sequence of previously skipped
+     non-option ARGV-elements is empty.  */
+
+  d->__first_nonopt = d->__last_nonopt = d->optind;
+
+  d->__nextchar = NULL;
+
+  d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT");
+
+  /* Determine how to handle the ordering of options and nonoptions.  */
+
+  if (optstring[0] == '-')
+    {
+      d->__ordering = RETURN_IN_ORDER;
+      ++optstring;
+    }
+  else if (optstring[0] == '+')
+    {
+      d->__ordering = REQUIRE_ORDER;
+      ++optstring;
+    }
+  else if (d->__posixly_correct)
+    d->__ordering = REQUIRE_ORDER;
+  else
+    d->__ordering = PERMUTE;
+
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+  if (!d->__posixly_correct
+      && argc == __libc_argc && argv == __libc_argv)
+    {
+      if (d->__nonoption_flags_max_len == 0)
+	{
+	  if (__getopt_nonoption_flags == NULL
+	      || __getopt_nonoption_flags[0] == '\0')
+	    d->__nonoption_flags_max_len = -1;
+	  else
+	    {
+	      const char *orig_str = __getopt_nonoption_flags;
+	      int len = d->__nonoption_flags_max_len = strlen (orig_str);
+	      if (d->__nonoption_flags_max_len < argc)
+		d->__nonoption_flags_max_len = argc;
+	      __getopt_nonoption_flags =
+		(char *) malloc (d->__nonoption_flags_max_len);
+	      if (__getopt_nonoption_flags == NULL)
+		d->__nonoption_flags_max_len = -1;
+	      else
+		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+			'\0', d->__nonoption_flags_max_len - len);
+	    }
+	}
+      d->__nonoption_flags_len = d->__nonoption_flags_max_len;
+    }
+  else
+    d->__nonoption_flags_len = 0;
+#endif
+
+  return optstring;
+}
+
+/* Scan elements of ARGV (whose length is ARGC) for option characters
+   given in OPTSTRING.
+
+   If an element of ARGV starts with '-', and is not exactly "-" or "--",
+   then it is an option element.  The characters of this element
+   (aside from the initial '-') are option characters.  If `getopt'
+   is called repeatedly, it returns successively each of the option characters
+   from each of the option elements.
+
+   If `getopt' finds another option character, it returns that character,
+   updating `optind' and `nextchar' so that the next call to `getopt' can
+   resume the scan with the following option character or ARGV-element.
+
+   If there are no more option characters, `getopt' returns -1.
+   Then `optind' is the index in ARGV of the first ARGV-element
+   that is not an option.  (The ARGV-elements have been permuted
+   so that those that are not options now come last.)
+
+   OPTSTRING is a string containing the legitimate option characters.
+   If an option character is seen that is not listed in OPTSTRING,
+   return '?' after printing an error message.  If you set `opterr' to
+   zero, the error message is suppressed but we still return '?'.
+
+   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+   so the following text in the same ARGV-element, or the text of the following
+   ARGV-element, is returned in `optarg'.  Two colons mean an option that
+   wants an optional arg; if there is text in the current ARGV-element,
+   it is returned in `optarg', otherwise `optarg' is set to zero.
+
+   If OPTSTRING starts with `-' or `+', it requests different methods of
+   handling the non-option ARGV-elements.
+   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
+
+   Long-named options begin with `--' instead of `-'.
+   Their names may be abbreviated as long as the abbreviation is unique
+   or is an exact match for some defined option.  If they have an
+   argument, it follows the option name in the same ARGV-element, separated
+   from the option name by a `=', or else the in next ARGV-element.
+   When `getopt' finds a long-named option, it returns 0 if that option's
+   `flag' field is nonzero, the value of the option's `val' field
+   if the `flag' field is zero.
+
+   LONGOPTS is a vector of `struct option' terminated by an
+   element containing a name which is zero.
+
+   LONGIND returns the index in LONGOPT of the long-named option found.
+   It is only valid when a long-named option has been found by the most
+   recent call.
+
+   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
+   long-named options.
+
+   If POSIXLY_CORRECT is nonzero, behave as if the POSIXLY_CORRECT
+   environment variable were set.  */
+
+int
+_getopt_internal_r (int argc, char **argv, const char *optstring,
+		    const struct option *longopts, int *longind,
+		    int long_only, int posixly_correct, struct _getopt_data *d)
+{
+  int print_errors = d->opterr;
+  if (optstring[0] == ':')
+    print_errors = 0;
+
+  if (argc < 1)
+    return -1;
+
+  d->optarg = NULL;
+
+  if (d->optind == 0 || !d->__initialized)
+    {
+      if (d->optind == 0)
+	d->optind = 1;	/* Don't scan ARGV[0], the program name.  */
+      optstring = _getopt_initialize (argc, argv, optstring,
+				      posixly_correct, d);
+      d->__initialized = 1;
+    }
+
+  /* Test whether ARGV[optind] points to a non-option argument.
+     Either it does not have option syntax, or there is an environment flag
+     from the shell indicating it is not an option.  The later information
+     is only used when the used in the GNU libc.  */
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \
+		      || (d->optind < d->__nonoption_flags_len		      \
+			  && __getopt_nonoption_flags[d->optind] == '1'))
+#else
+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0')
+#endif
+
+  if (d->__nextchar == NULL || *d->__nextchar == '\0')
+    {
+      /* Advance to the next ARGV-element.  */
+
+      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
+	 moved back by the user (who may also have changed the arguments).  */
+      if (d->__last_nonopt > d->optind)
+	d->__last_nonopt = d->optind;
+      if (d->__first_nonopt > d->optind)
+	d->__first_nonopt = d->optind;
+
+      if (d->__ordering == PERMUTE)
+	{
+	  /* If we have just processed some options following some non-options,
+	     exchange them so that the options come first.  */
+
+	  if (d->__first_nonopt != d->__last_nonopt
+	      && d->__last_nonopt != d->optind)
+	    exchange ((char **) argv, d);
+	  else if (d->__last_nonopt != d->optind)
+	    d->__first_nonopt = d->optind;
+
+	  /* Skip any additional non-options
+	     and extend the range of non-options previously skipped.  */
+
+	  while (d->optind < argc && NONOPTION_P)
+	    d->optind++;
+	  d->__last_nonopt = d->optind;
+	}
+
+      /* The special ARGV-element `--' means premature end of options.
+	 Skip it like a null option,
+	 then exchange with previous non-options as if it were an option,
+	 then skip everything else like a non-option.  */
+
+      if (d->optind != argc && !strcmp (argv[d->optind], "--"))
+	{
+	  d->optind++;
+
+	  if (d->__first_nonopt != d->__last_nonopt
+	      && d->__last_nonopt != d->optind)
+	    exchange ((char **) argv, d);
+	  else if (d->__first_nonopt == d->__last_nonopt)
+	    d->__first_nonopt = d->optind;
+	  d->__last_nonopt = argc;
+
+	  d->optind = argc;
+	}
+
+      /* If we have done all the ARGV-elements, stop the scan
+	 and back over any non-options that we skipped and permuted.  */
+
+      if (d->optind == argc)
+	{
+	  /* Set the next-arg-index to point at the non-options
+	     that we previously skipped, so the caller will digest them.  */
+	  if (d->__first_nonopt != d->__last_nonopt)
+	    d->optind = d->__first_nonopt;
+	  return -1;
+	}
+
+      /* If we have come to a non-option and did not permute it,
+	 either stop the scan or describe it to the caller and pass it by.  */
+
+      if (NONOPTION_P)
+	{
+	  if (d->__ordering == REQUIRE_ORDER)
+	    return -1;
+	  d->optarg = argv[d->optind++];
+	  return 1;
+	}
+
+      /* We have found another option-ARGV-element.
+	 Skip the initial punctuation.  */
+
+      d->__nextchar = (argv[d->optind] + 1
+		  + (longopts != NULL && argv[d->optind][1] == '-'));
+    }
+
+  /* Decode the current option-ARGV-element.  */
+
+  /* Check whether the ARGV-element is a long option.
+
+     If long_only and the ARGV-element has the form "-f", where f is
+     a valid short option, don't consider it an abbreviated form of
+     a long option that starts with f.  Otherwise there would be no
+     way to give the -f short option.
+
+     On the other hand, if there's a long option "fubar" and
+     the ARGV-element is "-fu", do consider that an abbreviation of
+     the long option, just like "--fu", and not "-f" with arg "u".
+
+     This distinction seems to be the most useful approach.  */
+
+  if (longopts != NULL
+      && (argv[d->optind][1] == '-'
+	  || (long_only && (argv[d->optind][2]
+			    || !strchr (optstring, argv[d->optind][1])))))
+    {
+      char *nameend;
+      const struct option *p;
+      const struct option *pfound = NULL;
+      int exact = 0;
+      int ambig = 0;
+      int indfound = -1;
+      int option_index;
+
+      for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
+	/* Do nothing.  */ ;
+
+      /* Test all long options for either exact match
+	 or abbreviated matches.  */
+      for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
+	  {
+	    if ((unsigned int) (nameend - d->__nextchar)
+		== (unsigned int) strlen (p->name))
+	      {
+		/* Exact match found.  */
+		pfound = p;
+		indfound = option_index;
+		exact = 1;
+		break;
+	      }
+	    else if (pfound == NULL)
+	      {
+		/* First nonexact match found.  */
+		pfound = p;
+		indfound = option_index;
+	      }
+	    else if (long_only
+		     || pfound->has_arg != p->has_arg
+		     || pfound->flag != p->flag
+		     || pfound->val != p->val)
+	      /* Second or later nonexact match found.  */
+	      ambig = 1;
+	  }
+
+      if (ambig && !exact)
+	{
+	  if (print_errors)
+	    {
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+
+	      if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
+			      argv[0], argv[d->optind]) >= 0)
+		{
+		  _IO_flockfile (stderr);
+
+		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		  __fxprintf (NULL, "%s", buf);
+
+		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		  _IO_funlockfile (stderr);
+
+		  free (buf);
+		}
+#else
+	      fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+		       argv[0], argv[d->optind]);
+#endif
+	    }
+	  d->__nextchar += strlen (d->__nextchar);
+	  d->optind++;
+	  d->optopt = 0;
+	  return '?';
+	}
+
+      if (pfound != NULL)
+	{
+	  option_index = indfound;
+	  d->optind++;
+	  if (*nameend)
+	    {
+	      /* Don't test has_arg with >, because some C compilers don't
+		 allow it to be used on enums.  */
+	      if (pfound->has_arg)
+		d->optarg = nameend + 1;
+	      else
+		{
+		  if (print_errors)
+		    {
+#if defined _LIBC && defined USE_IN_LIBIO
+		      char *buf;
+		      int n;
+#endif
+
+		      if (argv[d->optind - 1][1] == '-')
+			{
+			  /* --option */
+#if defined _LIBC && defined USE_IN_LIBIO
+			  n = __asprintf (&buf, _("\
+%s: option `--%s' doesn't allow an argument\n"),
+					  argv[0], pfound->name);
+#else
+			  fprintf (stderr, _("\
+%s: option `--%s' doesn't allow an argument\n"),
+				   argv[0], pfound->name);
+#endif
+			}
+		      else
+			{
+			  /* +option or -option */
+#if defined _LIBC && defined USE_IN_LIBIO
+			  n = __asprintf (&buf, _("\
+%s: option `%c%s' doesn't allow an argument\n"),
+					  argv[0], argv[d->optind - 1][0],
+					  pfound->name);
+#else
+			  fprintf (stderr, _("\
+%s: option `%c%s' doesn't allow an argument\n"),
+				   argv[0], argv[d->optind - 1][0],
+				   pfound->name);
+#endif
+			}
+
+#if defined _LIBC && defined USE_IN_LIBIO
+		      if (n >= 0)
+			{
+			  _IO_flockfile (stderr);
+
+			  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			  ((_IO_FILE *) stderr)->_flags2
+			    |= _IO_FLAGS2_NOTCANCEL;
+
+			  __fxprintf (NULL, "%s", buf);
+
+			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			  _IO_funlockfile (stderr);
+
+			  free (buf);
+			}
+#endif
+		    }
+
+		  d->__nextchar += strlen (d->__nextchar);
+
+		  d->optopt = pfound->val;
+		  return '?';
+		}
+	    }
+	  else if (pfound->has_arg == 1)
+	    {
+	      if (d->optind < argc)
+		d->optarg = argv[d->optind++];
+	      else
+		{
+		  if (print_errors)
+		    {
+#if defined _LIBC && defined USE_IN_LIBIO
+		      char *buf;
+
+		      if (__asprintf (&buf, _("\
+%s: option `%s' requires an argument\n"),
+				      argv[0], argv[d->optind - 1]) >= 0)
+			{
+			  _IO_flockfile (stderr);
+
+			  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			  ((_IO_FILE *) stderr)->_flags2
+			    |= _IO_FLAGS2_NOTCANCEL;
+
+			  __fxprintf (NULL, "%s", buf);
+
+			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			  _IO_funlockfile (stderr);
+
+			  free (buf);
+			}
+#else
+		      fprintf (stderr,
+			       _("%s: option `%s' requires an argument\n"),
+			       argv[0], argv[d->optind - 1]);
+#endif
+		    }
+		  d->__nextchar += strlen (d->__nextchar);
+		  d->optopt = pfound->val;
+		  return optstring[0] == ':' ? ':' : '?';
+		}
+	    }
+	  d->__nextchar += strlen (d->__nextchar);
+	  if (longind != NULL)
+	    *longind = option_index;
+	  if (pfound->flag)
+	    {
+	      *(pfound->flag) = pfound->val;
+	      return 0;
+	    }
+	  return pfound->val;
+	}
+
+      /* Can't find it as a long option.  If this is not getopt_long_only,
+	 or the option starts with '--' or is not a valid short
+	 option, then it's an error.
+	 Otherwise interpret it as a short option.  */
+      if (!long_only || argv[d->optind][1] == '-'
+	  || strchr (optstring, *d->__nextchar) == NULL)
+	{
+	  if (print_errors)
+	    {
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+	      int n;
+#endif
+
+	      if (argv[d->optind][1] == '-')
+		{
+		  /* --option */
+#if defined _LIBC && defined USE_IN_LIBIO
+		  n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
+				  argv[0], d->__nextchar);
+#else
+		  fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+			   argv[0], d->__nextchar);
+#endif
+		}
+	      else
+		{
+		  /* +option or -option */
+#if defined _LIBC && defined USE_IN_LIBIO
+		  n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
+				  argv[0], argv[d->optind][0], d->__nextchar);
+#else
+		  fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+			   argv[0], argv[d->optind][0], d->__nextchar);
+#endif
+		}
+
+#if defined _LIBC && defined USE_IN_LIBIO
+	      if (n >= 0)
+		{
+		  _IO_flockfile (stderr);
+
+		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		  __fxprintf (NULL, "%s", buf);
+
+		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		  _IO_funlockfile (stderr);
+
+		  free (buf);
+		}
+#endif
+	    }
+	  d->__nextchar = (char *) "";
+	  d->optind++;
+	  d->optopt = 0;
+	  return '?';
+	}
+    }
+
+  /* Look at and handle the next short option-character.  */
+
+  {
+    char c = *d->__nextchar++;
+    char *temp = strchr (optstring, c);
+
+    /* Increment `optind' when we start to process its last character.  */
+    if (*d->__nextchar == '\0')
+      ++d->optind;
+
+    if (temp == NULL || c == ':')
+      {
+	if (print_errors)
+	  {
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+	      int n;
+#endif
+
+	    if (d->__posixly_correct)
+	      {
+		/* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		n = __asprintf (&buf, _("%s: illegal option -- %c\n"),
+				argv[0], c);
+#else
+		fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
+#endif
+	      }
+	    else
+	      {
+#if defined _LIBC && defined USE_IN_LIBIO
+		n = __asprintf (&buf, _("%s: invalid option -- %c\n"),
+				argv[0], c);
+#else
+		fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
+#endif
+	      }
+
+#if defined _LIBC && defined USE_IN_LIBIO
+	    if (n >= 0)
+	      {
+		_IO_flockfile (stderr);
+
+		int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		__fxprintf (NULL, "%s", buf);
+
+		((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		_IO_funlockfile (stderr);
+
+		free (buf);
+	      }
+#endif
+	  }
+	d->optopt = c;
+	return '?';
+      }
+    /* Convenience. Treat POSIX -W foo same as long option --foo */
+    if (temp[0] == 'W' && temp[1] == ';')
+      {
+	char *nameend;
+	const struct option *p;
+	const struct option *pfound = NULL;
+	int exact = 0;
+	int ambig = 0;
+	int indfound = 0;
+	int option_index;
+
+	/* This is an option that requires an argument.  */
+	if (*d->__nextchar != '\0')
+	  {
+	    d->optarg = d->__nextchar;
+	    /* If we end this ARGV-element by taking the rest as an arg,
+	       we must advance to the next element now.  */
+	    d->optind++;
+	  }
+	else if (d->optind == argc)
+	  {
+	    if (print_errors)
+	      {
+		/* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		char *buf;
+
+		if (__asprintf (&buf,
+				_("%s: option requires an argument -- %c\n"),
+				argv[0], c) >= 0)
+		  {
+		    _IO_flockfile (stderr);
+
+		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		    __fxprintf (NULL, "%s", buf);
+
+		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		    _IO_funlockfile (stderr);
+
+		    free (buf);
+		  }
+#else
+		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+			 argv[0], c);
+#endif
+	      }
+	    d->optopt = c;
+	    if (optstring[0] == ':')
+	      c = ':';
+	    else
+	      c = '?';
+	    return c;
+	  }
+	else
+	  /* We already incremented `d->optind' once;
+	     increment it again when taking next ARGV-elt as argument.  */
+	  d->optarg = argv[d->optind++];
+
+	/* optarg is now the argument, see if it's in the
+	   table of longopts.  */
+
+	for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '=';
+	     nameend++)
+	  /* Do nothing.  */ ;
+
+	/* Test all long options for either exact match
+	   or abbreviated matches.  */
+	for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	  if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
+	    {
+	      if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name))
+		{
+		  /* Exact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		  exact = 1;
+		  break;
+		}
+	      else if (pfound == NULL)
+		{
+		  /* First nonexact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		}
+	      else
+		/* Second or later nonexact match found.  */
+		ambig = 1;
+	    }
+	if (ambig && !exact)
+	  {
+	    if (print_errors)
+	      {
+#if defined _LIBC && defined USE_IN_LIBIO
+		char *buf;
+
+		if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
+				argv[0], argv[d->optind]) >= 0)
+		  {
+		    _IO_flockfile (stderr);
+
+		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		    __fxprintf (NULL, "%s", buf);
+
+		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		    _IO_funlockfile (stderr);
+
+		    free (buf);
+		  }
+#else
+		fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+			 argv[0], argv[d->optind]);
+#endif
+	      }
+	    d->__nextchar += strlen (d->__nextchar);
+	    d->optind++;
+	    return '?';
+	  }
+	if (pfound != NULL)
+	  {
+	    option_index = indfound;
+	    if (*nameend)
+	      {
+		/* Don't test has_arg with >, because some C compilers don't
+		   allow it to be used on enums.  */
+		if (pfound->has_arg)
+		  d->optarg = nameend + 1;
+		else
+		  {
+		    if (print_errors)
+		      {
+#if defined _LIBC && defined USE_IN_LIBIO
+			char *buf;
+
+			if (__asprintf (&buf, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+					argv[0], pfound->name) >= 0)
+			  {
+			    _IO_flockfile (stderr);
+
+			    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			    ((_IO_FILE *) stderr)->_flags2
+			      |= _IO_FLAGS2_NOTCANCEL;
+
+			    __fxprintf (NULL, "%s", buf);
+
+			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			    _IO_funlockfile (stderr);
+
+			    free (buf);
+			  }
+#else
+			fprintf (stderr, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+				 argv[0], pfound->name);
+#endif
+		      }
+
+		    d->__nextchar += strlen (d->__nextchar);
+		    return '?';
+		  }
+	      }
+	    else if (pfound->has_arg == 1)
+	      {
+		if (d->optind < argc)
+		  d->optarg = argv[d->optind++];
+		else
+		  {
+		    if (print_errors)
+		      {
+#if defined _LIBC && defined USE_IN_LIBIO
+			char *buf;
+
+			if (__asprintf (&buf, _("\
+%s: option `%s' requires an argument\n"),
+					argv[0], argv[d->optind - 1]) >= 0)
+			  {
+			    _IO_flockfile (stderr);
+
+			    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			    ((_IO_FILE *) stderr)->_flags2
+			      |= _IO_FLAGS2_NOTCANCEL;
+
+			    __fxprintf (NULL, "%s", buf);
+
+			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			    _IO_funlockfile (stderr);
+
+			    free (buf);
+			  }
+#else
+			fprintf (stderr,
+				 _("%s: option `%s' requires an argument\n"),
+				 argv[0], argv[d->optind - 1]);
+#endif
+		      }
+		    d->__nextchar += strlen (d->__nextchar);
+		    return optstring[0] == ':' ? ':' : '?';
+		  }
+	      }
+	    d->__nextchar += strlen (d->__nextchar);
+	    if (longind != NULL)
+	      *longind = option_index;
+	    if (pfound->flag)
+	      {
+		*(pfound->flag) = pfound->val;
+		return 0;
+	      }
+	    return pfound->val;
+	  }
+	  d->__nextchar = NULL;
+	  return 'W';	/* Let the application handle it.   */
+      }
+    if (temp[1] == ':')
+      {
+	if (temp[2] == ':')
+	  {
+	    /* This is an option that accepts an argument optionally.  */
+	    if (*d->__nextchar != '\0')
+	      {
+		d->optarg = d->__nextchar;
+		d->optind++;
+	      }
+	    else
+	      d->optarg = NULL;
+	    d->__nextchar = NULL;
+	  }
+	else
+	  {
+	    /* This is an option that requires an argument.  */
+	    if (*d->__nextchar != '\0')
+	      {
+		d->optarg = d->__nextchar;
+		/* If we end this ARGV-element by taking the rest as an arg,
+		   we must advance to the next element now.  */
+		d->optind++;
+	      }
+	    else if (d->optind == argc)
+	      {
+		if (print_errors)
+		  {
+		    /* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		    char *buf;
+
+		    if (__asprintf (&buf, _("\
+%s: option requires an argument -- %c\n"),
+				    argv[0], c) >= 0)
+		      {
+			_IO_flockfile (stderr);
+
+			int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+			__fxprintf (NULL, "%s", buf);
+
+			((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			_IO_funlockfile (stderr);
+
+			free (buf);
+		      }
+#else
+		    fprintf (stderr,
+			     _("%s: option requires an argument -- %c\n"),
+			     argv[0], c);
+#endif
+		  }
+		d->optopt = c;
+		if (optstring[0] == ':')
+		  c = ':';
+		else
+		  c = '?';
+	      }
+	    else
+	      /* We already incremented `optind' once;
+		 increment it again when taking next ARGV-elt as argument.  */
+	      d->optarg = argv[d->optind++];
+	    d->__nextchar = NULL;
+	  }
+      }
+    return c;
+  }
+}
+
+int
+_getopt_internal (int argc, char **argv, const char *optstring,
+		  const struct option *longopts, int *longind,
+		  int long_only, int posixly_correct)
+{
+  int result;
+
+  getopt_data.optind = optind;
+  getopt_data.opterr = opterr;
+
+  result = _getopt_internal_r (argc, argv, optstring, longopts, longind,
+			       long_only, posixly_correct, &getopt_data);
+
+  optind = getopt_data.optind;
+  optarg = getopt_data.optarg;
+  optopt = getopt_data.optopt;
+
+  return result;
+}
+
+/* glibc gets a LSB-compliant getopt.
+   Standalone applications get a POSIX-compliant getopt.  */
+#if _LIBC
+enum { POSIXLY_CORRECT = 0 };
+#else
+enum { POSIXLY_CORRECT = 1 };
+#endif
+
+int
+getopt (int argc, char *const *argv, const char *optstring)
+{
+  return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0,
+			   POSIXLY_CORRECT);
+}
+
+
+#ifdef TEST
+
+/* Compile with -DTEST to make an executable for use in testing
+   the above definition of `getopt'.  */
+
+int
+main (int argc, char **argv)
+{
+  int c;
+  int digit_optind = 0;
+
+  while (1)
+    {
+      int this_option_optind = optind ? optind : 1;
+
+      c = getopt (argc, argv, "abc:d:0123456789");
+      if (c == -1)
+	break;
+
+      switch (c)
+	{
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	  if (digit_optind != 0 && digit_optind != this_option_optind)
+	    printf ("digits occur in two different argv-elements.\n");
+	  digit_optind = this_option_optind;
+	  printf ("option %c\n", c);
+	  break;
+
+	case 'a':
+	  printf ("option a\n");
+	  break;
+
+	case 'b':
+	  printf ("option b\n");
+	  break;
+
+	case 'c':
+	  printf ("option c with value `%s'\n", optarg);
+	  break;
+
+	case '?':
+	  break;
+
+	default:
+	  printf ("?? getopt returned character code 0%o ??\n", c);
+	}
+    }
+
+  if (optind < argc)
+    {
+      printf ("non-option ARGV-elements: ");
+      while (optind < argc)
+	printf ("%s ", argv[optind++]);
+      printf ("\n");
+    }
+
+  exit (0);
+}
+
+#endif /* TEST */
diff --git a/Build/source/utils/texinfo/gnulib/lib/getopt.in.h b/Build/source/utils/texinfo/gnulib/lib/getopt.in.h
new file mode 100644
index 00000000000..d2d3e6e63bb
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/getopt.in.h
@@ -0,0 +1,225 @@
+/* Declarations for getopt.
+   Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005,2006,2007
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GETOPT_H
+
+#ifndef __need_getopt
+# define _GETOPT_H 1
+#endif
+
+/* Standalone applications should #define __GETOPT_PREFIX to an
+   identifier that prefixes the external functions and variables
+   defined in this header.  When this happens, include the
+   headers that might declare getopt so that they will not cause
+   confusion if included after this file.  Then systematically rename
+   identifiers so that they do not collide with the system functions
+   and variables.  Renaming avoids problems with some compilers and
+   linkers.  */
+#if defined __GETOPT_PREFIX && !defined __need_getopt
+# include <stdlib.h>
+# include <stdio.h>
+# include <unistd.h>
+# undef __need_getopt
+# undef getopt
+# undef getopt_long
+# undef getopt_long_only
+# undef optarg
+# undef opterr
+# undef optind
+# undef optopt
+# define __GETOPT_CONCAT(x, y) x ## y
+# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y)
+# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y)
+# define getopt __GETOPT_ID (getopt)
+# define getopt_long __GETOPT_ID (getopt_long)
+# define getopt_long_only __GETOPT_ID (getopt_long_only)
+# define optarg __GETOPT_ID (optarg)
+# define opterr __GETOPT_ID (opterr)
+# define optind __GETOPT_ID (optind)
+# define optopt __GETOPT_ID (optopt)
+#endif
+
+/* Standalone applications get correct prototypes for getopt_long and
+   getopt_long_only; they declare "char **argv".  libc uses prototypes
+   with "char *const *argv" that are incorrect because getopt_long and
+   getopt_long_only can permute argv; this is required for backward
+   compatibility (e.g., for LSB 2.0.1).
+
+   This used to be `#if defined __GETOPT_PREFIX && !defined __need_getopt',
+   but it caused redefinition warnings if both unistd.h and getopt.h were
+   included, since unistd.h includes getopt.h having previously defined
+   __need_getopt.
+
+   The only place where __getopt_argv_const is used is in definitions
+   of getopt_long and getopt_long_only below, but these are visible
+   only if __need_getopt is not defined, so it is quite safe to rewrite
+   the conditional as follows:
+*/
+#if !defined __need_getopt
+# if defined __GETOPT_PREFIX
+#  define __getopt_argv_const /* empty */
+# else
+#  define __getopt_argv_const const
+# endif
+#endif
+
+/* If __GNU_LIBRARY__ is not already defined, either we are being used
+   standalone, or this is the first header included in the source file.
+   If we are being used with glibc, we need to include <features.h>, but
+   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
+   not defined, include <ctype.h>, which will pull in <features.h> for us
+   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
+   doesn't flood the namespace with stuff the way some other headers do.)  */
+#if !defined __GNU_LIBRARY__
+# include <ctype.h>
+#endif
+
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+#  define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW	throw ()
+# else
+#  define __THROW
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int optopt;
+
+#ifndef __need_getopt
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of `struct option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument	(or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
+
+struct option
+{
+  const char *name;
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'.  */
+
+# define no_argument		0
+# define required_argument	1
+# define optional_argument	2
+#endif	/* need getopt */
+
+
+/* Get definitions and prototypes for functions to process the
+   arguments in ARGV (ARGC of them, minus the program name) for
+   options given in OPTS.
+
+   Return the option character from OPTS just read.  Return -1 when
+   there are no more options.  For unrecognized options, or options
+   missing arguments, `optopt' is set to the option letter, and '?' is
+   returned.
+
+   The OPTS string is a list of characters which are recognized option
+   letters, optionally followed by colons, specifying that that letter
+   takes an argument, to be placed in `optarg'.
+
+   If a letter in OPTS is followed by two colons, its argument is
+   optional.  This behavior is specific to the GNU `getopt'.
+
+   The argument `--' causes premature termination of argument
+   scanning, explicitly telling `getopt' that there are no more
+   options.
+
+   If OPTS begins with `-', then non-option arguments are treated as
+   arguments to the option '\1'.  This behavior is specific to the GNU
+   `getopt'.  If OPTS begins with `+', or POSIXLY_CORRECT is set in
+   the environment, then do not permute arguments.  */
+
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
+       __THROW;
+
+#ifndef __need_getopt
+extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
+			const char *__shortopts,
+		        const struct option *__longopts, int *__longind)
+       __THROW;
+extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind)
+       __THROW;
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Make sure we later can get all the definitions and declarations.  */
+#undef __need_getopt
+
+#endif /* getopt.h */
diff --git a/Build/source/utils/texinfo/gnulib/lib/getopt1.c b/Build/source/utils/texinfo/gnulib/lib/getopt1.c
new file mode 100644
index 00000000000..d6a3ecf4e70
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/getopt1.c
@@ -0,0 +1,170 @@
+/* getopt_long and getopt_long_only entry points for GNU getopt.
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004,2006
+     Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef _LIBC
+# include <getopt.h>
+#else
+# include <config.h>
+# include "getopt.h"
+#endif
+#include "getopt_int.h"
+
+#include <stdio.h>
+
+/* This needs to come after some library #include
+   to get __GNU_LIBRARY__ defined.  */
+#ifdef __GNU_LIBRARY__
+#include <stdlib.h>
+#endif
+
+#ifndef	NULL
+#define NULL 0
+#endif
+
+int
+getopt_long (int argc, char *__getopt_argv_const *argv, const char *options,
+	     const struct option *long_options, int *opt_index)
+{
+  return _getopt_internal (argc, (char **) argv, options, long_options,
+			   opt_index, 0, 0);
+}
+
+int
+_getopt_long_r (int argc, char **argv, const char *options,
+		const struct option *long_options, int *opt_index,
+		struct _getopt_data *d)
+{
+  return _getopt_internal_r (argc, argv, options, long_options, opt_index,
+			     0, 0, d);
+}
+
+/* Like getopt_long, but '-' as well as '--' can indicate a long option.
+   If an option that starts with '-' (not '--') doesn't match a long option,
+   but does match a short option, it is parsed as a short option
+   instead.  */
+
+int
+getopt_long_only (int argc, char *__getopt_argv_const *argv,
+		  const char *options,
+		  const struct option *long_options, int *opt_index)
+{
+  return _getopt_internal (argc, (char **) argv, options, long_options,
+			   opt_index, 1, 0);
+}
+
+int
+_getopt_long_only_r (int argc, char **argv, const char *options,
+		     const struct option *long_options, int *opt_index,
+		     struct _getopt_data *d)
+{
+  return _getopt_internal_r (argc, argv, options, long_options, opt_index,
+			     1, 0, d);
+}
+
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int
+main (int argc, char **argv)
+{
+  int c;
+  int digit_optind = 0;
+
+  while (1)
+    {
+      int this_option_optind = optind ? optind : 1;
+      int option_index = 0;
+      static struct option long_options[] =
+      {
+	{"add", 1, 0, 0},
+	{"append", 0, 0, 0},
+	{"delete", 1, 0, 0},
+	{"verbose", 0, 0, 0},
+	{"create", 0, 0, 0},
+	{"file", 1, 0, 0},
+	{0, 0, 0, 0}
+      };
+
+      c = getopt_long (argc, argv, "abc:d:0123456789",
+		       long_options, &option_index);
+      if (c == -1)
+	break;
+
+      switch (c)
+	{
+	case 0:
+	  printf ("option %s", long_options[option_index].name);
+	  if (optarg)
+	    printf (" with arg %s", optarg);
+	  printf ("\n");
+	  break;
+
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	  if (digit_optind != 0 && digit_optind != this_option_optind)
+	    printf ("digits occur in two different argv-elements.\n");
+	  digit_optind = this_option_optind;
+	  printf ("option %c\n", c);
+	  break;
+
+	case 'a':
+	  printf ("option a\n");
+	  break;
+
+	case 'b':
+	  printf ("option b\n");
+	  break;
+
+	case 'c':
+	  printf ("option c with value `%s'\n", optarg);
+	  break;
+
+	case 'd':
+	  printf ("option d with value `%s'\n", optarg);
+	  break;
+
+	case '?':
+	  break;
+
+	default:
+	  printf ("?? getopt returned character code 0%o ??\n", c);
+	}
+    }
+
+  if (optind < argc)
+    {
+      printf ("non-option ARGV-elements: ");
+      while (optind < argc)
+	printf ("%s ", argv[optind++]);
+      printf ("\n");
+    }
+
+  exit (0);
+}
+
+#endif /* TEST */
diff --git a/Build/source/utils/texinfo/gnulib/lib/getopt_int.h b/Build/source/utils/texinfo/gnulib/lib/getopt_int.h
new file mode 100644
index 00000000000..3c6628bb94a
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/getopt_int.h
@@ -0,0 +1,130 @@
+/* Internal declarations for getopt.
+   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GETOPT_INT_H
+#define _GETOPT_INT_H	1
+
+extern int _getopt_internal (int ___argc, char **___argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind,
+			     int __long_only, int __posixly_correct);
+
+
+/* Reentrant versions which can handle parsing multiple argument
+   vectors at the same time.  */
+
+/* Data type for reentrant functions.  */
+struct _getopt_data
+{
+  /* These have exactly the same meaning as the corresponding global
+     variables, except that they are used for the reentrant
+     versions of getopt.  */
+  int optind;
+  int opterr;
+  int optopt;
+  char *optarg;
+
+  /* Internal members.  */
+
+  /* True if the internal members have been initialized.  */
+  int __initialized;
+
+  /* The next char to be scanned in the option-element
+     in which the last option character we returned was found.
+     This allows us to pick up the scan where we left off.
+
+     If this is zero, or a null string, it means resume the scan
+     by advancing to the next ARGV-element.  */
+  char *__nextchar;
+
+  /* Describe how to deal with options that follow non-option ARGV-elements.
+
+     If the caller did not specify anything,
+     the default is REQUIRE_ORDER if the environment variable
+     POSIXLY_CORRECT is defined, PERMUTE otherwise.
+
+     REQUIRE_ORDER means don't recognize them as options;
+     stop option processing when the first non-option is seen.
+     This is what Unix does.
+     This mode of operation is selected by either setting the environment
+     variable POSIXLY_CORRECT, or using `+' as the first character
+     of the list of option characters, or by calling getopt.
+
+     PERMUTE is the default.  We permute the contents of ARGV as we
+     scan, so that eventually all the non-options are at the end.
+     This allows options to be given in any order, even with programs
+     that were not written to expect this.
+
+     RETURN_IN_ORDER is an option available to programs that were
+     written to expect options and other ARGV-elements in any order
+     and that care about the ordering of the two.  We describe each
+     non-option ARGV-element as if it were the argument of an option
+     with character code 1.  Using `-' as the first character of the
+     list of option characters selects this mode of operation.
+
+     The special argument `--' forces an end of option-scanning regardless
+     of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+     `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
+
+  enum
+    {
+      REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+    } __ordering;
+
+  /* If the POSIXLY_CORRECT environment variable is set
+     or getopt was called.  */
+  int __posixly_correct;
+
+
+  /* Handle permutation of arguments.  */
+
+  /* Describe the part of ARGV that contains non-options that have
+     been skipped.  `first_nonopt' is the index in ARGV of the first
+     of them; `last_nonopt' is the index after the last of them.  */
+
+  int __first_nonopt;
+  int __last_nonopt;
+
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+  int __nonoption_flags_max_len;
+  int __nonoption_flags_len;
+# endif
+};
+
+/* The initializer is necessary to set OPTIND and OPTERR to their
+   default values and to clear the initialization flag.  */
+#define _GETOPT_DATA_INITIALIZER	{ 1, 1 }
+
+extern int _getopt_internal_r (int ___argc, char **___argv,
+			       const char *__shortopts,
+			       const struct option *__longopts, int *__longind,
+			       int __long_only, int __posixly_correct,
+			       struct _getopt_data *__data);
+
+extern int _getopt_long_r (int ___argc, char **___argv,
+			   const char *__shortopts,
+			   const struct option *__longopts, int *__longind,
+			   struct _getopt_data *__data);
+
+extern int _getopt_long_only_r (int ___argc, char **___argv,
+				const char *__shortopts,
+				const struct option *__longopts,
+				int *__longind,
+				struct _getopt_data *__data);
+
+#endif /* getopt_int.h */
diff --git a/Build/source/utils/texinfo/gnulib/lib/gettext.h b/Build/source/utils/texinfo/gnulib/lib/gettext.h
new file mode 100644
index 00000000000..763dd3c1470
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/gettext.h
@@ -0,0 +1,270 @@
+/* Convenience header for conditional use of GNU <libintl.h>.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _LIBGETTEXT_H
+#define _LIBGETTEXT_H 1
+
+/* NLS can be disabled through the configure --disable-nls option.  */
+#if ENABLE_NLS
+
+/* Get declarations of GNU message catalog functions.  */
+# include <libintl.h>
+
+/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
+   the gettext() and ngettext() macros.  This is an alternative to calling
+   textdomain(), and is useful for libraries.  */
+# ifdef DEFAULT_TEXT_DOMAIN
+#  undef gettext
+#  define gettext(Msgid) \
+     dgettext (DEFAULT_TEXT_DOMAIN, Msgid)
+#  undef ngettext
+#  define ngettext(Msgid1, Msgid2, N) \
+     dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N)
+# endif
+
+#else
+
+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+   chokes if dcgettext is defined as a macro.  So include it now, to make
+   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
+   as well because people using "gettext.h" will not include <libintl.h>,
+   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+   is OK.  */
+#if defined(__sun)
+# include <locale.h>
+#endif
+
+/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
+   <libintl.h>, which chokes if dcgettext is defined as a macro.  So include
+   it now, to make later inclusions of <libintl.h> a NOP.  */
+#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
+# include <cstdlib>
+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
+#  include <libintl.h>
+# endif
+#endif
+
+/* Disabled NLS.
+   The casts to 'const char *' serve the purpose of producing warnings
+   for invalid uses of the value returned from these functions.
+   On pre-ANSI systems without 'const', the config.h file is supposed to
+   contain "#define const".  */
+# define gettext(Msgid) ((const char *) (Msgid))
+# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
+# define dcgettext(Domainname, Msgid, Category) \
+    ((void) (Category), dgettext (Domainname, Msgid))
+# define ngettext(Msgid1, Msgid2, N) \
+    ((N) == 1 \
+     ? ((void) (Msgid2), (const char *) (Msgid1)) \
+     : ((void) (Msgid1), (const char *) (Msgid2)))
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
+    ((void) (Domainname), ngettext (Msgid1, Msgid2, N))
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+    ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
+# define textdomain(Domainname) ((const char *) (Domainname))
+# define bindtextdomain(Domainname, Dirname) \
+    ((void) (Domainname), (const char *) (Dirname))
+# define bind_textdomain_codeset(Domainname, Codeset) \
+    ((void) (Domainname), (const char *) (Codeset))
+
+#endif
+
+/* A pseudo function call that serves as a marker for the automated
+   extraction of messages, but does not call gettext().  The run-time
+   translation is done at a different place in the code.
+   The argument, String, should be a literal string.  Concatenated strings
+   and other string expressions won't work.
+   The macro's expansion is not parenthesized, so that it is suitable as
+   initializer for static 'char[]' or 'const char[]' variables.  */
+#define gettext_noop(String) String
+
+/* The separator between msgctxt and msgid in a .mo file.  */
+#define GETTEXT_CONTEXT_GLUE "\004"
+
+/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
+   MSGID.  MSGCTXT and MSGID must be string literals.  MSGCTXT should be
+   short and rarely need to change.
+   The letter 'p' stands for 'particular' or 'special'.  */
+#ifdef DEFAULT_TEXT_DOMAIN
+# define pgettext(Msgctxt, Msgid) \
+   pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#else
+# define pgettext(Msgctxt, Msgid) \
+   pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#endif
+#define dpgettext(Domainname, Msgctxt, Msgid) \
+  pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
+  pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category)
+#ifdef DEFAULT_TEXT_DOMAIN
+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+   npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#else
+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+   npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#endif
+#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+  npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
+  npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+pgettext_aux (const char *domain,
+	      const char *msg_ctxt_id, const char *msgid,
+	      int category)
+{
+  const char *translation = dcgettext (domain, msg_ctxt_id, category);
+  if (translation == msg_ctxt_id)
+    return msgid;
+  else
+    return translation;
+}
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+npgettext_aux (const char *domain,
+	       const char *msg_ctxt_id, const char *msgid,
+	       const char *msgid_plural, unsigned long int n,
+	       int category)
+{
+  const char *translation =
+    dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+  if (translation == msg_ctxt_id || translation == msgid_plural)
+    return (n == 1 ? msgid : msgid_plural);
+  else
+    return translation;
+}
+
+/* The same thing extended for non-constant arguments.  Here MSGCTXT and MSGID
+   can be arbitrary expressions.  But for string literals these macros are
+   less efficient than those above.  */
+
+#include <string.h>
+
+#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
+  (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \
+   /* || __STDC_VERSION__ >= 199901L */ )
+
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+#include <stdlib.h>
+#endif
+
+#define pgettext_expr(Msgctxt, Msgid) \
+  dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
+#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
+  dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+dcpgettext_expr (const char *domain,
+		 const char *msgctxt, const char *msgid,
+		 int category)
+{
+  size_t msgctxt_len = strlen (msgctxt) + 1;
+  size_t msgid_len = strlen (msgid) + 1;
+  const char *translation;
+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+  char msg_ctxt_id[msgctxt_len + msgid_len];
+#else
+  char buf[1024];
+  char *msg_ctxt_id =
+    (msgctxt_len + msgid_len <= sizeof (buf)
+     ? buf
+     : (char *) malloc (msgctxt_len + msgid_len));
+  if (msg_ctxt_id != NULL)
+#endif
+    {
+      memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+      msg_ctxt_id[msgctxt_len - 1] = '\004';
+      memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+      translation = dcgettext (domain, msg_ctxt_id, category);
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+      if (msg_ctxt_id != buf)
+	free (msg_ctxt_id);
+#endif
+      if (translation != msg_ctxt_id)
+	return translation;
+    }
+  return msgid;
+}
+
+#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
+  dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+  dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+dcnpgettext_expr (const char *domain,
+		  const char *msgctxt, const char *msgid,
+		  const char *msgid_plural, unsigned long int n,
+		  int category)
+{
+  size_t msgctxt_len = strlen (msgctxt) + 1;
+  size_t msgid_len = strlen (msgid) + 1;
+  const char *translation;
+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+  char msg_ctxt_id[msgctxt_len + msgid_len];
+#else
+  char buf[1024];
+  char *msg_ctxt_id =
+    (msgctxt_len + msgid_len <= sizeof (buf)
+     ? buf
+     : (char *) malloc (msgctxt_len + msgid_len));
+  if (msg_ctxt_id != NULL)
+#endif
+    {
+      memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+      msg_ctxt_id[msgctxt_len - 1] = '\004';
+      memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+      translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+      if (msg_ctxt_id != buf)
+	free (msg_ctxt_id);
+#endif
+      if (!(translation == msg_ctxt_id || translation == msgid_plural))
+	return translation;
+    }
+  return (n == 1 ? msgid : msgid_plural);
+}
+
+#endif /* _LIBGETTEXT_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/gettimeofday.c b/Build/source/utils/texinfo/gnulib/lib/gettimeofday.c
new file mode 100644
index 00000000000..88295ce6a89
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/gettimeofday.c
@@ -0,0 +1,142 @@
+/* Provide gettimeofday for systems that don't have it or for which it's broken.
+
+   Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007 Free Software
+   Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* written by Jim Meyering */
+
+#include <config.h>
+
+/* Specification.  */
+#include <sys/time.h>
+
+#include <time.h>
+
+#if HAVE_SYS_TIMEB_H
+# include <sys/timeb.h>
+#endif
+
+#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME
+
+/* Work around the bug in some systems whereby gettimeofday clobbers
+   the static buffer that localtime uses for its return value.  The
+   gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has
+   this problem.  The tzset replacement is necessary for at least
+   Solaris 2.5, 2.5.1, and 2.6.  */
+
+static struct tm tm_zero_buffer;
+static struct tm *localtime_buffer_addr = &tm_zero_buffer;
+
+/* This is a wrapper for localtime.  It is used only on systems for which
+   gettimeofday clobbers the static buffer used for localtime's result.
+
+   On the first call, record the address of the static buffer that
+   localtime uses for its result.  */
+
+struct tm *
+rpl_localtime (time_t const *timep)
+{
+#undef localtime
+  extern struct tm *localtime (time_t const *);
+  struct tm *tm = localtime (timep);
+
+  if (localtime_buffer_addr == &tm_zero_buffer)
+    localtime_buffer_addr = tm;
+
+  return tm;
+}
+
+/* Same as above, since gmtime and localtime use the same buffer.  */
+struct tm *
+rpl_gmtime (time_t const *timep)
+{
+#undef gmtime
+  extern struct tm *gmtime (time_t const *);
+  struct tm *tm = gmtime (timep);
+
+  if (localtime_buffer_addr == &tm_zero_buffer)
+    localtime_buffer_addr = tm;
+
+  return tm;
+}
+
+#endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */
+
+#if TZSET_CLOBBERS_LOCALTIME
+/* This is a wrapper for tzset, for systems on which tzset may clobber
+   the static buffer used for localtime's result.  */
+void
+rpl_tzset (void)
+{
+#undef tzset
+  extern void tzset (void);
+
+  /* Save and restore the contents of the buffer used for localtime's
+     result around the call to tzset.  */
+  struct tm save = *localtime_buffer_addr;
+  tzset ();
+  *localtime_buffer_addr = save;
+}
+#endif
+
+/* This is a wrapper for gettimeofday.  It is used only on systems
+   that lack this function, or whose implementation of this function
+   causes problems.  */
+
+int
+rpl_gettimeofday (struct timeval *restrict tv, void *restrict tz)
+{
+#undef gettimeofday
+#if HAVE_GETTIMEOFDAY
+# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
+  /* Save and restore the contents of the buffer used for localtime's
+     result around the call to gettimeofday.  */
+  struct tm save = *localtime_buffer_addr;
+# endif
+
+  int result = gettimeofday (tv, tz);
+
+# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
+  *localtime_buffer_addr = save;
+# endif
+
+  return result;
+
+#else
+
+# if HAVE__FTIME
+
+  struct _timeb timebuf;
+  _ftime (&timebuf);
+  tv->tv_sec = timebuf.time;
+  tv->tv_usec = timebuf.millitm * 1000;
+
+# else
+
+#  if !defined OK_TO_USE_1S_CLOCK
+#   error "Only 1-second nominal clock resolution found.  Is that intended?" \
+          "If so, compile with the -DOK_TO_USE_1S_CLOCK option."
+#  endif
+  tv->tv_sec = time (NULL);
+  tv->tv_usec = 0;
+
+# endif
+
+  return 0;
+
+#endif
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/intprops.h b/Build/source/utils/texinfo/gnulib/lib/intprops.h
new file mode 100644
index 00000000000..002161ee574
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/intprops.h
@@ -0,0 +1,77 @@
+/* intprops.h -- properties of integer types
+
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Paul Eggert.  */
+
+#include <limits.h>
+
+/* The extra casts in the following macros work around compiler bugs,
+   e.g., in Cray C 5.0.3.0.  */
+
+/* True if the arithmetic type T is an integer type.  bool counts as
+   an integer.  */
+#define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
+
+/* True if negative values of the signed integer type T use two's
+   complement, ones' complement, or signed magnitude representation,
+   respectively.  Much GNU code assumes two's complement, but some
+   people like to be portable to all possible C hosts.  */
+#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
+#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
+#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
+
+/* True if the arithmetic type T is signed.  */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+
+/* The maximum and minimum values for the integer type T.  These
+   macros have undefined behavior if T is signed and has padding bits.
+   If this is a problem for you, please let us know how to fix it for
+   your host.  */
+#define TYPE_MINIMUM(t) \
+  ((t) (! TYPE_SIGNED (t) \
+	? (t) 0 \
+	: TYPE_SIGNED_MAGNITUDE (t) \
+	? ~ (t) 0 \
+	: ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+#define TYPE_MAXIMUM(t) \
+  ((t) (! TYPE_SIGNED (t) \
+	? (t) -1 \
+	: ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+
+/* Return zero if T can be determined to be an unsigned type.
+   Otherwise, return 1.
+   When compiling with GCC, INT_STRLEN_BOUND uses this macro to obtain a
+   tighter bound.  Otherwise, it overestimates the true bound by one byte
+   when applied to unsigned types of size 2, 4, 16, ... bytes.
+   The symbol signed_type_or_expr__ is private to this header file.  */
+#if __GNUC__ >= 2
+# define signed_type_or_expr__(t) TYPE_SIGNED (__typeof__ (t))
+#else
+# define signed_type_or_expr__(t) 1
+#endif
+
+/* Bound on length of the string representing an integer type or expression T.
+   Subtract 1 for the sign bit if T is signed; log10 (2.0) < 146/485;
+   add 1 for integer division truncation; add 1 more for a minus sign
+   if needed.  */
+#define INT_STRLEN_BOUND(t) \
+  ((sizeof (t) * CHAR_BIT - signed_type_or_expr__ (t)) * 146 / 485 \
+   + signed_type_or_expr__ (t) + 1)
+
+/* Bound on buffer size needed to represent an integer type or expression T,
+   including the terminating null.  */
+#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
diff --git a/Build/source/utils/texinfo/gnulib/lib/localcharset.c b/Build/source/utils/texinfo/gnulib/lib/localcharset.c
new file mode 100644
index 00000000000..68679cf878f
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/localcharset.c
@@ -0,0 +1,462 @@
+/* Determine a canonical name for the current locale's character encoding.
+
+   Copyright (C) 2000-2006, 2008 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "localcharset.h"
+
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#if defined _WIN32 || defined __WIN32__
+# define WIN32_NATIVE
+#endif
+
+#if defined __EMX__
+/* Assume EMX program runs on OS/2, even if compiled under DOS.  */
+# ifndef OS2
+#  define OS2
+# endif
+#endif
+
+#if !defined WIN32_NATIVE
+# if HAVE_LANGINFO_CODESET
+#  include <langinfo.h>
+# else
+#  if 0 /* see comment below */
+#   include <locale.h>
+#  endif
+# endif
+# ifdef __CYGWIN__
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
+# endif
+#elif defined WIN32_NATIVE
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+#if defined OS2
+# define INCL_DOS
+# include <os2.h>
+#endif
+
+#if ENABLE_RELOCATABLE
+# include "relocatable.h"
+#else
+# define relocate(pathname) (pathname)
+#endif
+
+/* Get LIBDIR.  */
+#ifndef LIBDIR
+# include "configmake.h"
+#endif
+
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#endif
+
+#ifndef DIRECTORY_SEPARATOR
+# define DIRECTORY_SEPARATOR '/'
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#endif
+
+#if HAVE_DECL_GETC_UNLOCKED
+# undef getc
+# define getc getc_unlocked
+#endif
+
+/* The following static variable is declared 'volatile' to avoid a
+   possible multithread problem in the function get_charset_aliases. If we
+   are running in a threaded environment, and if two threads initialize
+   'charset_aliases' simultaneously, both will produce the same value,
+   and everything will be ok if the two assignments to 'charset_aliases'
+   are atomic. But I don't know what will happen if the two assignments mix.  */
+#if __STDC__ != 1
+# define volatile /* empty */
+#endif
+/* Pointer to the contents of the charset.alias file, if it has already been
+   read, else NULL.  Its format is:
+   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
+static const char * volatile charset_aliases;
+
+/* Return a pointer to the contents of the charset.alias file.  */
+static const char *
+get_charset_aliases (void)
+{
+  const char *cp;
+
+  cp = charset_aliases;
+  if (cp == NULL)
+    {
+#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
+      FILE *fp;
+      const char *dir;
+      const char *base = "charset.alias";
+      char *file_name;
+
+      /* Make it possible to override the charset.alias location.  This is
+	 necessary for running the testsuite before "make install".  */
+      dir = getenv ("CHARSETALIASDIR");
+      if (dir == NULL || dir[0] == '\0')
+	dir = relocate (LIBDIR);
+
+      /* Concatenate dir and base into freshly allocated file_name.  */
+      {
+	size_t dir_len = strlen (dir);
+	size_t base_len = strlen (base);
+	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
+	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
+	if (file_name != NULL)
+	  {
+	    memcpy (file_name, dir, dir_len);
+	    if (add_slash)
+	      file_name[dir_len] = DIRECTORY_SEPARATOR;
+	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
+	  }
+      }
+
+      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
+	/* Out of memory or file not found, treat it as empty.  */
+	cp = "";
+      else
+	{
+	  /* Parse the file's contents.  */
+	  char *res_ptr = NULL;
+	  size_t res_size = 0;
+
+	  for (;;)
+	    {
+	      int c;
+	      char buf1[50+1];
+	      char buf2[50+1];
+	      size_t l1, l2;
+	      char *old_res_ptr;
+
+	      c = getc (fp);
+	      if (c == EOF)
+		break;
+	      if (c == '\n' || c == ' ' || c == '\t')
+		continue;
+	      if (c == '#')
+		{
+		  /* Skip comment, to end of line.  */
+		  do
+		    c = getc (fp);
+		  while (!(c == EOF || c == '\n'));
+		  if (c == EOF)
+		    break;
+		  continue;
+		}
+	      ungetc (c, fp);
+	      if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
+		break;
+	      l1 = strlen (buf1);
+	      l2 = strlen (buf2);
+	      old_res_ptr = res_ptr;
+	      if (res_size == 0)
+		{
+		  res_size = l1 + 1 + l2 + 1;
+		  res_ptr = (char *) malloc (res_size + 1);
+		}
+	      else
+		{
+		  res_size += l1 + 1 + l2 + 1;
+		  res_ptr = (char *) realloc (res_ptr, res_size + 1);
+		}
+	      if (res_ptr == NULL)
+		{
+		  /* Out of memory. */
+		  res_size = 0;
+		  if (old_res_ptr != NULL)
+		    free (old_res_ptr);
+		  break;
+		}
+	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
+	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
+	    }
+	  fclose (fp);
+	  if (res_size == 0)
+	    cp = "";
+	  else
+	    {
+	      *(res_ptr + res_size) = '\0';
+	      cp = res_ptr;
+	    }
+	}
+
+      if (file_name != NULL)
+	free (file_name);
+
+#else
+
+# if defined VMS
+      /* To avoid the troubles of an extra file charset.alias_vms in the
+	 sources of many GNU packages, simply inline the aliases here.  */
+      /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
+	 "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
+	 section 10.7 "Handling Different Character Sets".  */
+      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
+	   "ISO8859-2" "\0" "ISO-8859-2" "\0"
+	   "ISO8859-5" "\0" "ISO-8859-5" "\0"
+	   "ISO8859-7" "\0" "ISO-8859-7" "\0"
+	   "ISO8859-8" "\0" "ISO-8859-8" "\0"
+	   "ISO8859-9" "\0" "ISO-8859-9" "\0"
+	   /* Japanese */
+	   "eucJP" "\0" "EUC-JP" "\0"
+	   "SJIS" "\0" "SHIFT_JIS" "\0"
+	   "DECKANJI" "\0" "DEC-KANJI" "\0"
+	   "SDECKANJI" "\0" "EUC-JP" "\0"
+	   /* Chinese */
+	   "eucTW" "\0" "EUC-TW" "\0"
+	   "DECHANYU" "\0" "DEC-HANYU" "\0"
+	   "DECHANZI" "\0" "GB2312" "\0"
+	   /* Korean */
+	   "DECKOREAN" "\0" "EUC-KR" "\0";
+# endif
+
+# if defined WIN32_NATIVE || defined __CYGWIN__
+      /* To avoid the troubles of installing a separate file in the same
+	 directory as the DLL and of retrieving the DLL's directory at
+	 runtime, simply inline the aliases here.  */
+
+      cp = "CP936" "\0" "GBK" "\0"
+	   "CP1361" "\0" "JOHAB" "\0"
+	   "CP20127" "\0" "ASCII" "\0"
+	   "CP20866" "\0" "KOI8-R" "\0"
+	   "CP20936" "\0" "GB2312" "\0"
+	   "CP21866" "\0" "KOI8-RU" "\0"
+	   "CP28591" "\0" "ISO-8859-1" "\0"
+	   "CP28592" "\0" "ISO-8859-2" "\0"
+	   "CP28593" "\0" "ISO-8859-3" "\0"
+	   "CP28594" "\0" "ISO-8859-4" "\0"
+	   "CP28595" "\0" "ISO-8859-5" "\0"
+	   "CP28596" "\0" "ISO-8859-6" "\0"
+	   "CP28597" "\0" "ISO-8859-7" "\0"
+	   "CP28598" "\0" "ISO-8859-8" "\0"
+	   "CP28599" "\0" "ISO-8859-9" "\0"
+	   "CP28605" "\0" "ISO-8859-15" "\0"
+	   "CP38598" "\0" "ISO-8859-8" "\0"
+	   "CP51932" "\0" "EUC-JP" "\0"
+	   "CP51936" "\0" "GB2312" "\0"
+	   "CP51949" "\0" "EUC-KR" "\0"
+	   "CP51950" "\0" "EUC-TW" "\0"
+	   "CP54936" "\0" "GB18030" "\0"
+	   "CP65001" "\0" "UTF-8" "\0";
+# endif
+#endif
+
+      charset_aliases = cp;
+    }
+
+  return cp;
+}
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name.  */
+
+#ifdef STATIC
+STATIC
+#endif
+const char *
+locale_charset (void)
+{
+  const char *codeset;
+  const char *aliases;
+
+#if !(defined WIN32_NATIVE || defined OS2)
+
+# if HAVE_LANGINFO_CODESET
+
+  /* Most systems support nl_langinfo (CODESET) nowadays.  */
+  codeset = nl_langinfo (CODESET);
+
+#  ifdef __CYGWIN__
+  /* Cygwin 2006 does not have locales.  nl_langinfo (CODESET) always
+     returns "US-ASCII".  As long as this is not fixed, return the suffix
+     of the locale name from the environment variables (if present) or
+     the codepage as a number.  */
+  if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
+    {
+      const char *locale;
+      static char buf[2 + 10 + 1];
+
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+	{
+	  locale = getenv ("LC_CTYPE");
+	  if (locale == NULL || locale[0] == '\0')
+	    locale = getenv ("LANG");
+	}
+      if (locale != NULL && locale[0] != '\0')
+	{
+	  /* If the locale name contains an encoding after the dot, return
+	     it.  */
+	  const char *dot = strchr (locale, '.');
+
+	  if (dot != NULL)
+	    {
+	      const char *modifier;
+
+	      dot++;
+	      /* Look for the possible @... trailer and remove it, if any.  */
+	      modifier = strchr (dot, '@');
+	      if (modifier == NULL)
+		return dot;
+	      if (modifier - dot < sizeof (buf))
+		{
+		  memcpy (buf, dot, modifier - dot);
+		  buf [modifier - dot] = '\0';
+		  return buf;
+		}
+	    }
+	}
+
+      /* Woe32 has a function returning the locale's codepage as a number.  */
+      sprintf (buf, "CP%u", GetACP ());
+      codeset = buf;
+    }
+#  endif
+
+# else
+
+  /* On old systems which lack it, use setlocale or getenv.  */
+  const char *locale = NULL;
+
+  /* But most old systems don't have a complete set of locales.  Some
+     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
+     use setlocale here; it would return "C" when it doesn't support the
+     locale name the user has set.  */
+#  if 0
+  locale = setlocale (LC_CTYPE, NULL);
+#  endif
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+	{
+	  locale = getenv ("LC_CTYPE");
+	  if (locale == NULL || locale[0] == '\0')
+	    locale = getenv ("LANG");
+	}
+    }
+
+  /* On some old systems, one used to set locale = "iso8859_1". On others,
+     you set it to "language_COUNTRY.charset". In any case, we resolve it
+     through the charset.alias file.  */
+  codeset = locale;
+
+# endif
+
+#elif defined WIN32_NATIVE
+
+  static char buf[2 + 10 + 1];
+
+  /* Woe32 has a function returning the locale's codepage as a number.  */
+  sprintf (buf, "CP%u", GetACP ());
+  codeset = buf;
+
+#elif defined OS2
+
+  const char *locale;
+  static char buf[2 + 10 + 1];
+  ULONG cp[3];
+  ULONG cplen;
+
+  /* Allow user to override the codeset, as set in the operating system,
+     with standard language environment variables.  */
+  locale = getenv ("LC_ALL");
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_CTYPE");
+      if (locale == NULL || locale[0] == '\0')
+	locale = getenv ("LANG");
+    }
+  if (locale != NULL && locale[0] != '\0')
+    {
+      /* If the locale name contains an encoding after the dot, return it.  */
+      const char *dot = strchr (locale, '.');
+
+      if (dot != NULL)
+	{
+	  const char *modifier;
+
+	  dot++;
+	  /* Look for the possible @... trailer and remove it, if any.  */
+	  modifier = strchr (dot, '@');
+	  if (modifier == NULL)
+	    return dot;
+	  if (modifier - dot < sizeof (buf))
+	    {
+	      memcpy (buf, dot, modifier - dot);
+	      buf [modifier - dot] = '\0';
+	      return buf;
+	    }
+	}
+
+      /* Resolve through the charset.alias file.  */
+      codeset = locale;
+    }
+  else
+    {
+      /* OS/2 has a function returning the locale's codepage as a number.  */
+      if (DosQueryCp (sizeof (cp), cp, &cplen))
+	codeset = "";
+      else
+	{
+	  sprintf (buf, "CP%u", cp[0]);
+	  codeset = buf;
+	}
+    }
+
+#endif
+
+  if (codeset == NULL)
+    /* The canonical name cannot be determined.  */
+    codeset = "";
+
+  /* Resolve alias. */
+  for (aliases = get_charset_aliases ();
+       *aliases != '\0';
+       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+    if (strcmp (codeset, aliases) == 0
+	|| (aliases[0] == '*' && aliases[1] == '\0'))
+      {
+	codeset = aliases + strlen (aliases) + 1;
+	break;
+      }
+
+  /* Don't return an empty string.  GNU libc and GNU libiconv interpret
+     the empty string as denoting "the locale's character encoding",
+     thus GNU libiconv would call this function a second time.  */
+  if (codeset[0] == '\0')
+    codeset = "ASCII";
+
+  return codeset;
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/localcharset.h b/Build/source/utils/texinfo/gnulib/lib/localcharset.h
new file mode 100644
index 00000000000..b9a3013ae3f
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/localcharset.h
@@ -0,0 +1,41 @@
+/* Determine a canonical name for the current locale's character encoding.
+   Copyright (C) 2000-2003 Free Software Foundation, Inc.
+   This file is part of the GNU CHARSET Library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _LOCALCHARSET_H
+#define _LOCALCHARSET_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name.  */
+extern const char * locale_charset (void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _LOCALCHARSET_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/malloc.c b/Build/source/utils/texinfo/gnulib/lib/malloc.c
new file mode 100644
index 00000000000..f2f66637907
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/malloc.c
@@ -0,0 +1,57 @@
+/* malloc() function that is glibc compatible.
+
+   Copyright (C) 1997, 1998, 2006, 2007 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* written by Jim Meyering and Bruno Haible */
+
+#include <config.h>
+/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h.  */
+#ifdef malloc
+# define NEED_MALLOC_GNU
+# undef malloc
+#endif
+
+/* Specification.  */
+#include <stdlib.h>
+
+#include <errno.h>
+
+/* Call the system's malloc below.  */
+#undef malloc
+
+/* Allocate an N-byte block of memory from the heap.
+   If N is zero, allocate a 1-byte block.  */
+
+void *
+rpl_malloc (size_t n)
+{
+  void *result;
+
+#ifdef NEED_MALLOC_GNU
+  if (n == 0)
+    n = 1;
+#endif
+
+  result = malloc (n);
+
+#if !HAVE_MALLOC_POSIX
+  if (result == NULL)
+    errno = ENOMEM;
+#endif
+
+  return result;
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/malloca.c b/Build/source/utils/texinfo/gnulib/lib/malloca.c
new file mode 100644
index 00000000000..1f410781dbc
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/malloca.c
@@ -0,0 +1,137 @@
+/* Safe automatic memory allocation.
+   Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "malloca.h"
+
+/* The speed critical point in this file is freea() applied to an alloca()
+   result: it must be fast, to match the speed of alloca().  The speed of
+   mmalloca() and freea() in the other case are not critical, because they
+   are only invoked for big memory sizes.  */
+
+#if HAVE_ALLOCA
+
+/* Store the mmalloca() results in a hash table.  This is needed to reliably
+   distinguish a mmalloca() result and an alloca() result.
+
+   Although it is possible that the same pointer is returned by alloca() and
+   by mmalloca() at different times in the same application, it does not lead
+   to a bug in freea(), because:
+     - Before a pointer returned by alloca() can point into malloc()ed memory,
+       the function must return, and once this has happened the programmer must
+       not call freea() on it anyway.
+     - Before a pointer returned by mmalloca() can point into the stack, it
+       must be freed.  The only function that can free it is freea(), and
+       when freea() frees it, it also removes it from the hash table.  */
+
+#define MAGIC_NUMBER 0x1415fb4a
+#define MAGIC_SIZE sizeof (int)
+/* This is how the header info would look like without any alignment
+   considerations.  */
+struct preliminary_header { void *next; char room[MAGIC_SIZE]; };
+/* But the header's size must be a multiple of sa_alignment_max.  */
+#define HEADER_SIZE \
+  (((sizeof (struct preliminary_header) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max)
+struct header { void *next; char room[HEADER_SIZE - sizeof (struct preliminary_header) + MAGIC_SIZE]; };
+/* Verify that HEADER_SIZE == sizeof (struct header).  */
+typedef int verify1[2 * (HEADER_SIZE == sizeof (struct header)) - 1];
+/* We make the hash table quite big, so that during lookups the probability
+   of empty hash buckets is quite high.  There is no need to make the hash
+   table resizable, because when the hash table gets filled so much that the
+   lookup becomes slow, it means that the application has memory leaks.  */
+#define HASH_TABLE_SIZE 257
+static void * mmalloca_results[HASH_TABLE_SIZE];
+
+#endif
+
+void *
+mmalloca (size_t n)
+{
+#if HAVE_ALLOCA
+  /* Allocate one more word, that serves as an indicator for malloc()ed
+     memory, so that freea() of an alloca() result is fast.  */
+  size_t nplus = n + HEADER_SIZE;
+
+  if (nplus >= n)
+    {
+      char *p = (char *) malloc (nplus);
+
+      if (p != NULL)
+	{
+	  size_t slot;
+
+	  p += HEADER_SIZE;
+
+	  /* Put a magic number into the indicator word.  */
+	  ((int *) p)[-1] = MAGIC_NUMBER;
+
+	  /* Enter p into the hash table.  */
+	  slot = (unsigned long) p % HASH_TABLE_SIZE;
+	  ((struct header *) (p - HEADER_SIZE))->next = mmalloca_results[slot];
+	  mmalloca_results[slot] = p;
+
+	  return p;
+	}
+    }
+  /* Out of memory.  */
+  return NULL;
+#else
+# if !MALLOC_0_IS_NONNULL
+  if (n == 0)
+    n = 1;
+# endif
+  return malloc (n);
+#endif
+}
+
+#if HAVE_ALLOCA
+void
+freea (void *p)
+{
+  /* mmalloca() may have returned NULL.  */
+  if (p != NULL)
+    {
+      /* Attempt to quickly distinguish the mmalloca() result - which has
+	 a magic indicator word - and the alloca() result - which has an
+	 uninitialized indicator word.  It is for this test that sa_increment
+	 additional bytes are allocated in the alloca() case.  */
+      if (((int *) p)[-1] == MAGIC_NUMBER)
+	{
+	  /* Looks like a mmalloca() result.  To see whether it really is one,
+	     perform a lookup in the hash table.  */
+	  size_t slot = (unsigned long) p % HASH_TABLE_SIZE;
+	  void **chain = &mmalloca_results[slot];
+	  for (; *chain != NULL;)
+	    {
+	      if (*chain == p)
+		{
+		  /* Found it.  Remove it from the hash table and free it.  */
+		  char *p_begin = (char *) p - HEADER_SIZE;
+		  *chain = ((struct header *) p_begin)->next;
+		  free (p_begin);
+		  return;
+		}
+	      chain = &((struct header *) ((char *) *chain - HEADER_SIZE))->next;
+	    }
+	}
+      /* At this point, we know it was not a mmalloca() result.  */
+    }
+}
+#endif
diff --git a/Build/source/utils/texinfo/gnulib/lib/malloca.h b/Build/source/utils/texinfo/gnulib/lib/malloca.h
new file mode 100644
index 00000000000..3be0a386063
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/malloca.h
@@ -0,0 +1,134 @@
+/* Safe automatic memory allocation.
+   Copyright (C) 2003-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _MALLOCA_H
+#define _MALLOCA_H
+
+#include <alloca.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* safe_alloca(N) is equivalent to alloca(N) when it is safe to call
+   alloca(N); otherwise it returns NULL.  It either returns N bytes of
+   memory allocated on the stack, that lasts until the function returns,
+   or NULL.
+   Use of safe_alloca should be avoided:
+     - inside arguments of function calls - undefined behaviour,
+     - in inline functions - the allocation may actually last until the
+       calling function returns.
+*/
+#if HAVE_ALLOCA
+/* The OS usually guarantees only one guard page at the bottom of the stack,
+   and a page size can be as small as 4096 bytes.  So we cannot safely
+   allocate anything larger than 4096 bytes.  Also care for the possibility
+   of a few compiler-allocated temporary stack slots.
+   This must be a macro, not an inline function.  */
+# define safe_alloca(N) ((N) < 4032 ? alloca (N) : NULL)
+#else
+# define safe_alloca(N) ((void) (N), NULL)
+#endif
+
+/* malloca(N) is a safe variant of alloca(N).  It allocates N bytes of
+   memory allocated on the stack, that must be freed using freea() before
+   the function returns.  Upon failure, it returns NULL.  */
+#if HAVE_ALLOCA
+# define malloca(N) \
+  ((N) < 4032 - sa_increment					    \
+   ? (void *) ((char *) alloca ((N) + sa_increment) + sa_increment) \
+   : mmalloca (N))
+#else
+# define malloca(N) \
+  mmalloca (N)
+#endif
+extern void * mmalloca (size_t n);
+
+/* Free a block of memory allocated through malloca().  */
+#if HAVE_ALLOCA
+extern void freea (void *p);
+#else
+# define freea free
+#endif
+
+/* nmalloca(N,S) is an overflow-safe variant of malloca (N * S).
+   It allocates an array of N objects, each with S bytes of memory,
+   on the stack.  S must be positive and N must be nonnegative.
+   The array must be freed using freea() before the function returns.  */
+#if 1
+/* Cf. the definition of xalloc_oversized.  */
+# define nmalloca(n, s) \
+    ((n) > (size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) \
+     ? NULL \
+     : malloca ((n) * (s)))
+#else
+extern void * nmalloca (size_t n, size_t s);
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/* ------------------- Auxiliary, non-public definitions ------------------- */
+
+/* Determine the alignment of a type at compile time.  */
+#if defined __GNUC__
+# define sa_alignof __alignof__
+#elif defined __cplusplus
+  template <class type> struct sa_alignof_helper { char __slot1; type __slot2; };
+# define sa_alignof(type) offsetof (sa_alignof_helper<type>, __slot2)
+#elif defined __hpux
+  /* Work around a HP-UX 10.20 cc bug with enums constants defined as offsetof
+     values.  */
+# define sa_alignof(type) (sizeof (type) <= 4 ? 4 : 8)
+#elif defined _AIX
+  /* Work around an AIX 3.2.5 xlc bug with enums constants defined as offsetof
+     values.  */
+# define sa_alignof(type) (sizeof (type) <= 4 ? 4 : 8)
+#else
+# define sa_alignof(type) offsetof (struct { char __slot1; type __slot2; }, __slot2)
+#endif
+
+enum
+{
+/* The desired alignment of memory allocations is the maximum alignment
+   among all elementary types.  */
+  sa_alignment_long = sa_alignof (long),
+  sa_alignment_double = sa_alignof (double),
+#if HAVE_LONG_LONG_INT
+  sa_alignment_longlong = sa_alignof (long long),
+#endif
+  sa_alignment_longdouble = sa_alignof (long double),
+  sa_alignment_max = ((sa_alignment_long - 1) | (sa_alignment_double - 1)
+#if HAVE_LONG_LONG_INT
+		      | (sa_alignment_longlong - 1)
+#endif
+		      | (sa_alignment_longdouble - 1)
+		     ) + 1,
+/* The increment that guarantees room for a magic word must be >= sizeof (int)
+   and a multiple of sa_alignment_max.  */
+  sa_increment = ((sizeof (int) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max
+};
+
+#endif /* _MALLOCA_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/malloca.valgrind b/Build/source/utils/texinfo/gnulib/lib/malloca.valgrind
new file mode 100644
index 00000000000..52f0a50f57f
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/malloca.valgrind
@@ -0,0 +1,7 @@
+# Suppress a valgrind message about use of uninitialized memory in freea().
+# This use is OK because it provides only a speedup.
+{
+    freea
+    Memcheck:Cond
+    fun:freea
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/mbchar.c b/Build/source/utils/texinfo/gnulib/lib/mbchar.c
new file mode 100644
index 00000000000..6fa14b09c0e
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/mbchar.c
@@ -0,0 +1,35 @@
+/* Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+
+#include <config.h>
+
+#include <limits.h>
+
+#include "mbchar.h"
+
+#if IS_BASIC_ASCII
+
+/* Bit table of characters in the ISO C "basic character set".  */
+const unsigned int is_basic_table [UCHAR_MAX / 32 + 1] =
+{
+  0x00001a00,		/* '\t' '\v' '\f' */
+  0xffffffef,		/* ' '...'#' '%'...'?' */
+  0xfffffffe,		/* 'A'...'Z' '[' '\\' ']' '^' '_' */
+  0x7ffffffe		/* 'a'...'z' '{' '|' '}' '~' */
+  /* The remaining bits are 0.  */
+};
+
+#endif /* IS_BASIC_ASCII */
diff --git a/Build/source/utils/texinfo/gnulib/lib/mbchar.h b/Build/source/utils/texinfo/gnulib/lib/mbchar.h
new file mode 100644
index 00000000000..5d47a0a9c52
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/mbchar.h
@@ -0,0 +1,350 @@
+/* Multibyte character data type.
+   Copyright (C) 2001, 2005-2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>.  */
+
+/* A multibyte character is a short subsequence of a char* string,
+   representing a single wide character.
+
+   We use multibyte characters instead of wide characters because of
+   the following goals:
+   1) correct multibyte handling, i.e. operate according to the LC_CTYPE
+      locale,
+   2) ease of maintenance, i.e. the maintainer needs not know all details
+      of the ISO C 99 standard,
+   3) don't fail grossly if the input is not in the encoding set by the
+      locale, because often different encodings are in use in the same
+      countries (ISO-8859-1/UTF-8, EUC-JP/Shift_JIS, ...),
+   4) fast in the case of ASCII characters,
+   5) portability, i.e. don't make unportable assumptions about wchar_t.
+
+   Multibyte characters are only accessed through the mb* macros.
+
+   mb_ptr (mbc)
+     return a pointer to the beginning of the multibyte sequence.
+
+   mb_len (mbc)
+     returns the number of bytes occupied by the multibyte sequence.
+     Always > 0.
+
+   mb_iseq (mbc, sc)
+     returns true if mbc is the standard ASCII character sc.
+
+   mb_isnul (mbc)
+     returns true if mbc is the nul character.
+
+   mb_cmp (mbc1, mbc2)
+     returns a positive, zero, or negative value depending on whether mbc1
+     sorts after, same or before mbc2.
+
+   mb_casecmp (mbc1, mbc2)
+     returns a positive, zero, or negative value depending on whether mbc1
+     sorts after, same or before mbc2, modulo upper/lowercase conversion.
+
+   mb_equal (mbc1, mbc2)
+     returns true if mbc1 and mbc2 are equal.
+
+   mb_caseequal (mbc1, mbc2)
+     returns true if mbc1 and mbc2 are equal modulo upper/lowercase conversion.
+
+   mb_isalnum (mbc)
+     returns true if mbc is alphanumeric.
+
+   mb_isalpha (mbc)
+     returns true if mbc is alphabetic.
+
+   mb_isascii(mbc)
+     returns true if mbc is plain ASCII.
+
+   mb_isblank (mbc)
+     returns true if mbc is a blank.
+
+   mb_iscntrl (mbc)
+     returns true if mbc is a control character.
+
+   mb_isdigit (mbc)
+     returns true if mbc is a decimal digit.
+
+   mb_isgraph (mbc)
+     returns true if mbc is a graphic character.
+
+   mb_islower (mbc)
+     returns true if mbc is lowercase.
+
+   mb_isprint (mbc)
+     returns true if mbc is a printable character.
+
+   mb_ispunct (mbc)
+     returns true if mbc is a punctuation character.
+
+   mb_isspace (mbc)
+     returns true if mbc is a space character.
+
+   mb_isupper (mbc)
+     returns true if mbc is uppercase.
+
+   mb_isxdigit (mbc)
+     returns true if mbc is a hexadecimal digit.
+
+   mb_width (mbc)
+     returns the number of columns on the output device occupied by mbc.
+     Always >= 0.
+
+   mb_putc (mbc, stream)
+     outputs mbc on stream, a byte oriented FILE stream opened for output.
+
+   mb_setascii (&mbc, sc)
+     assigns the standard ASCII character sc to mbc.
+
+   mb_copy (&destmbc, &srcmbc)
+     copies srcmbc to destmbc.
+
+   Here are the function prototypes of the macros.
+
+   extern const char *	mb_ptr (const mbchar_t mbc);
+   extern size_t	mb_len (const mbchar_t mbc);
+   extern bool		mb_iseq (const mbchar_t mbc, char sc);
+   extern bool		mb_isnul (const mbchar_t mbc);
+   extern int		mb_cmp (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern int		mb_casecmp (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern bool		mb_equal (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern bool		mb_caseequal (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern bool		mb_isalnum (const mbchar_t mbc);
+   extern bool		mb_isalpha (const mbchar_t mbc);
+   extern bool		mb_isascii (const mbchar_t mbc);
+   extern bool		mb_isblank (const mbchar_t mbc);
+   extern bool		mb_iscntrl (const mbchar_t mbc);
+   extern bool		mb_isdigit (const mbchar_t mbc);
+   extern bool		mb_isgraph (const mbchar_t mbc);
+   extern bool		mb_islower (const mbchar_t mbc);
+   extern bool		mb_isprint (const mbchar_t mbc);
+   extern bool		mb_ispunct (const mbchar_t mbc);
+   extern bool		mb_isspace (const mbchar_t mbc);
+   extern bool		mb_isupper (const mbchar_t mbc);
+   extern bool		mb_isxdigit (const mbchar_t mbc);
+   extern int		mb_width (const mbchar_t mbc);
+   extern void		mb_putc (const mbchar_t mbc, FILE *stream);
+   extern void          mb_setascii (mbchar_t *new, char sc);
+   extern void		mb_copy (mbchar_t *new, const mbchar_t *old);
+ */
+
+#ifndef _MBCHAR_H
+#define _MBCHAR_H 1
+
+#include <stdbool.h>
+#include <string.h>
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
+   <wchar.h>.  */
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+#include <wctype.h>
+
+#define MBCHAR_BUF_SIZE 24
+
+struct mbchar
+{
+  const char *ptr;	/* pointer to current character */
+  size_t bytes;		/* number of bytes of current character, > 0 */
+  bool wc_valid;	/* true if wc is a valid wide character */
+  wchar_t wc;		/* if wc_valid: the current character */
+  char buf[MBCHAR_BUF_SIZE]; /* room for the bytes, used for file input only */
+};
+
+/* EOF (not a real character) is represented with bytes = 0 and
+   wc_valid = false.  */
+
+typedef struct mbchar mbchar_t;
+
+/* Access the current character.  */
+#define mb_ptr(mbc) ((mbc).ptr)
+#define mb_len(mbc) ((mbc).bytes)
+
+/* Comparison of characters.  */
+#define mb_iseq(mbc, sc) ((mbc).wc_valid && (mbc).wc == (sc))
+#define mb_isnul(mbc) ((mbc).wc_valid && (mbc).wc == 0)
+#define mb_cmp(mbc1, mbc2) \
+  ((mbc1).wc_valid							\
+   ? ((mbc2).wc_valid							\
+      ? (int) (mbc1).wc - (int) (mbc2).wc				\
+      : -1)								\
+   : ((mbc2).wc_valid							\
+      ? 1								\
+      : (mbc1).bytes == (mbc2).bytes					\
+        ? memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes)			\
+        : (mbc1).bytes < (mbc2).bytes					\
+          ? (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) > 0 ? 1 : -1) \
+          : (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc2).bytes) >= 0 ? 1 : -1)))
+#define mb_casecmp(mbc1, mbc2) \
+  ((mbc1).wc_valid							\
+   ? ((mbc2).wc_valid							\
+      ? (int) towlower ((mbc1).wc) - (int) towlower ((mbc2).wc)		\
+      : -1)								\
+   : ((mbc2).wc_valid							\
+      ? 1								\
+      : (mbc1).bytes == (mbc2).bytes					\
+        ? memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes)			\
+        : (mbc1).bytes < (mbc2).bytes					\
+          ? (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) > 0 ? 1 : -1) \
+          : (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc2).bytes) >= 0 ? 1 : -1)))
+#define mb_equal(mbc1, mbc2) \
+  ((mbc1).wc_valid && (mbc2).wc_valid					\
+   ? (mbc1).wc == (mbc2).wc						\
+   : (mbc1).bytes == (mbc2).bytes					\
+     && memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) == 0)
+#define mb_caseequal(mbc1, mbc2) \
+  ((mbc1).wc_valid && (mbc2).wc_valid					\
+   ? towlower ((mbc1).wc) == towlower ((mbc2).wc)			\
+   : (mbc1).bytes == (mbc2).bytes					\
+     && memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) == 0)
+
+/* <ctype.h>, <wctype.h> classification.  */
+#define mb_isascii(mbc) \
+  ((mbc).wc_valid && (mbc).wc >= 0 && (mbc).wc <= 127)
+#define mb_isalnum(mbc) ((mbc).wc_valid && iswalnum ((mbc).wc))
+#define mb_isalpha(mbc) ((mbc).wc_valid && iswalpha ((mbc).wc))
+#define mb_isblank(mbc) ((mbc).wc_valid && iswblank ((mbc).wc))
+#define mb_iscntrl(mbc) ((mbc).wc_valid && iswcntrl ((mbc).wc))
+#define mb_isdigit(mbc) ((mbc).wc_valid && iswdigit ((mbc).wc))
+#define mb_isgraph(mbc) ((mbc).wc_valid && iswgraph ((mbc).wc))
+#define mb_islower(mbc) ((mbc).wc_valid && iswlower ((mbc).wc))
+#define mb_isprint(mbc) ((mbc).wc_valid && iswprint ((mbc).wc))
+#define mb_ispunct(mbc) ((mbc).wc_valid && iswpunct ((mbc).wc))
+#define mb_isspace(mbc) ((mbc).wc_valid && iswspace ((mbc).wc))
+#define mb_isupper(mbc) ((mbc).wc_valid && iswupper ((mbc).wc))
+#define mb_isxdigit(mbc) ((mbc).wc_valid && iswxdigit ((mbc).wc))
+
+/* Extra <wchar.h> function.  */
+
+/* Unprintable characters appear as a small box of width 1.  */
+#define MB_UNPRINTABLE_WIDTH 1
+
+static inline int
+mb_width_aux (wint_t wc)
+{
+  int w = wcwidth (wc);
+  /* For unprintable characters, arbitrarily return 0 for control characters
+     and MB_UNPRINTABLE_WIDTH otherwise.  */
+  return (w >= 0 ? w : iswcntrl (wc) ? 0 : MB_UNPRINTABLE_WIDTH);
+}
+
+#define mb_width(mbc) \
+  ((mbc).wc_valid ? mb_width_aux ((mbc).wc) : MB_UNPRINTABLE_WIDTH)
+
+/* Output.  */
+#define mb_putc(mbc, stream)  fwrite ((mbc).ptr, 1, (mbc).bytes, (stream))
+
+/* Assignment.  */
+#define mb_setascii(mbc, sc) \
+  ((mbc)->ptr = (mbc)->buf, (mbc)->bytes = 1, (mbc)->wc_valid = 1, \
+   (mbc)->wc = (mbc)->buf[0] = (sc))
+
+/* Copying a character.  */
+static inline void
+mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc)
+{
+  if (old_mbc->ptr == &old_mbc->buf[0])
+    {
+      memcpy (&new_mbc->buf[0], &old_mbc->buf[0], old_mbc->bytes);
+      new_mbc->ptr = &new_mbc->buf[0];
+    }
+  else
+    new_mbc->ptr = old_mbc->ptr;
+  new_mbc->bytes = old_mbc->bytes;
+  if ((new_mbc->wc_valid = old_mbc->wc_valid))
+    new_mbc->wc = old_mbc->wc;
+}
+
+
+/* is_basic(c) tests whether the single-byte character c is in the
+   ISO C "basic character set".
+   This is a convenience function, and is in this file only to share code
+   between mbiter_multi.h and mbfile_multi.h.  */
+#if (' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+    && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+    && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+    && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+    && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+    && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+    && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+    && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+    && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+    && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+    && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+    && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+    && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+    && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+    && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+    && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+    && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+    && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+    && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+    && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+    && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+    && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+    && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)
+/* The character set is ISO-646, not EBCDIC. */
+# define IS_BASIC_ASCII 1
+
+extern const unsigned int is_basic_table[];
+
+static inline bool
+is_basic (char c)
+{
+  return (is_basic_table [(unsigned char) c >> 5] >> ((unsigned char) c & 31))
+	 & 1;
+}
+
+#else
+
+static inline bool
+is_basic (char c)
+{
+  switch (c)
+    {
+    case '\t': case '\v': case '\f':
+    case ' ': case '!': case '"': case '#': case '%':
+    case '&': case '\'': case '(': case ')': case '*':
+    case '+': case ',': case '-': case '.': case '/':
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+    case ':': case ';': case '<': case '=': case '>':
+    case '?':
+    case 'A': case 'B': case 'C': case 'D': case 'E':
+    case 'F': case 'G': case 'H': case 'I': case 'J':
+    case 'K': case 'L': case 'M': case 'N': case 'O':
+    case 'P': case 'Q': case 'R': case 'S': case 'T':
+    case 'U': case 'V': case 'W': case 'X': case 'Y':
+    case 'Z':
+    case '[': case '\\': case ']': case '^': case '_':
+    case 'a': case 'b': case 'c': case 'd': case 'e':
+    case 'f': case 'g': case 'h': case 'i': case 'j':
+    case 'k': case 'l': case 'm': case 'n': case 'o':
+    case 'p': case 'q': case 'r': case 's': case 't':
+    case 'u': case 'v': case 'w': case 'x': case 'y':
+    case 'z': case '{': case '|': case '}': case '~':
+      return 1;
+    default:
+      return 0;
+    }
+}
+
+#endif
+
+#endif /* _MBCHAR_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/mbscasecmp.c b/Build/source/utils/texinfo/gnulib/lib/mbscasecmp.c
new file mode 100644
index 00000000000..19f974b33fd
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/mbscasecmp.c
@@ -0,0 +1,102 @@
+/* Case-insensitive string comparison function.
+   Copyright (C) 1998-1999, 2005-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2005,
+   based on earlier glibc code.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <string.h>
+
+#include <ctype.h>
+#include <limits.h>
+
+#if HAVE_MBRTOWC
+# include "mbuiter.h"
+#endif
+
+#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
+
+/* Compare the character strings S1 and S2, ignoring case, returning less than,
+   equal to or greater than zero if S1 is lexicographically less than, equal to
+   or greater than S2.
+   Note: This function may, in multibyte locales, return 0 for strings of
+   different lengths!  */
+int
+mbscasecmp (const char *s1, const char *s2)
+{
+  if (s1 == s2)
+    return 0;
+
+  /* Be careful not to look at the entire extent of s1 or s2 until needed.
+     This is useful because when two strings differ, the difference is
+     most often already in the very few first characters.  */
+#if HAVE_MBRTOWC
+  if (MB_CUR_MAX > 1)
+    {
+      mbui_iterator_t iter1;
+      mbui_iterator_t iter2;
+
+      mbui_init (iter1, s1);
+      mbui_init (iter2, s2);
+
+      while (mbui_avail (iter1) && mbui_avail (iter2))
+	{
+	  int cmp = mb_casecmp (mbui_cur (iter1), mbui_cur (iter2));
+
+	  if (cmp != 0)
+	    return cmp;
+
+	  mbui_advance (iter1);
+	  mbui_advance (iter2);
+	}
+      if (mbui_avail (iter1))
+	/* s2 terminated before s1.  */
+	return 1;
+      if (mbui_avail (iter2))
+	/* s1 terminated before s2.  */
+	return -1;
+      return 0;
+    }
+  else
+#endif
+    {
+      const unsigned char *p1 = (const unsigned char *) s1;
+      const unsigned char *p2 = (const unsigned char *) s2;
+      unsigned char c1, c2;
+
+      do
+	{
+	  c1 = TOLOWER (*p1);
+	  c2 = TOLOWER (*p2);
+
+	  if (c1 == '\0')
+	    break;
+
+	  ++p1;
+	  ++p2;
+	}
+      while (c1 == c2);
+
+      if (UCHAR_MAX <= INT_MAX)
+	return c1 - c2;
+      else
+	/* On machines where 'char' and 'int' are types of the same size, the
+	   difference of two 'unsigned char' values - including the sign bit -
+	   doesn't fit in an 'int'.  */
+	return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0);
+    }
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/mbsncasecmp.c b/Build/source/utils/texinfo/gnulib/lib/mbsncasecmp.c
new file mode 100644
index 00000000000..3763d9616fd
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/mbsncasecmp.c
@@ -0,0 +1,103 @@
+/* Case-insensitive string comparison function.
+   Copyright (C) 1998-1999, 2005-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2005,
+   based on earlier glibc code.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <string.h>
+
+#include <ctype.h>
+#include <limits.h>
+
+#if HAVE_MBRTOWC
+# include "mbuiter.h"
+#endif
+
+#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
+
+/* Compare the initial segment of the character string S1 consisting of at most
+   N characters with the initial segment of the character string S2 consisting
+   of at most N characters, ignoring case, returning less than, equal to or
+   greater than zero if the initial segment of S1 is lexicographically less
+   than, equal to or greater than the initial segment of S2.
+   Note: This function may, in multibyte locales, return 0 for initial segments
+   of different lengths!  */
+int
+mbsncasecmp (const char *s1, const char *s2, size_t n)
+{
+  if (s1 == s2 || n == 0)
+    return 0;
+
+  /* Be careful not to look at the entire extent of s1 or s2 until needed.
+     This is useful because when two strings differ, the difference is
+     most often already in the very few first characters.  */
+#if HAVE_MBRTOWC
+  if (MB_CUR_MAX > 1)
+    {
+      mbui_iterator_t iter1;
+      mbui_iterator_t iter2;
+
+      mbui_init (iter1, s1);
+      mbui_init (iter2, s2);
+
+      while (mbui_avail (iter1) && mbui_avail (iter2))
+	{
+	  int cmp = mb_casecmp (mbui_cur (iter1), mbui_cur (iter2));
+
+	  if (cmp != 0)
+	    return cmp;
+
+	  if (--n == 0)
+	    return 0;
+
+	  mbui_advance (iter1);
+	  mbui_advance (iter2);
+	}
+      if (mbui_avail (iter1))
+	/* s2 terminated before s1 and n.  */
+	return 1;
+      if (mbui_avail (iter2))
+	/* s1 terminated before s2 and n.  */
+	return -1;
+      return 0;
+    }
+  else
+#endif
+    {
+      const unsigned char *p1 = (const unsigned char *) s1;
+      const unsigned char *p2 = (const unsigned char *) s2;
+      unsigned char c1, c2;
+
+      for (; ; p1++, p2++)
+	{
+	  c1 = TOLOWER (*p1);
+	  c2 = TOLOWER (*p2);
+
+	  if (--n == 0 || c1 == '\0' || c1 != c2)
+	    break;
+	}
+
+      if (UCHAR_MAX <= INT_MAX)
+	return c1 - c2;
+      else
+	/* On machines where 'char' and 'int' are types of the same size, the
+	   difference of two 'unsigned char' values - including the sign bit -
+	   doesn't fit in an 'int'.  */
+	return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0);
+    }
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/mbswidth.c b/Build/source/utils/texinfo/gnulib/lib/mbswidth.c
new file mode 100644
index 00000000000..3c54133a990
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/mbswidth.c
@@ -0,0 +1,175 @@
+/* Determine the number of screen columns needed for a string.
+   Copyright (C) 2000-2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <haible@clisp.cons.org>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "mbswidth.h"
+
+/* Get MB_CUR_MAX.  */
+#include <stdlib.h>
+
+#include <string.h>
+
+/* Get isprint().  */
+#include <ctype.h>
+
+/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth().  */
+#include <wchar.h>
+
+/* Get iswcntrl().  */
+#include <wctype.h>
+
+#ifndef mbsinit
+# if !HAVE_MBSINIT
+#  define mbsinit(ps) 1
+# endif
+#endif
+
+/* Returns the number of columns needed to represent the multibyte
+   character string pointed to by STRING.  If a non-printable character
+   occurs, and MBSW_REJECT_UNPRINTABLE is specified, -1 is returned.
+   With flags = MBSW_REJECT_INVALID | MBSW_REJECT_UNPRINTABLE, this is
+   the multibyte analogue of the wcswidth function.
+   If STRING is not of length < INT_MAX / 2, integer overflow can occur.  */
+int
+mbswidth (const char *string, int flags)
+{
+  return mbsnwidth (string, strlen (string), flags);
+}
+
+/* Returns the number of columns needed to represent the multibyte
+   character string pointed to by STRING of length NBYTES.  If a
+   non-printable character occurs, and MBSW_REJECT_UNPRINTABLE is
+   specified, -1 is returned.
+   If NBYTES is not < INT_MAX / 2, integer overflow can occur.  */
+int
+mbsnwidth (const char *string, size_t nbytes, int flags)
+{
+  const char *p = string;
+  const char *plimit = p + nbytes;
+  int width;
+
+  width = 0;
+#if HAVE_MBRTOWC
+  if (MB_CUR_MAX > 1)
+    {
+      while (p < plimit)
+	switch (*p)
+	  {
+	    case ' ': case '!': case '"': case '#': case '%':
+	    case '&': case '\'': case '(': case ')': case '*':
+	    case '+': case ',': case '-': case '.': case '/':
+	    case '0': case '1': case '2': case '3': case '4':
+	    case '5': case '6': case '7': case '8': case '9':
+	    case ':': case ';': case '<': case '=': case '>':
+	    case '?':
+	    case 'A': case 'B': case 'C': case 'D': case 'E':
+	    case 'F': case 'G': case 'H': case 'I': case 'J':
+	    case 'K': case 'L': case 'M': case 'N': case 'O':
+	    case 'P': case 'Q': case 'R': case 'S': case 'T':
+	    case 'U': case 'V': case 'W': case 'X': case 'Y':
+	    case 'Z':
+	    case '[': case '\\': case ']': case '^': case '_':
+	    case 'a': case 'b': case 'c': case 'd': case 'e':
+	    case 'f': case 'g': case 'h': case 'i': case 'j':
+	    case 'k': case 'l': case 'm': case 'n': case 'o':
+	    case 'p': case 'q': case 'r': case 's': case 't':
+	    case 'u': case 'v': case 'w': case 'x': case 'y':
+	    case 'z': case '{': case '|': case '}': case '~':
+	      /* These characters are printable ASCII characters.  */
+	      p++;
+	      width++;
+	      break;
+	    default:
+	      /* If we have a multibyte sequence, scan it up to its end.  */
+	      {
+		mbstate_t mbstate;
+		memset (&mbstate, 0, sizeof mbstate);
+		do
+		  {
+		    wchar_t wc;
+		    size_t bytes;
+		    int w;
+
+		    bytes = mbrtowc (&wc, p, plimit - p, &mbstate);
+
+		    if (bytes == (size_t) -1)
+		      /* An invalid multibyte sequence was encountered.  */
+		      {
+			if (!(flags & MBSW_REJECT_INVALID))
+			  {
+			    p++;
+			    width++;
+			    break;
+			  }
+			else
+			  return -1;
+		      }
+
+		    if (bytes == (size_t) -2)
+		      /* An incomplete multibyte character at the end.  */
+		      {
+			if (!(flags & MBSW_REJECT_INVALID))
+			  {
+			    p = plimit;
+			    width++;
+			    break;
+			  }
+			else
+			  return -1;
+		      }
+
+		    if (bytes == 0)
+		      /* A null wide character was encountered.  */
+		      bytes = 1;
+
+		    w = wcwidth (wc);
+		    if (w >= 0)
+		      /* A printable multibyte character.  */
+		      width += w;
+		    else
+		      /* An unprintable multibyte character.  */
+		      if (!(flags & MBSW_REJECT_UNPRINTABLE))
+			width += (iswcntrl (wc) ? 0 : 1);
+		      else
+			return -1;
+
+		    p += bytes;
+		  }
+		while (! mbsinit (&mbstate));
+	      }
+	      break;
+	  }
+      return width;
+    }
+#endif
+
+  while (p < plimit)
+    {
+      unsigned char c = (unsigned char) *p++;
+
+      if (isprint (c))
+	width++;
+      else if (!(flags & MBSW_REJECT_UNPRINTABLE))
+	width += (iscntrl (c) ? 0 : 1);
+      else
+	return -1;
+    }
+  return width;
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/mbswidth.h b/Build/source/utils/texinfo/gnulib/lib/mbswidth.h
new file mode 100644
index 00000000000..15da406dce1
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/mbswidth.h
@@ -0,0 +1,60 @@
+/* Determine the number of screen columns needed for a string.
+   Copyright (C) 2000-2004, 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <stddef.h>
+
+/* Avoid a clash of our mbswidth() with a function of the same name defined
+   in UnixWare 7.1.1 <wchar.h>.  We need this #include before the #define
+   below.
+   However, we don't want to #include <wchar.h> on all platforms because
+   - Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+     <wchar.h>.
+   - BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
+     <wchar.h>.  */
+#if HAVE_DECL_MBSWIDTH_IN_WCHAR_H
+# include <wchar.h>
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Optional flags to influence mbswidth/mbsnwidth behavior.  */
+
+/* If this bit is set, return -1 upon finding an invalid or incomplete
+   character.  Otherwise, assume invalid characters have width 1.  */
+#define MBSW_REJECT_INVALID 1
+
+/* If this bit is set, return -1 upon finding a non-printable character.
+   Otherwise, assume unprintable characters have width 0 if they are
+   control characters and 1 otherwise.  */
+#define MBSW_REJECT_UNPRINTABLE	2
+
+
+/* Returns the number of screen columns needed for STRING.  */
+#define mbswidth gnu_mbswidth  /* avoid clash with UnixWare 7.1.1 function */
+extern int mbswidth (const char *string, int flags);
+
+/* Returns the number of screen columns needed for the NBYTES bytes
+   starting at BUF.  */
+extern int mbsnwidth (const char *buf, size_t nbytes, int flags);
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/Build/source/utils/texinfo/gnulib/lib/mbuiter.h b/Build/source/utils/texinfo/gnulib/lib/mbuiter.h
new file mode 100644
index 00000000000..213e710307f
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/mbuiter.h
@@ -0,0 +1,222 @@
+/* Iterating through multibyte strings: macros for multi-byte encodings.
+   Copyright (C) 2001, 2005, 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>.  */
+
+/* The macros in this file implement forward iteration through a
+   multi-byte string, without knowing its length a-priori.
+
+   With these macros, an iteration loop that looks like
+
+      char *iter;
+      for (iter = buf; *iter != '\0'; iter++)
+        {
+          do_something (*iter);
+        }
+
+   becomes
+
+      mbui_iterator_t iter;
+      for (mbui_init (iter, buf); mbui_avail (iter); mbui_advance (iter))
+        {
+          do_something (mbui_cur_ptr (iter), mb_len (mbui_cur (iter)));
+        }
+
+   The benefit of these macros over plain use of mbrtowc is:
+   - Handling of invalid multibyte sequences is possible without
+     making the code more complicated, while still preserving the
+     invalid multibyte sequences.
+
+   Compared to mbiter.h, the macros here don't need to know the string's
+   length a-priori.  The downside is that at each step, the look-ahead
+   that guards against overrunning the terminating '\0' is more expensive.
+   The mbui_* macros are therefore suitable when there is a high probability
+   that only the first few multibyte characters need to be inspected.
+   Whereas the mbi_* macros are better if usually the iteration runs
+   through the entire string.
+
+   mbui_iterator_t
+     is a type usable for variable declarations.
+
+   mbui_init (iter, startptr)
+     initializes the iterator, starting at startptr.
+
+   mbui_avail (iter)
+     returns true if there are more multibyte chracters available before
+     the end of string is reached. In this case, mbui_cur (iter) is
+     initialized to the next multibyte chracter.
+
+   mbui_advance (iter)
+     advances the iterator by one multibyte character.
+
+   mbui_cur (iter)
+     returns the current multibyte character, of type mbchar_t.  All the
+     macros defined in mbchar.h can be used on it.
+
+   mbui_cur_ptr (iter)
+     return a pointer to the beginning of the current multibyte character.
+
+   mbui_reloc (iter, ptrdiff)
+     relocates iterator when the string is moved by ptrdiff bytes.
+
+   mbui_copy (&destiter, &srciter)
+     copies srciter to destiter.
+
+   Here are the function prototypes of the macros.
+
+   extern void		mbui_init (mbui_iterator_t iter, const char *startptr);
+   extern bool		mbui_avail (mbui_iterator_t iter);
+   extern void		mbui_advance (mbui_iterator_t iter);
+   extern mbchar_t	mbui_cur (mbui_iterator_t iter);
+   extern const char *	mbui_cur_ptr (mbui_iterator_t iter);
+   extern void		mbui_reloc (mbui_iterator_t iter, ptrdiff_t ptrdiff);
+   extern void		mbui_copy (mbui_iterator_t *new, const mbui_iterator_t *old);
+ */
+
+#ifndef _MBUITER_H
+#define _MBUITER_H 1
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
+   <wchar.h>.  */
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+
+#include "mbchar.h"
+#include "strnlen1.h"
+
+struct mbuiter_multi
+{
+  bool in_shift;	/* true if next byte may not be interpreted as ASCII */
+  mbstate_t state;	/* if in_shift: current shift state */
+  bool next_done;	/* true if mbui_avail has already filled the following */
+  struct mbchar cur;	/* the current character:
+	const char *cur.ptr		pointer to current character
+	The following are only valid after mbui_avail.
+	size_t cur.bytes		number of bytes of current character
+	bool cur.wc_valid		true if wc is a valid wide character
+	wchar_t cur.wc			if wc_valid: the current character
+	*/
+};
+
+static inline void
+mbuiter_multi_next (struct mbuiter_multi *iter)
+{
+  if (iter->next_done)
+    return;
+  if (iter->in_shift)
+    goto with_shift;
+  /* Handle most ASCII characters quickly, without calling mbrtowc().  */
+  if (is_basic (*iter->cur.ptr))
+    {
+      /* These characters are part of the basic character set.  ISO C 99
+	 guarantees that their wide character code is identical to their
+	 char code.  */
+      iter->cur.bytes = 1;
+      iter->cur.wc = *iter->cur.ptr;
+      iter->cur.wc_valid = true;
+    }
+  else
+    {
+      assert (mbsinit (&iter->state));
+      iter->in_shift = true;
+    with_shift:
+      iter->cur.bytes = mbrtowc (&iter->cur.wc, iter->cur.ptr,
+				 strnlen1 (iter->cur.ptr, MB_CUR_MAX),
+				 &iter->state);
+      if (iter->cur.bytes == (size_t) -1)
+	{
+	  /* An invalid multibyte sequence was encountered.  */
+	  iter->cur.bytes = 1;
+	  iter->cur.wc_valid = false;
+	  /* Whether to set iter->in_shift = false and reset iter->state
+	     or not is not very important; the string is bogus anyway.  */
+	}
+      else if (iter->cur.bytes == (size_t) -2)
+	{
+	  /* An incomplete multibyte character at the end.  */
+	  iter->cur.bytes = strlen (iter->cur.ptr);
+	  iter->cur.wc_valid = false;
+	  /* Whether to set iter->in_shift = false and reset iter->state
+	     or not is not important; the string end is reached anyway.  */
+	}
+      else
+	{
+	  if (iter->cur.bytes == 0)
+	    {
+	      /* A null wide character was encountered.  */
+	      iter->cur.bytes = 1;
+	      assert (*iter->cur.ptr == '\0');
+	      assert (iter->cur.wc == 0);
+	    }
+	  iter->cur.wc_valid = true;
+
+	  /* When in the initial state, we can go back treating ASCII
+	     characters more quickly.  */
+	  if (mbsinit (&iter->state))
+	    iter->in_shift = false;
+	}
+    }
+  iter->next_done = true;
+}
+
+static inline void
+mbuiter_multi_reloc (struct mbuiter_multi *iter, ptrdiff_t ptrdiff)
+{
+  iter->cur.ptr += ptrdiff;
+}
+
+static inline void
+mbuiter_multi_copy (struct mbuiter_multi *new_iter, const struct mbuiter_multi *old_iter)
+{
+  if ((new_iter->in_shift = old_iter->in_shift))
+    memcpy (&new_iter->state, &old_iter->state, sizeof (mbstate_t));
+  else
+    memset (&new_iter->state, 0, sizeof (mbstate_t));
+  new_iter->next_done = old_iter->next_done;
+  mb_copy (&new_iter->cur, &old_iter->cur);
+}
+
+/* Iteration macros.  */
+typedef struct mbuiter_multi mbui_iterator_t;
+#define mbui_init(iter, startptr) \
+  ((iter).cur.ptr = (startptr), \
+   (iter).in_shift = false, memset (&(iter).state, '\0', sizeof (mbstate_t)), \
+   (iter).next_done = false)
+#define mbui_avail(iter) \
+  (mbuiter_multi_next (&(iter)), !mb_isnul ((iter).cur))
+#define mbui_advance(iter) \
+  ((iter).cur.ptr += (iter).cur.bytes, (iter).next_done = false)
+
+/* Access to the current character.  */
+#define mbui_cur(iter) (iter).cur
+#define mbui_cur_ptr(iter) (iter).cur.ptr
+
+/* Relocation.  */
+#define mbui_reloc(iter, ptrdiff) mbuiter_multi_reloc (&iter, ptrdiff)
+
+/* Copying an iterator.  */
+#define mbui_copy mbuiter_multi_copy
+
+#endif /* _MBUITER_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/memchr.c b/Build/source/utils/texinfo/gnulib/lib/memchr.c
new file mode 100644
index 00000000000..b47eaef55f1
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/memchr.c
@@ -0,0 +1,200 @@
+/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2006 Free
+   Software Foundation, Inc.
+
+   Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
+   with help from Dan Sahlin (dan@sics.se) and
+   commentary by Jim Blandy (jimb@ai.mit.edu);
+   adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
+   and implemented by Roland McGrath (roland@ai.mit.edu).
+
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _LIBC
+# include <config.h>
+#endif
+
+#include <string.h>
+
+#include <stddef.h>
+
+#if defined _LIBC
+# include <memcopy.h>
+#else
+# define reg_char char
+#endif
+
+#include <limits.h>
+
+#if HAVE_BP_SYM_H || defined _LIBC
+# include <bp-sym.h>
+#else
+# define BP_SYM(sym) sym
+#endif
+
+#undef memchr
+#undef __memchr
+
+/* Search no more than N bytes of S for C.  */
+void *
+__memchr (void const *s, int c_in, size_t n)
+{
+  const unsigned char *char_ptr;
+  const unsigned long int *longword_ptr;
+  unsigned long int longword, magic_bits, charmask;
+  unsigned reg_char c;
+  int i;
+
+  c = (unsigned char) c_in;
+
+  /* Handle the first few characters by reading one character at a time.
+     Do this until CHAR_PTR is aligned on a longword boundary.  */
+  for (char_ptr = (const unsigned char *) s;
+       n > 0 && (size_t) char_ptr % sizeof longword != 0;
+       --n, ++char_ptr)
+    if (*char_ptr == c)
+      return (void *) char_ptr;
+
+  /* All these elucidatory comments refer to 4-byte longwords,
+     but the theory applies equally well to any size longwords.  */
+
+  longword_ptr = (const unsigned long int *) char_ptr;
+
+  /* Bits 31, 24, 16, and 8 of this number are zero.  Call these bits
+     the "holes."  Note that there is a hole just to the left of
+     each byte, with an extra at the end:
+
+     bits:  01111110 11111110 11111110 11111111
+     bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD
+
+     The 1-bits make sure that carries propagate to the next 0-bit.
+     The 0-bits provide holes for carries to fall into.  */
+
+  /* Set MAGIC_BITS to be this pattern of 1 and 0 bits.
+     Set CHARMASK to be a longword, each of whose bytes is C.  */
+
+  magic_bits = 0xfefefefe;
+  charmask = c | (c << 8);
+  charmask |= charmask << 16;
+#if 0xffffffffU < ULONG_MAX
+  magic_bits |= magic_bits << 32;
+  charmask |= charmask << 32;
+  if (8 < sizeof longword)
+    for (i = 64; i < sizeof longword * 8; i *= 2)
+      {
+	magic_bits |= magic_bits << i;
+	charmask |= charmask << i;
+      }
+#endif
+  magic_bits = (ULONG_MAX >> 1) & (magic_bits | 1);
+
+  /* Instead of the traditional loop which tests each character,
+     we will test a longword at a time.  The tricky part is testing
+     if *any of the four* bytes in the longword in question are zero.  */
+  while (n >= sizeof longword)
+    {
+      /* We tentatively exit the loop if adding MAGIC_BITS to
+	 LONGWORD fails to change any of the hole bits of LONGWORD.
+
+	 1) Is this safe?  Will it catch all the zero bytes?
+	 Suppose there is a byte with all zeros.  Any carry bits
+	 propagating from its left will fall into the hole at its
+	 least significant bit and stop.  Since there will be no
+	 carry from its most significant bit, the LSB of the
+	 byte to the left will be unchanged, and the zero will be
+	 detected.
+
+	 2) Is this worthwhile?  Will it ignore everything except
+	 zero bytes?  Suppose every byte of LONGWORD has a bit set
+	 somewhere.  There will be a carry into bit 8.  If bit 8
+	 is set, this will carry into bit 16.  If bit 8 is clear,
+	 one of bits 9-15 must be set, so there will be a carry
+	 into bit 16.  Similarly, there will be a carry into bit
+	 24.  If one of bits 24-30 is set, there will be a carry
+	 into bit 31, so all of the hole bits will be changed.
+
+	 The one misfire occurs when bits 24-30 are clear and bit
+	 31 is set; in this case, the hole at bit 31 is not
+	 changed.  If we had access to the processor carry flag,
+	 we could close this loophole by putting the fourth hole
+	 at bit 32!
+
+	 So it ignores everything except 128's, when they're aligned
+	 properly.
+
+	 3) But wait!  Aren't we looking for C, not zero?
+	 Good point.  So what we do is XOR LONGWORD with a longword,
+	 each of whose bytes is C.  This turns each byte that is C
+	 into a zero.  */
+
+      longword = *longword_ptr++ ^ charmask;
+
+      /* Add MAGIC_BITS to LONGWORD.  */
+      if ((((longword + magic_bits)
+
+	    /* Set those bits that were unchanged by the addition.  */
+	    ^ ~longword)
+
+	   /* Look at only the hole bits.  If any of the hole bits
+	      are unchanged, most likely one of the bytes was a
+	      zero.  */
+	   & ~magic_bits) != 0)
+	{
+	  /* Which of the bytes was C?  If none of them were, it was
+	     a misfire; continue the search.  */
+
+	  const unsigned char *cp = (const unsigned char *) (longword_ptr - 1);
+
+	  if (cp[0] == c)
+	    return (void *) cp;
+	  if (cp[1] == c)
+	    return (void *) &cp[1];
+	  if (cp[2] == c)
+	    return (void *) &cp[2];
+	  if (cp[3] == c)
+	    return (void *) &cp[3];
+	  if (4 < sizeof longword && cp[4] == c)
+	    return (void *) &cp[4];
+	  if (5 < sizeof longword && cp[5] == c)
+	    return (void *) &cp[5];
+	  if (6 < sizeof longword && cp[6] == c)
+	    return (void *) &cp[6];
+	  if (7 < sizeof longword && cp[7] == c)
+	    return (void *) &cp[7];
+	  if (8 < sizeof longword)
+	    for (i = 8; i < sizeof longword; i++)
+	      if (cp[i] == c)
+		return (void *) &cp[i];
+	}
+
+      n -= sizeof longword;
+    }
+
+  char_ptr = (const unsigned char *) longword_ptr;
+
+  while (n-- > 0)
+    {
+      if (*char_ptr == c)
+	return (void *) char_ptr;
+      else
+	++char_ptr;
+    }
+
+  return 0;
+}
+#ifdef weak_alias
+weak_alias (__memchr, BP_SYM (memchr))
+#endif
diff --git a/Build/source/utils/texinfo/gnulib/lib/memcpy.c b/Build/source/utils/texinfo/gnulib/lib/memcpy.c
new file mode 100644
index 00000000000..1da71dd01dd
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/memcpy.c
@@ -0,0 +1,35 @@
+/* Copyright (C) 1995, 1997, 2000, 2003, 2006 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Jim Meyering <meyering@na-net.ornl.gov>.  */
+
+#include <config.h>
+
+#include <stddef.h>
+
+/* Copy LEN bytes starting at SRCADDR to DESTADDR.  Result undefined
+   if the source overlaps with the destination.
+   Return DESTADDR. */
+
+void *
+memcpy (void *destaddr, void const *srcaddr, size_t len)
+{
+  char *dest = destaddr;
+  char const *src = srcaddr;
+
+  while (len-- > 0)
+    *dest++ = *src++;
+  return destaddr;
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/memmove.c b/Build/source/utils/texinfo/gnulib/lib/memmove.c
new file mode 100644
index 00000000000..c5ff8b520df
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/memmove.c
@@ -0,0 +1,26 @@
+/* memmove.c -- copy memory.
+   Copy LENGTH bytes from SOURCE to DEST.  Does not null-terminate.
+   In the public domain.
+   By David MacKenzie <djm@gnu.ai.mit.edu>.  */
+
+#include <config.h>
+
+#include <stddef.h>
+
+void *
+memmove (void *dest0, void const *source0, size_t length)
+{
+  char *dest = dest0;
+  char const *source = source0;
+  if (source < dest)
+    /* Moving from low mem to hi mem; start at end.  */
+    for (source += length, dest += length; length; --length)
+      *--dest = *--source;
+  else if (source != dest)
+    {
+      /* Moving from hi mem to low mem; start at beginning.  */
+      for (; length; --length)
+	*dest++ = *source++;
+    }
+  return dest0;
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/mkstemp.c b/Build/source/utils/texinfo/gnulib/lib/mkstemp.c
new file mode 100644
index 00000000000..1b052f9b7f9
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/mkstemp.c
@@ -0,0 +1,44 @@
+/* Copyright (C) 1998, 1999, 2001, 2005, 2006, 2007 Free Software Foundation, Inc.
+   This file is derived from the one in the GNU C Library.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#if !_LIBC
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+
+#if !_LIBC
+# include "tempname.h"
+# define __gen_tempname gen_tempname
+# define __GT_FILE GT_FILE
+#endif
+
+#include <stdio.h>
+
+#ifndef __GT_FILE
+# define __GT_FILE 0
+#endif
+
+/* Generate a unique temporary file name from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the file name unique.
+   Then open the file and return a fd. */
+int
+mkstemp (template)
+     char *template;
+{
+  return __gen_tempname (template, __GT_FILE);
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/ref-add.sin b/Build/source/utils/texinfo/gnulib/lib/ref-add.sin
new file mode 100644
index 00000000000..222d7529516
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/ref-add.sin
@@ -0,0 +1,30 @@
+# Add this package to a list of references stored in a text file.
+#
+#   Copyright (C) 2000 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+  s/# Packages using this file://
+  ta
+  :a
+  s/ @PACKAGE@ / @PACKAGE@ /
+  tb
+  s/ $/ @PACKAGE@ /
+  :b
+  s/^/# Packages using this file:/
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/ref-del.sin b/Build/source/utils/texinfo/gnulib/lib/ref-del.sin
new file mode 100644
index 00000000000..1bf073e15ed
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/ref-del.sin
@@ -0,0 +1,25 @@
+# Remove this package from a list of references stored in a text file.
+#
+#   Copyright (C) 2000 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+  s/# Packages using this file://
+  s/ @PACKAGE@ / /
+  s/^/# Packages using this file:/
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/setenv.c b/Build/source/utils/texinfo/gnulib/lib/setenv.c
new file mode 100644
index 00000000000..83b52b88b98
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/setenv.c
@@ -0,0 +1,330 @@
+/* Copyright (C) 1992,1995-1999,2000-2003,2005-2008 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#if !_LIBC
+# include <config.h>
+#endif
+#include <alloca.h>
+
+/* Specification.  */
+#include <stdlib.h>
+
+#include <errno.h>
+#ifndef __set_errno
+# define __set_errno(ev) ((errno) = (ev))
+#endif
+
+#include <string.h>
+#if _LIBC || HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#if _LIBC || !HAVE_SETENV
+
+#if !_LIBC
+# include "malloca.h"
+#endif
+
+#if !_LIBC
+# define __environ	environ
+#endif
+
+#if _LIBC
+/* This lock protects against simultaneous modifications of `environ'.  */
+# include <bits/libc-lock.h>
+__libc_lock_define_initialized (static, envlock)
+# define LOCK	__libc_lock_lock (envlock)
+# define UNLOCK	__libc_lock_unlock (envlock)
+#else
+# define LOCK
+# define UNLOCK
+#endif
+
+/* In the GNU C library we must keep the namespace clean.  */
+#ifdef _LIBC
+# define setenv __setenv
+# define clearenv __clearenv
+# define tfind __tfind
+# define tsearch __tsearch
+#endif
+
+/* In the GNU C library implementation we try to be more clever and
+   allow arbitrarily many changes of the environment given that the used
+   values are from a small set.  Outside glibc this will eat up all
+   memory after a while.  */
+#if defined _LIBC || (defined HAVE_SEARCH_H && defined HAVE_TSEARCH \
+		      && defined __GNUC__)
+# define USE_TSEARCH	1
+# include <search.h>
+typedef int (*compar_fn_t) (const void *, const void *);
+
+/* This is a pointer to the root of the search tree with the known
+   values.  */
+static void *known_values;
+
+# define KNOWN_VALUE(Str) \
+  ({									      \
+    void *value = tfind (Str, &known_values, (compar_fn_t) strcmp);	      \
+    value != NULL ? *(char **) value : NULL;				      \
+  })
+# define STORE_VALUE(Str) \
+  tsearch (Str, &known_values, (compar_fn_t) strcmp)
+
+#else
+# undef USE_TSEARCH
+
+# define KNOWN_VALUE(Str) NULL
+# define STORE_VALUE(Str) do { } while (0)
+
+#endif
+
+
+/* If this variable is not a null pointer we allocated the current
+   environment.  */
+static char **last_environ;
+
+
+/* This function is used by `setenv' and `putenv'.  The difference between
+   the two functions is that for the former must create a new string which
+   is then placed in the environment, while the argument of `putenv'
+   must be used directly.  This is all complicated by the fact that we try
+   to reuse values once generated for a `setenv' call since we can never
+   free the strings.  */
+int
+__add_to_environ (const char *name, const char *value, const char *combined,
+		  int replace)
+{
+  register char **ep;
+  register size_t size;
+  const size_t namelen = strlen (name);
+  const size_t vallen = value != NULL ? strlen (value) + 1 : 0;
+
+  LOCK;
+
+  /* We have to get the pointer now that we have the lock and not earlier
+     since another thread might have created a new environment.  */
+  ep = __environ;
+
+  size = 0;
+  if (ep != NULL)
+    {
+      for (; *ep != NULL; ++ep)
+	if (!strncmp (*ep, name, namelen) && (*ep)[namelen] == '=')
+	  break;
+	else
+	  ++size;
+    }
+
+  if (ep == NULL || *ep == NULL)
+    {
+      char **new_environ;
+#ifdef USE_TSEARCH
+      char *new_value;
+#endif
+
+      /* We allocated this space; we can extend it.  */
+      new_environ =
+	(char **) (last_environ == NULL
+		   ? malloc ((size + 2) * sizeof (char *))
+		   : realloc (last_environ, (size + 2) * sizeof (char *)));
+      if (new_environ == NULL)
+	{
+	  UNLOCK;
+	  return -1;
+	}
+
+      /* If the whole entry is given add it.  */
+      if (combined != NULL)
+	/* We must not add the string to the search tree since it belongs
+	   to the user.  */
+	new_environ[size] = (char *) combined;
+      else
+	{
+	  /* See whether the value is already known.  */
+#ifdef USE_TSEARCH
+# ifdef _LIBC
+	  new_value = (char *) alloca (namelen + 1 + vallen);
+	  __mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1),
+		     value, vallen);
+# else
+	  new_value = (char *) malloca (namelen + 1 + vallen);
+	  if (new_value == NULL)
+	    {
+	      __set_errno (ENOMEM);
+	      UNLOCK;
+	      return -1;
+	    }
+	  memcpy (new_value, name, namelen);
+	  new_value[namelen] = '=';
+	  memcpy (&new_value[namelen + 1], value, vallen);
+# endif
+
+	  new_environ[size] = KNOWN_VALUE (new_value);
+	  if (new_environ[size] == NULL)
+#endif
+	    {
+	      new_environ[size] = (char *) malloc (namelen + 1 + vallen);
+	      if (new_environ[size] == NULL)
+		{
+#if defined USE_TSEARCH && !defined _LIBC
+		  freea (new_value);
+#endif
+		  __set_errno (ENOMEM);
+		  UNLOCK;
+		  return -1;
+		}
+
+#ifdef USE_TSEARCH
+	      memcpy (new_environ[size], new_value, namelen + 1 + vallen);
+#else
+	      memcpy (new_environ[size], name, namelen);
+	      new_environ[size][namelen] = '=';
+	      memcpy (&new_environ[size][namelen + 1], value, vallen);
+#endif
+	      /* And save the value now.  We cannot do this when we remove
+		 the string since then we cannot decide whether it is a
+		 user string or not.  */
+	      STORE_VALUE (new_environ[size]);
+	    }
+#if defined USE_TSEARCH && !defined _LIBC
+	  freea (new_value);
+#endif
+	}
+
+      if (__environ != last_environ)
+	memcpy ((char *) new_environ, (char *) __environ,
+		size * sizeof (char *));
+
+      new_environ[size + 1] = NULL;
+
+      last_environ = __environ = new_environ;
+    }
+  else if (replace)
+    {
+      char *np;
+
+      /* Use the user string if given.  */
+      if (combined != NULL)
+	np = (char *) combined;
+      else
+	{
+#ifdef USE_TSEARCH
+	  char *new_value;
+# ifdef _LIBC
+	  new_value = alloca (namelen + 1 + vallen);
+	  __mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1),
+		     value, vallen);
+# else
+	  new_value = malloca (namelen + 1 + vallen);
+	  if (new_value == NULL)
+	    {
+	      __set_errno (ENOMEM);
+	      UNLOCK;
+	      return -1;
+	    }
+	  memcpy (new_value, name, namelen);
+	  new_value[namelen] = '=';
+	  memcpy (&new_value[namelen + 1], value, vallen);
+# endif
+
+	  np = KNOWN_VALUE (new_value);
+	  if (np == NULL)
+#endif
+	    {
+	      np = malloc (namelen + 1 + vallen);
+	      if (np == NULL)
+		{
+#if defined USE_TSEARCH && !defined _LIBC
+		  freea (new_value);
+#endif
+		  __set_errno (ENOMEM);
+		  UNLOCK;
+		  return -1;
+		}
+
+#ifdef USE_TSEARCH
+	      memcpy (np, new_value, namelen + 1 + vallen);
+#else
+	      memcpy (np, name, namelen);
+	      np[namelen] = '=';
+	      memcpy (&np[namelen + 1], value, vallen);
+#endif
+	      /* And remember the value.  */
+	      STORE_VALUE (np);
+	    }
+#if defined USE_TSEARCH && !defined _LIBC
+	  freea (new_value);
+#endif
+	}
+
+      *ep = np;
+    }
+
+  UNLOCK;
+
+  return 0;
+}
+
+int
+setenv (const char *name, const char *value, int replace)
+{
+  return __add_to_environ (name, value, NULL, replace);
+}
+
+/* The `clearenv' was planned to be added to POSIX.1 but probably
+   never made it.  Nevertheless the POSIX.9 standard (POSIX bindings
+   for Fortran 77) requires this function.  */
+int
+clearenv (void)
+{
+  LOCK;
+
+  if (__environ == last_environ && __environ != NULL)
+    {
+      /* We allocated this environment so we can free it.  */
+      free (__environ);
+      last_environ = NULL;
+    }
+
+  /* Clear the environment pointer removes the whole environment.  */
+  __environ = NULL;
+
+  UNLOCK;
+
+  return 0;
+}
+
+#ifdef _LIBC
+static void
+free_mem (void)
+{
+  /* Remove all traces.  */
+  clearenv ();
+
+  /* Now remove the search tree.  */
+  __tdestroy (known_values, free);
+  known_values = NULL;
+}
+text_set_element (__libc_subfreeres, free_mem);
+
+
+# undef setenv
+# undef clearenv
+weak_alias (__setenv, setenv)
+weak_alias (__clearenv, clearenv)
+#endif
+
+#endif /* _LIBC || !HAVE_SETENV */
diff --git a/Build/source/utils/texinfo/gnulib/lib/stdbool.in.h b/Build/source/utils/texinfo/gnulib/lib/stdbool.in.h
new file mode 100644
index 00000000000..171d70ab13a
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/stdbool.in.h
@@ -0,0 +1,119 @@
+/* Copyright (C) 2001, 2002, 2003, 2006, 2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _GL_STDBOOL_H
+#define _GL_STDBOOL_H
+
+/* ISO C 99 <stdbool.h> for platforms that lack it.  */
+
+/* Usage suggestions:
+
+   Programs that use <stdbool.h> should be aware of some limitations
+   and standards compliance issues.
+
+   Standards compliance:
+
+       - <stdbool.h> must be #included before 'bool', 'false', 'true'
+         can be used.
+
+       - You cannot assume that sizeof (bool) == 1.
+
+       - Programs should not undefine the macros bool, true, and false,
+         as C99 lists that as an "obsolescent feature".
+
+   Limitations of this substitute, when used in a C89 environment:
+
+       - <stdbool.h> must be #included before the '_Bool' type can be used.
+
+       - You cannot assume that _Bool is a typedef; it might be a macro.
+
+       - Bit-fields of type 'bool' are not supported.  Portable code
+         should use 'unsigned int foo : 1;' rather than 'bool foo : 1;'.
+
+       - In C99, casts and automatic conversions to '_Bool' or 'bool' are
+         performed in such a way that every nonzero value gets converted
+         to 'true', and zero gets converted to 'false'.  This doesn't work
+         with this substitute.  With this substitute, only the values 0 and 1
+         give the expected result when converted to _Bool' or 'bool'.
+
+   Also, it is suggested that programs use 'bool' rather than '_Bool';
+   this isn't required, but 'bool' is more common.  */
+
+
+/* 7.16. Boolean type and values */
+
+/* BeOS <sys/socket.h> already #defines false 0, true 1.  We use the same
+   definitions below, but temporarily we have to #undef them.  */
+#ifdef __BEOS__
+# include <OS.h> /* defines bool but not _Bool */
+# undef false
+# undef true
+#endif
+
+/* For the sake of symbolic names in gdb, we define true and false as
+   enum constants, not only as macros.
+   It is tempting to write
+      typedef enum { false = 0, true = 1 } _Bool;
+   so that gdb prints values of type 'bool' symbolically. But if we do
+   this, values of type '_Bool' may promote to 'int' or 'unsigned int'
+   (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+   (see ISO C 99 6.3.1.1.(2)).  So we add a negative value to the
+   enum; this ensures that '_Bool' promotes to 'int'.  */
+#if defined __cplusplus || defined __BEOS__
+  /* A compiler known to have 'bool'.  */
+  /* If the compiler already has both 'bool' and '_Bool', we can assume they
+     are the same types.  */
+# if !@HAVE__BOOL@
+typedef bool _Bool;
+# endif
+#else
+# if !defined __GNUC__
+   /* If @HAVE__BOOL@:
+        Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
+        the built-in _Bool type is used.  See
+          http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+          http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+          http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+        Similar bugs are likely with other compilers as well; this file
+        wouldn't be used if <stdbool.h> was working.
+        So we override the _Bool type.
+      If !@HAVE__BOOL@:
+        Need to define _Bool ourselves. As 'signed char' or as an enum type?
+        Use of a typedef, with SunPRO C, leads to a stupid
+          "warning: _Bool is a keyword in ISO C99".
+        Use of an enum type, with IRIX cc, leads to a stupid
+          "warning(1185): enumerated type mixed with another type".
+        Even the existence of an enum type, without a typedef,
+          "Invalid enumerator. (badenum)" with HP-UX cc on Tru64.
+        The only benefit of the enum, debuggability, is not important
+        with these compilers.  So use 'signed char' and no enum.  */
+#  define _Bool signed char
+# else
+   /* With this compiler, trust the _Bool type if the compiler has it.  */
+#  if !@HAVE__BOOL@
+typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
+#  endif
+# endif
+#endif
+#define bool _Bool
+
+/* The other macros must be usable in preprocessor directives.  */
+#define false 0
+#define true 1
+#define __bool_true_false_are_defined 1
+
+#endif /* _GL_STDBOOL_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/stdint.in.h b/Build/source/utils/texinfo/gnulib/lib/stdint.in.h
new file mode 100644
index 00000000000..67baceb6793
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/stdint.in.h
@@ -0,0 +1,522 @@
+/* Copyright (C) 2001-2002, 2004-2007 Free Software Foundation, Inc.
+   Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
+   This file is part of gnulib.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/*
+ * ISO C 99 <stdint.h> for platforms that lack it.
+ * <http://www.opengroup.org/susv3xbd/stdint.h.html>
+ */
+
+#ifndef _GL_STDINT_H
+
+/* When including a system file that in turn includes <inttypes.h>,
+   use the system <inttypes.h>, not our substitute.  This avoids
+   problems with (for example) VMS, whose <sys/bitypes.h> includes
+   <inttypes.h>.  */
+#define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
+/* Get those types that are already defined in other system include
+   files, so that we can "#define int8_t signed char" below without
+   worrying about a later system include file containing a "typedef
+   signed char int8_t;" that will get messed up by our macro.  Our
+   macros should all be consistent with the system versions, except
+   for the "fast" types and macros, which we recommend against using
+   in public interfaces due to compiler differences.  */
+
+#if @HAVE_STDINT_H@
+# if defined __sgi && ! defined __c99
+   /* Bypass IRIX's <stdint.h> if in C89 mode, since it merely annoys users
+      with "This header file is to be used only for c99 mode compilations"
+      diagnostics.  */
+#  define __STDINT_H__
+# endif
+  /* Other systems may have an incomplete or buggy <stdint.h>.
+     Include it before <inttypes.h>, since any "#include <stdint.h>"
+     in <inttypes.h> would reinclude us, skipping our contents because
+     _GL_STDINT_H is defined.
+     The include_next requires a split double-inclusion guard.  */
+# @INCLUDE_NEXT@ @NEXT_STDINT_H@
+#endif
+
+#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
+#define _GL_STDINT_H
+
+/* <sys/types.h> defines some of the stdint.h types as well, on glibc,
+   IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
+   AIX 5.2 <sys/types.h> isn't needed and causes troubles.
+   MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+   relies on the system <stdint.h> definitions, so include
+   <sys/types.h> after @NEXT_STDINT_H@.  */
+#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
+# include <sys/types.h>
+#endif
+
+/* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
+#include <limits.h>
+
+#if @HAVE_INTTYPES_H@
+  /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines
+     int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
+     <inttypes.h> also defines intptr_t and uintptr_t.  */
+# include <inttypes.h>
+#elif @HAVE_SYS_INTTYPES_H@
+  /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
+     the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX.  */
+# include <sys/inttypes.h>
+#endif
+
+#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__
+  /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
+     int{8,16,32,64}_t and __BIT_TYPES_DEFINED__.  In libc5 >= 5.2.2 it is
+     included by <sys/types.h>.  */
+# include <sys/bitypes.h>
+#endif
+
+#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
+
+/* Get WCHAR_MIN, WCHAR_MAX.  */
+# if ! (defined WCHAR_MIN && defined WCHAR_MAX)
+#  include <wchar.h>
+# endif
+
+#endif
+
+#undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
+/* Minimum and maximum values for a integer type under the usual assumption.
+   Return an unspecified value if BITS == 0, adding a check to pacify
+   picky compilers.  */
+
+#define _STDINT_MIN(signed, bits, zero) \
+  ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
+
+#define _STDINT_MAX(signed, bits, zero) \
+  ((signed) \
+   ? ~ _STDINT_MIN (signed, bits, zero) \
+   : /* The expression for the unsigned case.  The subtraction of (signed) \
+	is a nop in the unsigned case and avoids "signed integer overflow" \
+	warnings in the signed case.  */ \
+     ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
+
+/* 7.18.1.1. Exact-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits.  */
+
+#undef int8_t
+#undef uint8_t
+#define int8_t signed char
+#define uint8_t unsigned char
+
+#undef int16_t
+#undef uint16_t
+#define int16_t short int
+#define uint16_t unsigned short int
+
+#undef int32_t
+#undef uint32_t
+#define int32_t int
+#define uint32_t unsigned int
+
+/* Do not undefine int64_t if gnulib is not being used with 64-bit
+   types, since otherwise it breaks platforms like Tandem/NSK.  */
+#if LONG_MAX >> 31 >> 31 == 1
+# undef int64_t
+# define int64_t long int
+# define GL_INT64_T
+#elif defined _MSC_VER
+# undef int64_t
+# define int64_t __int64
+# define GL_INT64_T
+#elif @HAVE_LONG_LONG_INT@
+# undef int64_t
+# define int64_t long long int
+# define GL_INT64_T
+#endif
+
+#if ULONG_MAX >> 31 >> 31 >> 1 == 1
+# undef uint64_t
+# define uint64_t unsigned long int
+# define GL_UINT64_T
+#elif defined _MSC_VER
+# undef uint64_t
+# define uint64_t unsigned __int64
+# define GL_UINT64_T
+#elif @HAVE_UNSIGNED_LONG_LONG_INT@
+# undef uint64_t
+# define uint64_t unsigned long long int
+# define GL_UINT64_T
+#endif
+
+/* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
+#define _UINT8_T
+#define _UINT32_T
+#define _UINT64_T
+
+
+/* 7.18.1.2. Minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
+   are the same as the corresponding N_t types.  */
+
+#undef int_least8_t
+#undef uint_least8_t
+#undef int_least16_t
+#undef uint_least16_t
+#undef int_least32_t
+#undef uint_least32_t
+#undef int_least64_t
+#undef uint_least64_t
+#define int_least8_t int8_t
+#define uint_least8_t uint8_t
+#define int_least16_t int16_t
+#define uint_least16_t uint16_t
+#define int_least32_t int32_t
+#define uint_least32_t uint32_t
+#ifdef GL_INT64_T
+# define int_least64_t int64_t
+#endif
+#ifdef GL_UINT64_T
+# define uint_least64_t uint64_t
+#endif
+
+/* 7.18.1.3. Fastest minimum-width integer types */
+
+/* Note: Other <stdint.h> substitutes may define these types differently.
+   It is not recommended to use these types in public header files. */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
+   are taken from the same list of types.  Assume that 'long int'
+   is fast enough for all narrower integers.  */
+
+#undef int_fast8_t
+#undef uint_fast8_t
+#undef int_fast16_t
+#undef uint_fast16_t
+#undef int_fast32_t
+#undef uint_fast32_t
+#undef int_fast64_t
+#undef uint_fast64_t
+#define int_fast8_t long int
+#define uint_fast8_t unsigned int_fast8_t
+#define int_fast16_t long int
+#define uint_fast16_t unsigned int_fast16_t
+#define int_fast32_t long int
+#define uint_fast32_t unsigned int_fast32_t
+#ifdef GL_INT64_T
+# define int_fast64_t int64_t
+#endif
+#ifdef GL_UINT64_T
+# define uint_fast64_t uint64_t
+#endif
+
+/* 7.18.1.4. Integer types capable of holding object pointers */
+
+#undef intptr_t
+#undef uintptr_t
+#define intptr_t long int
+#define uintptr_t unsigned long int
+
+/* 7.18.1.5. Greatest-width integer types */
+
+/* Note: These types are compiler dependent. It may be unwise to use them in
+   public header files. */
+
+#undef intmax_t
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+# define intmax_t long long int
+#elif defined GL_INT64_T
+# define intmax_t int64_t
+#else
+# define intmax_t long int
+#endif
+
+#undef uintmax_t
+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+# define uintmax_t unsigned long long int
+#elif defined GL_UINT64_T
+# define uintmax_t uint64_t
+#else
+# define uintmax_t unsigned long int
+#endif
+
+/* Verify that intmax_t and uintmax_t have the same size.  Too much code
+   breaks if this is not the case.  If this check fails, the reason is likely
+   to be found in the autoconf macros.  */
+typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - 1];
+
+/* 7.18.2. Limits of specified-width integer types */
+
+#if ! defined __cplusplus || defined __STDC_LIMIT_MACROS
+
+/* 7.18.2.1. Limits of exact-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits.  */
+
+#undef INT8_MIN
+#undef INT8_MAX
+#undef UINT8_MAX
+#define INT8_MIN  (~ INT8_MAX)
+#define INT8_MAX  127
+#define UINT8_MAX  255
+
+#undef INT16_MIN
+#undef INT16_MAX
+#undef UINT16_MAX
+#define INT16_MIN  (~ INT16_MAX)
+#define INT16_MAX  32767
+#define UINT16_MAX  65535
+
+#undef INT32_MIN
+#undef INT32_MAX
+#undef UINT32_MAX
+#define INT32_MIN  (~ INT32_MAX)
+#define INT32_MAX  2147483647
+#define UINT32_MAX  4294967295U
+
+#undef INT64_MIN
+#undef INT64_MAX
+#ifdef GL_INT64_T
+/* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
+   evaluates the latter incorrectly in preprocessor expressions.  */
+# define INT64_MIN  (- INTMAX_C (1) << 63)
+# define INT64_MAX  INTMAX_C (9223372036854775807)
+#endif
+
+#undef UINT64_MAX
+#ifdef GL_UINT64_T
+# define UINT64_MAX  UINTMAX_C (18446744073709551615)
+#endif
+
+/* 7.18.2.2. Limits of minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
+   are the same as the corresponding N_t types.  */
+
+#undef INT_LEAST8_MIN
+#undef INT_LEAST8_MAX
+#undef UINT_LEAST8_MAX
+#define INT_LEAST8_MIN  INT8_MIN
+#define INT_LEAST8_MAX  INT8_MAX
+#define UINT_LEAST8_MAX  UINT8_MAX
+
+#undef INT_LEAST16_MIN
+#undef INT_LEAST16_MAX
+#undef UINT_LEAST16_MAX
+#define INT_LEAST16_MIN  INT16_MIN
+#define INT_LEAST16_MAX  INT16_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+
+#undef INT_LEAST32_MIN
+#undef INT_LEAST32_MAX
+#undef UINT_LEAST32_MAX
+#define INT_LEAST32_MIN  INT32_MIN
+#define INT_LEAST32_MAX  INT32_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+
+#undef INT_LEAST64_MIN
+#undef INT_LEAST64_MAX
+#ifdef GL_INT64_T
+# define INT_LEAST64_MIN  INT64_MIN
+# define INT_LEAST64_MAX  INT64_MAX
+#endif
+
+#undef UINT_LEAST64_MAX
+#ifdef GL_UINT64_T
+# define UINT_LEAST64_MAX  UINT64_MAX
+#endif
+
+/* 7.18.2.3. Limits of fastest minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
+   are taken from the same list of types.  */
+
+#undef INT_FAST8_MIN
+#undef INT_FAST8_MAX
+#undef UINT_FAST8_MAX
+#define INT_FAST8_MIN  LONG_MIN
+#define INT_FAST8_MAX  LONG_MAX
+#define UINT_FAST8_MAX  ULONG_MAX
+
+#undef INT_FAST16_MIN
+#undef INT_FAST16_MAX
+#undef UINT_FAST16_MAX
+#define INT_FAST16_MIN  LONG_MIN
+#define INT_FAST16_MAX  LONG_MAX
+#define UINT_FAST16_MAX  ULONG_MAX
+
+#undef INT_FAST32_MIN
+#undef INT_FAST32_MAX
+#undef UINT_FAST32_MAX
+#define INT_FAST32_MIN  LONG_MIN
+#define INT_FAST32_MAX  LONG_MAX
+#define UINT_FAST32_MAX  ULONG_MAX
+
+#undef INT_FAST64_MIN
+#undef INT_FAST64_MAX
+#ifdef GL_INT64_T
+# define INT_FAST64_MIN  INT64_MIN
+# define INT_FAST64_MAX  INT64_MAX
+#endif
+
+#undef UINT_FAST64_MAX
+#ifdef GL_UINT64_T
+# define UINT_FAST64_MAX  UINT64_MAX
+#endif
+
+/* 7.18.2.4. Limits of integer types capable of holding object pointers */
+
+#undef INTPTR_MIN
+#undef INTPTR_MAX
+#undef UINTPTR_MAX
+#define INTPTR_MIN  LONG_MIN
+#define INTPTR_MAX  LONG_MAX
+#define UINTPTR_MAX  ULONG_MAX
+
+/* 7.18.2.5. Limits of greatest-width integer types */
+
+#undef INTMAX_MIN
+#undef INTMAX_MAX
+#ifdef INT64_MAX
+# define INTMAX_MIN  INT64_MIN
+# define INTMAX_MAX  INT64_MAX
+#else
+# define INTMAX_MIN  INT32_MIN
+# define INTMAX_MAX  INT32_MAX
+#endif
+
+#undef UINTMAX_MAX
+#ifdef UINT64_MAX
+# define UINTMAX_MAX  UINT64_MAX
+#else
+# define UINTMAX_MAX  UINT32_MAX
+#endif
+
+/* 7.18.3. Limits of other integer types */
+
+/* ptrdiff_t limits */
+#undef PTRDIFF_MIN
+#undef PTRDIFF_MAX
+#define PTRDIFF_MIN  \
+   _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
+#define PTRDIFF_MAX  \
+   _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
+
+/* sig_atomic_t limits */
+#undef SIG_ATOMIC_MIN
+#undef SIG_ATOMIC_MAX
+#define SIG_ATOMIC_MIN  \
+   _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
+		0@SIG_ATOMIC_T_SUFFIX@)
+#define SIG_ATOMIC_MAX  \
+   _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
+		0@SIG_ATOMIC_T_SUFFIX@)
+
+
+/* size_t limit */
+#undef SIZE_MAX
+#define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
+
+/* wchar_t limits */
+#undef WCHAR_MIN
+#undef WCHAR_MAX
+#define WCHAR_MIN  \
+   _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
+#define WCHAR_MAX  \
+   _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
+
+/* wint_t limits */
+#undef WINT_MIN
+#undef WINT_MAX
+#define WINT_MIN  \
+   _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
+#define WINT_MAX  \
+   _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
+
+#endif /* !defined __cplusplus || defined __STDC_LIMIT_MACROS */
+
+/* 7.18.4. Macros for integer constants */
+
+#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
+
+/* 7.18.4.1. Macros for minimum-width integer constants */
+/* According to ISO C 99 Technical Corrigendum 1 */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits, and int is 32 bits.  */
+
+#undef INT8_C
+#undef UINT8_C
+#define INT8_C(x) x
+#define UINT8_C(x) x
+
+#undef INT16_C
+#undef UINT16_C
+#define INT16_C(x) x
+#define UINT16_C(x) x
+
+#undef INT32_C
+#undef UINT32_C
+#define INT32_C(x) x
+#define UINT32_C(x) x ## U
+
+#undef INT64_C
+#undef UINT64_C
+#if LONG_MAX >> 31 >> 31 == 1
+# define INT64_C(x) x##L
+#elif defined _MSC_VER
+# define INT64_C(x) x##i64
+#elif @HAVE_LONG_LONG_INT@
+# define INT64_C(x) x##LL
+#endif
+#if ULONG_MAX >> 31 >> 31 >> 1 == 1
+# define UINT64_C(x) x##UL
+#elif defined _MSC_VER
+# define UINT64_C(x) x##ui64
+#elif @HAVE_UNSIGNED_LONG_LONG_INT@
+# define UINT64_C(x) x##ULL
+#endif
+
+/* 7.18.4.2. Macros for greatest-width integer constants */
+
+#undef INTMAX_C
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+# define INTMAX_C(x)   x##LL
+#elif defined GL_INT64_T
+# define INTMAX_C(x)   INT64_C(x)
+#else
+# define INTMAX_C(x)   x##L
+#endif
+
+#undef UINTMAX_C
+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+# define UINTMAX_C(x)  x##ULL
+#elif defined GL_UINT64_T
+# define UINTMAX_C(x)  UINT64_C(x)
+#else
+# define UINTMAX_C(x)  x##UL
+#endif
+
+#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
+
+#endif /* _GL_STDINT_H */
+#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/stdlib.in.h b/Build/source/utils/texinfo/gnulib/lib/stdlib.in.h
new file mode 100644
index 00000000000..0181dd23762
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/stdlib.in.h
@@ -0,0 +1,225 @@
+/* A GNU-like <stdlib.h>.
+
+   Copyright (C) 1995, 2001-2004, 2006-2008 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#if defined __need_malloc_and_calloc
+/* Special invocation convention inside glibc header files.  */
+
+#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _GL_STDLIB_H
+
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
+
+#ifndef _GL_STDLIB_H
+#define _GL_STDLIB_H
+
+
+/* The definition of GL_LINK_WARNING is copied here.  */
+
+
+/* Some systems do not define EXIT_*, despite otherwise supporting C89.  */
+#ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
+#endif
+/* Tandem/NSK and other platforms that define EXIT_FAILURE as -1 interfere
+   with proper operation of xargs.  */
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#elif EXIT_FAILURE != 1
+# undef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#if @GNULIB_MALLOC_POSIX@
+# if !@HAVE_MALLOC_POSIX@
+#  undef malloc
+#  define malloc rpl_malloc
+extern void * malloc (size_t size);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef malloc
+# define malloc(s) \
+    (GL_LINK_WARNING ("malloc is not POSIX compliant everywhere - " \
+                      "use gnulib module malloc-posix for portability"), \
+     malloc (s))
+#endif
+
+
+#if @GNULIB_REALLOC_POSIX@
+# if !@HAVE_REALLOC_POSIX@
+#  undef realloc
+#  define realloc rpl_realloc
+extern void * realloc (void *ptr, size_t size);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef realloc
+# define realloc(p,s) \
+    (GL_LINK_WARNING ("realloc is not POSIX compliant everywhere - " \
+                      "use gnulib module realloc-posix for portability"), \
+     realloc (p, s))
+#endif
+
+
+#if @GNULIB_CALLOC_POSIX@
+# if !@HAVE_CALLOC_POSIX@
+#  undef calloc
+#  define calloc rpl_calloc
+extern void * calloc (size_t nmemb, size_t size);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef calloc
+# define calloc(n,s) \
+    (GL_LINK_WARNING ("calloc is not POSIX compliant everywhere - " \
+                      "use gnulib module calloc-posix for portability"), \
+     calloc (n, s))
+#endif
+
+
+#if @GNULIB_GETSUBOPT@
+/* Assuming *OPTIONP is a comma separated list of elements of the form
+   "token" or "token=value", getsubopt parses the first of these elements.
+   If the first element refers to a "token" that is member of the given
+   NULL-terminated array of tokens:
+     - It replaces the comma with a NUL byte, updates *OPTIONP to point past
+       the first option and the comma, sets *VALUEP to the value of the
+       element (or NULL if it doesn't contain an "=" sign),
+     - It returns the index of the "token" in the given array of tokens.
+   Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined.
+   For more details see the POSIX:2001 specification.
+   http://www.opengroup.org/susv3xsh/getsubopt.html */
+# if !@HAVE_GETSUBOPT@
+extern int getsubopt (char **optionp, char *const *tokens, char **valuep);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getsubopt
+# define getsubopt(o,t,v) \
+    (GL_LINK_WARNING ("getsubopt is unportable - " \
+                      "use gnulib module getsubopt for portability"), \
+     getsubopt (o, t, v))
+#endif
+
+
+#if @GNULIB_MKDTEMP@
+# if !@HAVE_MKDTEMP@
+/* Create a unique temporary directory from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the directory name unique.
+   Returns TEMPLATE, or a null pointer if it cannot get a unique name.
+   The directory is created mode 700.  */
+extern char * mkdtemp (char * /*template*/);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mkdtemp
+# define mkdtemp(t) \
+    (GL_LINK_WARNING ("mkdtemp is unportable - " \
+                      "use gnulib module mkdtemp for portability"), \
+     mkdtemp (t))
+#endif
+
+
+#if @GNULIB_MKSTEMP@
+# if @REPLACE_MKSTEMP@
+/* Create a unique temporary file from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the file name unique.
+   The file is then created, ensuring it didn't exist before.
+   The file is created read-write (mask at least 0600 & ~umask), but it may be
+   world-readable and world-writable (mask 0666 & ~umask), depending on the
+   implementation.
+   Returns the open file descriptor if successful, otherwise -1 and errno
+   set.  */
+#  define mkstemp rpl_mkstemp
+extern int mkstemp (char * /*template*/);
+# else
+/* On MacOS X 10.3, only <unistd.h> declares mkstemp.  */
+#  include <unistd.h>
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mkstemp
+# define mkstemp(t) \
+    (GL_LINK_WARNING ("mkstemp is unportable - " \
+                      "use gnulib module mkstemp for portability"), \
+     mkstemp (t))
+#endif
+
+
+#if @GNULIB_PUTENV@
+# if @REPLACE_PUTENV@
+#  undef putenv
+#  define putenv rpl_putenv
+extern int putenv (char *string);
+# endif
+#endif
+
+
+#if @GNULIB_SETENV@
+# if !@HAVE_SETENV@
+/* Set NAME to VALUE in the environment.
+   If REPLACE is nonzero, overwrite an existing value.  */
+extern int setenv (const char *name, const char *value, int replace);
+# endif
+#endif
+
+
+#if @GNULIB_UNSETENV@
+# if @HAVE_UNSETENV@
+#  if @VOID_UNSETENV@
+/* On some systems, unsetenv() returns void.
+   This is the case for MacOS X 10.3, FreeBSD 4.8, NetBSD 1.6, OpenBSD 3.4.  */
+#   define unsetenv(name) ((unsetenv)(name), 0)
+#  endif
+# else
+/* Remove the variable NAME from the environment.  */
+extern int unsetenv (const char *name);
+# endif
+#endif
+
+
+#if @GNULIB_STRTOD@
+# if @REPLACE_STRTOD@
+#  define strtod rpl_strtod
+# endif
+# if !@HAVE_STRTOD@ || @REPLACE_STRTOD@
+ /* Parse a double from STRING, updating ENDP if appropriate.  */
+extern double strtod (const char *str, char **endp);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strtod
+# define strtod(s, e)                           \
+    (GL_LINK_WARNING ("strtod is unportable - " \
+                      "use gnulib module strtod for portability"), \
+     strtod (s, e))
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GL_STDLIB_H */
+#endif /* _GL_STDLIB_H */
+#endif
diff --git a/Build/source/utils/texinfo/gnulib/lib/strdup.c b/Build/source/utils/texinfo/gnulib/lib/strdup.c
new file mode 100644
index 00000000000..bebe5c8fb4f
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/strdup.c
@@ -0,0 +1,55 @@
+/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004, 2006, 2007 Free
+   Software Foundation, Inc.
+
+   This file is part of the GNU C Library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _LIBC
+# include <config.h>
+#endif
+
+/* Get specification.  */
+#include <string.h>
+
+#include <stdlib.h>
+
+#undef __strdup
+#ifdef _LIBC
+# undef strdup
+#endif
+
+#ifndef weak_alias
+# define __strdup strdup
+#endif
+
+/* Duplicate S, returning an identical malloc'd string.  */
+char *
+__strdup (const char *s)
+{
+  size_t len = strlen (s) + 1;
+  void *new = malloc (len);
+
+  if (new == NULL)
+    return NULL;
+
+  return (char *) memcpy (new, s, len);
+}
+#ifdef libc_hidden_def
+libc_hidden_def (__strdup)
+#endif
+#ifdef weak_alias
+weak_alias (__strdup, strdup)
+#endif
diff --git a/Build/source/utils/texinfo/gnulib/lib/streq.h b/Build/source/utils/texinfo/gnulib/lib/streq.h
new file mode 100644
index 00000000000..80df916321f
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/streq.h
@@ -0,0 +1,176 @@
+/* Optimized string comparison.
+   Copyright (C) 2001-2002, 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>.  */
+
+#ifndef _GL_STREQ_H
+#define _GL_STREQ_H
+
+#include <string.h>
+
+/* STREQ allows to optimize string comparison with a small literal string.
+     STREQ (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+   is semantically equivalent to
+     strcmp (s, "EUC-KR") == 0
+   just faster.  */
+
+/* Help GCC to generate good code for string comparisons with
+   immediate strings. */
+#if defined (__GNUC__) && defined (__OPTIMIZE__)
+
+static inline int
+streq9 (const char *s1, const char *s2)
+{
+  return strcmp (s1 + 9, s2 + 9) == 0;
+}
+
+static inline int
+streq8 (const char *s1, const char *s2, char s28)
+{
+  if (s1[8] == s28)
+    {
+      if (s28 == 0)
+        return 1;
+      else
+        return streq9 (s1, s2);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq7 (const char *s1, const char *s2, char s27, char s28)
+{
+  if (s1[7] == s27)
+    {
+      if (s27 == 0)
+        return 1;
+      else
+        return streq8 (s1, s2, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq6 (const char *s1, const char *s2, char s26, char s27, char s28)
+{
+  if (s1[6] == s26)
+    {
+      if (s26 == 0)
+        return 1;
+      else
+        return streq7 (s1, s2, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq5 (const char *s1, const char *s2, char s25, char s26, char s27, char s28)
+{
+  if (s1[5] == s25)
+    {
+      if (s25 == 0)
+        return 1;
+      else
+        return streq6 (s1, s2, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq4 (const char *s1, const char *s2, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[4] == s24)
+    {
+      if (s24 == 0)
+        return 1;
+      else
+        return streq5 (s1, s2, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq3 (const char *s1, const char *s2, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[3] == s23)
+    {
+      if (s23 == 0)
+        return 1;
+      else
+        return streq4 (s1, s2, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq2 (const char *s1, const char *s2, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[2] == s22)
+    {
+      if (s22 == 0)
+        return 1;
+      else
+        return streq3 (s1, s2, s23, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq1 (const char *s1, const char *s2, char s21, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[1] == s21)
+    {
+      if (s21 == 0)
+        return 1;
+      else
+        return streq2 (s1, s2, s22, s23, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq0 (const char *s1, const char *s2, char s20, char s21, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[0] == s20)
+    {
+      if (s20 == 0)
+        return 1;
+      else
+        return streq1 (s1, s2, s21, s22, s23, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+  streq0 (s1, s2, s20, s21, s22, s23, s24, s25, s26, s27, s28)
+
+#else
+
+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+  (strcmp (s1, s2) == 0)
+
+#endif
+
+#endif /* _GL_STREQ_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/strerror.c b/Build/source/utils/texinfo/gnulib/lib/strerror.c
new file mode 100644
index 00000000000..9fe437db78d
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/strerror.c
@@ -0,0 +1,49 @@
+/* strerror.c --- POSIX compatible system error routine
+
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include <string.h>
+
+#if REPLACE_STRERROR
+
+# include <stdio.h>
+
+# include "intprops.h"
+
+# undef strerror
+# if ! HAVE_DECL_STRERROR
+#  define strerror(n) NULL
+# endif
+
+char *
+rpl_strerror (int n)
+{
+  char *result = strerror (n);
+
+  if (result == NULL || result[0] == '\0')
+    {
+      static char const fmt[] = "Unknown error (%d)";
+      static char mesg[sizeof fmt + INT_STRLEN_BOUND (n)];
+      sprintf (mesg, fmt, n);
+      return mesg;
+    }
+
+  return result;
+}
+
+#endif
diff --git a/Build/source/utils/texinfo/gnulib/lib/string.in.h b/Build/source/utils/texinfo/gnulib/lib/string.in.h
new file mode 100644
index 00000000000..5c7597cefb1
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/string.in.h
@@ -0,0 +1,569 @@
+/* A GNU-like <string.h>.
+
+   Copyright (C) 1995-1996, 2001-2008 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _GL_STRING_H
+
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_STRING_H@
+
+#ifndef _GL_STRING_H
+#define _GL_STRING_H
+
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+#  define __attribute__(Spec) /* empty */
+# endif
+/* The attribute __pure__ was added in gcc 2.96.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+#  define __pure__ /* empty */
+# endif
+#endif
+
+
+/* The definition of GL_LINK_WARNING is copied here.  */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Return the first occurrence of NEEDLE in HAYSTACK.  */
+#if @GNULIB_MEMMEM@
+# if @REPLACE_MEMMEM@
+#  define memmem rpl_memmem
+# endif
+# if ! @HAVE_DECL_MEMMEM@ || @REPLACE_MEMMEM@
+extern void *memmem (void const *__haystack, size_t __haystack_len,
+		     void const *__needle, size_t __needle_len)
+  __attribute__ ((__pure__));
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef memmem
+# define memmem(a,al,b,bl) \
+    (GL_LINK_WARNING ("memmem is unportable and often quadratic - " \
+                      "use gnulib module memmem-simple for portability, " \
+                      "and module memmem for speed" ), \
+     memmem (a, al, b, bl))
+#endif
+
+/* Copy N bytes of SRC to DEST, return pointer to bytes after the
+   last written byte.  */
+#if @GNULIB_MEMPCPY@
+# if ! @HAVE_MEMPCPY@
+extern void *mempcpy (void *restrict __dest, void const *restrict __src,
+		      size_t __n);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mempcpy
+# define mempcpy(a,b,n) \
+    (GL_LINK_WARNING ("mempcpy is unportable - " \
+                      "use gnulib module mempcpy for portability"), \
+     mempcpy (a, b, n))
+#endif
+
+/* Search backwards through a block for a byte (specified as an int).  */
+#if @GNULIB_MEMRCHR@
+# if ! @HAVE_DECL_MEMRCHR@
+extern void *memrchr (void const *, int, size_t)
+  __attribute__ ((__pure__));
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef memrchr
+# define memrchr(a,b,c) \
+    (GL_LINK_WARNING ("memrchr is unportable - " \
+                      "use gnulib module memrchr for portability"), \
+     memrchr (a, b, c))
+#endif
+
+/* Copy SRC to DST, returning the address of the terminating '\0' in DST.  */
+#if @GNULIB_STPCPY@
+# if ! @HAVE_STPCPY@
+extern char *stpcpy (char *restrict __dst, char const *restrict __src);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef stpcpy
+# define stpcpy(a,b) \
+    (GL_LINK_WARNING ("stpcpy is unportable - " \
+                      "use gnulib module stpcpy for portability"), \
+     stpcpy (a, b))
+#endif
+
+/* Copy no more than N bytes of SRC to DST, returning a pointer past the
+   last non-NUL byte written into DST.  */
+#if @GNULIB_STPNCPY@
+# if ! @HAVE_STPNCPY@
+#  define stpncpy gnu_stpncpy
+extern char *stpncpy (char *restrict __dst, char const *restrict __src,
+		      size_t __n);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef stpncpy
+# define stpncpy(a,b,n) \
+    (GL_LINK_WARNING ("stpncpy is unportable - " \
+                      "use gnulib module stpncpy for portability"), \
+     stpncpy (a, b, n))
+#endif
+
+#if defined GNULIB_POSIXCHECK
+/* strchr() does not work with multibyte strings if the locale encoding is
+   GB18030 and the character to be searched is a digit.  */
+# undef strchr
+# define strchr(s,c) \
+    (GL_LINK_WARNING ("strchr cannot work correctly on character strings " \
+                      "in some multibyte locales - " \
+                      "use mbschr if you care about internationalization"), \
+     strchr (s, c))
+#endif
+
+/* Find the first occurrence of C in S or the final NUL byte.  */
+#if @GNULIB_STRCHRNUL@
+# if ! @HAVE_STRCHRNUL@
+extern char *strchrnul (char const *__s, int __c_in)
+  __attribute__ ((__pure__));
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strchrnul
+# define strchrnul(a,b) \
+    (GL_LINK_WARNING ("strchrnul is unportable - " \
+                      "use gnulib module strchrnul for portability"), \
+     strchrnul (a, b))
+#endif
+
+/* Duplicate S, returning an identical malloc'd string.  */
+#if @GNULIB_STRDUP@
+# if ! @HAVE_DECL_STRDUP@ && ! defined strdup
+extern char *strdup (char const *__s);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strdup
+# define strdup(a) \
+    (GL_LINK_WARNING ("strdup is unportable - " \
+                      "use gnulib module strdup for portability"), \
+     strdup (a))
+#endif
+
+/* Return a newly allocated copy of at most N bytes of STRING.  */
+#if @GNULIB_STRNDUP@
+# if ! @HAVE_STRNDUP@
+#  undef strndup
+#  define strndup rpl_strndup
+# endif
+# if ! @HAVE_STRNDUP@ || ! @HAVE_DECL_STRNDUP@
+extern char *strndup (char const *__string, size_t __n);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strndup
+# define strndup(a,n) \
+    (GL_LINK_WARNING ("strndup is unportable - " \
+                      "use gnulib module strndup for portability"), \
+     strndup (a, n))
+#endif
+
+/* Find the length (number of bytes) of STRING, but scan at most
+   MAXLEN bytes.  If no '\0' terminator is found in that many bytes,
+   return MAXLEN.  */
+#if @GNULIB_STRNLEN@
+# if ! @HAVE_DECL_STRNLEN@
+extern size_t strnlen (char const *__string, size_t __maxlen)
+  __attribute__ ((__pure__));
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strnlen
+# define strnlen(a,n) \
+    (GL_LINK_WARNING ("strnlen is unportable - " \
+                      "use gnulib module strnlen for portability"), \
+     strnlen (a, n))
+#endif
+
+#if defined GNULIB_POSIXCHECK
+/* strcspn() assumes the second argument is a list of single-byte characters.
+   Even in this simple case, it does not work with multibyte strings if the
+   locale encoding is GB18030 and one of the characters to be searched is a
+   digit.  */
+# undef strcspn
+# define strcspn(s,a) \
+    (GL_LINK_WARNING ("strcspn cannot work correctly on character strings " \
+                      "in multibyte locales - " \
+                      "use mbscspn if you care about internationalization"), \
+     strcspn (s, a))
+#endif
+
+/* Find the first occurrence in S of any character in ACCEPT.  */
+#if @GNULIB_STRPBRK@
+# if ! @HAVE_STRPBRK@
+extern char *strpbrk (char const *__s, char const *__accept)
+  __attribute__ ((__pure__));
+# endif
+# if defined GNULIB_POSIXCHECK
+/* strpbrk() assumes the second argument is a list of single-byte characters.
+   Even in this simple case, it does not work with multibyte strings if the
+   locale encoding is GB18030 and one of the characters to be searched is a
+   digit.  */
+#  undef strpbrk
+#  define strpbrk(s,a) \
+     (GL_LINK_WARNING ("strpbrk cannot work correctly on character strings " \
+                       "in multibyte locales - " \
+                       "use mbspbrk if you care about internationalization"), \
+      strpbrk (s, a))
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strpbrk
+# define strpbrk(s,a) \
+    (GL_LINK_WARNING ("strpbrk is unportable - " \
+                      "use gnulib module strpbrk for portability"), \
+     strpbrk (s, a))
+#endif
+
+#if defined GNULIB_POSIXCHECK
+/* strspn() assumes the second argument is a list of single-byte characters.
+   Even in this simple case, it cannot work with multibyte strings.  */
+# undef strspn
+# define strspn(s,a) \
+    (GL_LINK_WARNING ("strspn cannot work correctly on character strings " \
+                      "in multibyte locales - " \
+                      "use mbsspn if you care about internationalization"), \
+     strspn (s, a))
+#endif
+
+#if defined GNULIB_POSIXCHECK
+/* strrchr() does not work with multibyte strings if the locale encoding is
+   GB18030 and the character to be searched is a digit.  */
+# undef strrchr
+# define strrchr(s,c) \
+    (GL_LINK_WARNING ("strrchr cannot work correctly on character strings " \
+                      "in some multibyte locales - " \
+                      "use mbsrchr if you care about internationalization"), \
+     strrchr (s, c))
+#endif
+
+/* Search the next delimiter (char listed in DELIM) starting at *STRINGP.
+   If one is found, overwrite it with a NUL, and advance *STRINGP
+   to point to the next char after it.  Otherwise, set *STRINGP to NULL.
+   If *STRINGP was already NULL, nothing happens.
+   Return the old value of *STRINGP.
+
+   This is a variant of strtok() that is multithread-safe and supports
+   empty fields.
+
+   Caveat: It modifies the original string.
+   Caveat: These functions cannot be used on constant strings.
+   Caveat: The identity of the delimiting character is lost.
+   Caveat: It doesn't work with multibyte strings unless all of the delimiter
+           characters are ASCII characters < 0x30.
+
+   See also strtok_r().  */
+#if @GNULIB_STRSEP@
+# if ! @HAVE_STRSEP@
+extern char *strsep (char **restrict __stringp, char const *restrict __delim);
+# endif
+# if defined GNULIB_POSIXCHECK
+#  undef strsep
+#  define strsep(s,d) \
+     (GL_LINK_WARNING ("strsep cannot work correctly on character strings " \
+                       "in multibyte locales - " \
+                       "use mbssep if you care about internationalization"), \
+      strsep (s, d))
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strsep
+# define strsep(s,d) \
+    (GL_LINK_WARNING ("strsep is unportable - " \
+                      "use gnulib module strsep for portability"), \
+     strsep (s, d))
+#endif
+
+#if @GNULIB_STRSTR@
+# if @REPLACE_STRSTR@
+#  define strstr rpl_strstr
+char *strstr (const char *haystack, const char *needle)
+  __attribute__ ((__pure__));
+# endif
+#elif defined GNULIB_POSIXCHECK
+/* strstr() does not work with multibyte strings if the locale encoding is
+   different from UTF-8:
+   POSIX says that it operates on "strings", and "string" in POSIX is defined
+   as a sequence of bytes, not of characters.  */
+# undef strstr
+# define strstr(a,b) \
+    (GL_LINK_WARNING ("strstr is quadratic on many systems, and cannot " \
+                      "work correctly on character strings in most "    \
+                      "multibyte locales - " \
+                      "use mbsstr if you care about internationalization, " \
+                      "or use strstr if you care about speed"), \
+     strstr (a, b))
+#endif
+
+/* Find the first occurrence of NEEDLE in HAYSTACK, using case-insensitive
+   comparison.  */
+#if @GNULIB_STRCASESTR@
+# if @REPLACE_STRCASESTR@
+#  define strcasestr rpl_strcasestr
+# endif
+# if ! @HAVE_STRCASESTR@ || @REPLACE_STRCASESTR@
+extern char *strcasestr (const char *haystack, const char *needle)
+  __attribute__ ((__pure__));
+# endif
+#elif defined GNULIB_POSIXCHECK
+/* strcasestr() does not work with multibyte strings:
+   It is a glibc extension, and glibc implements it only for unibyte
+   locales.  */
+# undef strcasestr
+# define strcasestr(a,b) \
+    (GL_LINK_WARNING ("strcasestr does work correctly on character strings " \
+                      "in multibyte locales - " \
+                      "use mbscasestr if you care about " \
+                      "internationalization, or use c-strcasestr if you want " \
+                      "a locale independent function"), \
+     strcasestr (a, b))
+#endif
+
+/* Parse S into tokens separated by characters in DELIM.
+   If S is NULL, the saved pointer in SAVE_PTR is used as
+   the next starting point.  For example:
+	char s[] = "-abc-=-def";
+	char *sp;
+	x = strtok_r(s, "-", &sp);	// x = "abc", sp = "=-def"
+	x = strtok_r(NULL, "-=", &sp);	// x = "def", sp = NULL
+	x = strtok_r(NULL, "=", &sp);	// x = NULL
+		// s = "abc\0-def\0"
+
+   This is a variant of strtok() that is multithread-safe.
+
+   For the POSIX documentation for this function, see:
+   http://www.opengroup.org/susv3xsh/strtok.html
+
+   Caveat: It modifies the original string.
+   Caveat: These functions cannot be used on constant strings.
+   Caveat: The identity of the delimiting character is lost.
+   Caveat: It doesn't work with multibyte strings unless all of the delimiter
+           characters are ASCII characters < 0x30.
+
+   See also strsep().  */
+#if @GNULIB_STRTOK_R@
+# if ! @HAVE_DECL_STRTOK_R@
+extern char *strtok_r (char *restrict s, char const *restrict delim,
+		       char **restrict save_ptr);
+# endif
+# if defined GNULIB_POSIXCHECK
+#  undef strtok_r
+#  define strtok_r(s,d,p) \
+     (GL_LINK_WARNING ("strtok_r cannot work correctly on character strings " \
+                       "in multibyte locales - " \
+                       "use mbstok_r if you care about internationalization"), \
+      strtok_r (s, d, p))
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strtok_r
+# define strtok_r(s,d,p) \
+    (GL_LINK_WARNING ("strtok_r is unportable - " \
+                      "use gnulib module strtok_r for portability"), \
+     strtok_r (s, d, p))
+#endif
+
+
+/* The following functions are not specified by POSIX.  They are gnulib
+   extensions.  */
+
+#if @GNULIB_MBSLEN@
+/* Return the number of multibyte characters in the character string STRING.
+   This considers multibyte characters, unlike strlen, which counts bytes.  */
+extern size_t mbslen (const char *string);
+#endif
+
+#if @GNULIB_MBSNLEN@
+/* Return the number of multibyte characters in the character string starting
+   at STRING and ending at STRING + LEN.  */
+extern size_t mbsnlen (const char *string, size_t len);
+#endif
+
+#if @GNULIB_MBSCHR@
+/* Locate the first single-byte character C in the character string STRING,
+   and return a pointer to it.  Return NULL if C is not found in STRING.
+   Unlike strchr(), this function works correctly in multibyte locales with
+   encodings such as GB18030.  */
+# define mbschr rpl_mbschr /* avoid collision with HP-UX function */
+extern char * mbschr (const char *string, int c);
+#endif
+
+#if @GNULIB_MBSRCHR@
+/* Locate the last single-byte character C in the character string STRING,
+   and return a pointer to it.  Return NULL if C is not found in STRING.
+   Unlike strrchr(), this function works correctly in multibyte locales with
+   encodings such as GB18030.  */
+# define mbsrchr rpl_mbsrchr /* avoid collision with HP-UX function */
+extern char * mbsrchr (const char *string, int c);
+#endif
+
+#if @GNULIB_MBSSTR@
+/* Find the first occurrence of the character string NEEDLE in the character
+   string HAYSTACK.  Return NULL if NEEDLE is not found in HAYSTACK.
+   Unlike strstr(), this function works correctly in multibyte locales with
+   encodings different from UTF-8.  */
+extern char * mbsstr (const char *haystack, const char *needle);
+#endif
+
+#if @GNULIB_MBSCASECMP@
+/* Compare the character strings S1 and S2, ignoring case, returning less than,
+   equal to or greater than zero if S1 is lexicographically less than, equal to
+   or greater than S2.
+   Note: This function may, in multibyte locales, return 0 for strings of
+   different lengths!
+   Unlike strcasecmp(), this function works correctly in multibyte locales.  */
+extern int mbscasecmp (const char *s1, const char *s2);
+#endif
+
+#if @GNULIB_MBSNCASECMP@
+/* Compare the initial segment of the character string S1 consisting of at most
+   N characters with the initial segment of the character string S2 consisting
+   of at most N characters, ignoring case, returning less than, equal to or
+   greater than zero if the initial segment of S1 is lexicographically less
+   than, equal to or greater than the initial segment of S2.
+   Note: This function may, in multibyte locales, return 0 for initial segments
+   of different lengths!
+   Unlike strncasecmp(), this function works correctly in multibyte locales.
+   But beware that N is not a byte count but a character count!  */
+extern int mbsncasecmp (const char *s1, const char *s2, size_t n);
+#endif
+
+#if @GNULIB_MBSPCASECMP@
+/* Compare the initial segment of the character string STRING consisting of
+   at most mbslen (PREFIX) characters with the character string PREFIX,
+   ignoring case, returning less than, equal to or greater than zero if this
+   initial segment is lexicographically less than, equal to or greater than
+   PREFIX.
+   Note: This function may, in multibyte locales, return 0 if STRING is of
+   smaller length than PREFIX!
+   Unlike strncasecmp(), this function works correctly in multibyte
+   locales.  */
+extern char * mbspcasecmp (const char *string, const char *prefix);
+#endif
+
+#if @GNULIB_MBSCASESTR@
+/* Find the first occurrence of the character string NEEDLE in the character
+   string HAYSTACK, using case-insensitive comparison.
+   Note: This function may, in multibyte locales, return success even if
+   strlen (haystack) < strlen (needle) !
+   Unlike strcasestr(), this function works correctly in multibyte locales.  */
+extern char * mbscasestr (const char *haystack, const char *needle);
+#endif
+
+#if @GNULIB_MBSCSPN@
+/* Find the first occurrence in the character string STRING of any character
+   in the character string ACCEPT.  Return the number of bytes from the
+   beginning of the string to this occurrence, or to the end of the string
+   if none exists.
+   Unlike strcspn(), this function works correctly in multibyte locales.  */
+extern size_t mbscspn (const char *string, const char *accept);
+#endif
+
+#if @GNULIB_MBSPBRK@
+/* Find the first occurrence in the character string STRING of any character
+   in the character string ACCEPT.  Return the pointer to it, or NULL if none
+   exists.
+   Unlike strpbrk(), this function works correctly in multibyte locales.  */
+# define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */
+extern char * mbspbrk (const char *string, const char *accept);
+#endif
+
+#if @GNULIB_MBSSPN@
+/* Find the first occurrence in the character string STRING of any character
+   not in the character string REJECT.  Return the number of bytes from the
+   beginning of the string to this occurrence, or to the end of the string
+   if none exists.
+   Unlike strspn(), this function works correctly in multibyte locales.  */
+extern size_t mbsspn (const char *string, const char *reject);
+#endif
+
+#if @GNULIB_MBSSEP@
+/* Search the next delimiter (multibyte character listed in the character
+   string DELIM) starting at the character string *STRINGP.
+   If one is found, overwrite it with a NUL, and advance *STRINGP to point
+   to the next multibyte character after it.  Otherwise, set *STRINGP to NULL.
+   If *STRINGP was already NULL, nothing happens.
+   Return the old value of *STRINGP.
+
+   This is a variant of mbstok_r() that supports empty fields.
+
+   Caveat: It modifies the original string.
+   Caveat: These functions cannot be used on constant strings.
+   Caveat: The identity of the delimiting character is lost.
+
+   See also mbstok_r().  */
+extern char * mbssep (char **stringp, const char *delim);
+#endif
+
+#if @GNULIB_MBSTOK_R@
+/* Parse the character string STRING into tokens separated by characters in
+   the character string DELIM.
+   If STRING is NULL, the saved pointer in SAVE_PTR is used as
+   the next starting point.  For example:
+	char s[] = "-abc-=-def";
+	char *sp;
+	x = mbstok_r(s, "-", &sp);	// x = "abc", sp = "=-def"
+	x = mbstok_r(NULL, "-=", &sp);	// x = "def", sp = NULL
+	x = mbstok_r(NULL, "=", &sp);	// x = NULL
+		// s = "abc\0-def\0"
+
+   Caveat: It modifies the original string.
+   Caveat: These functions cannot be used on constant strings.
+   Caveat: The identity of the delimiting character is lost.
+
+   See also mbssep().  */
+extern char * mbstok_r (char *string, const char *delim, char **save_ptr);
+#endif
+
+/* Map any int, typically from errno, into an error message.  */
+#if @GNULIB_STRERROR@
+# if @REPLACE_STRERROR@
+#  undef strerror
+#  define strerror rpl_strerror
+extern char *strerror (int);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strerror
+# define strerror(e) \
+    (GL_LINK_WARNING ("strerror is unportable - " \
+                      "use gnulib module strerror to guarantee non-NULL result"), \
+     strerror (e))
+#endif
+
+#if @GNULIB_STRSIGNAL@
+# if @REPLACE_STRSIGNAL@
+#  define strsignal rpl_strsignal
+# endif
+# if ! @HAVE_DECL_STRSIGNAL@ || @REPLACE_STRSIGNAL@
+extern char *strsignal (int __sig);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strsignal
+# define strsignal(a) \
+    (GL_LINK_WARNING ("strsignal is unportable - " \
+                      "use gnulib module strsignal for portability"), \
+     strsignal (a))
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GL_STRING_H */
+#endif /* _GL_STRING_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/strnlen1.c b/Build/source/utils/texinfo/gnulib/lib/strnlen1.c
new file mode 100644
index 00000000000..752d4fe8fdd
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/strnlen1.c
@@ -0,0 +1,35 @@
+/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "strnlen1.h"
+
+#include <string.h>
+
+/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
+   If no '\0' terminator is found in that many characters, return MAXLEN.  */
+/* This is the same as strnlen (string, maxlen - 1) + 1.  */
+size_t
+strnlen1 (const char *string, size_t maxlen)
+{
+  const char *end = (const char *) memchr (string, '\0', maxlen);
+  if (end != NULL)
+    return end - string + 1;
+  else
+    return maxlen;
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/strnlen1.h b/Build/source/utils/texinfo/gnulib/lib/strnlen1.h
new file mode 100644
index 00000000000..c0ea357046b
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/strnlen1.h
@@ -0,0 +1,39 @@
+/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _STRNLEN1_H
+#define _STRNLEN1_H
+
+#include <stddef.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
+   If no '\0' terminator is found in that many characters, return MAXLEN.  */
+/* This is the same as strnlen (string, maxlen - 1) + 1.  */
+extern size_t strnlen1 (const char *string, size_t maxlen);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _STRNLEN1_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/sys_stat.in.h b/Build/source/utils/texinfo/gnulib/lib/sys_stat.in.h
new file mode 100644
index 00000000000..b60e32298c5
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/sys_stat.in.h
@@ -0,0 +1,280 @@
+/* Provide a more complete sys/stat header file.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Eric Blake, Paul Eggert, and Jim Meyering.  */
+
+/* This file is supposed to be used on platforms where <sys/stat.h> is
+   incomplete.  It is intended to provide definitions and prototypes
+   needed by an application.  Start with what the system provides.  */
+
+#ifndef _GL_SYS_STAT_H
+
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@
+
+#ifndef _GL_SYS_STAT_H
+#define _GL_SYS_STAT_H
+
+#ifndef S_IFMT
+# define S_IFMT 0170000
+#endif
+
+#if STAT_MACROS_BROKEN
+# undef S_ISBLK
+# undef S_ISCHR
+# undef S_ISDIR
+# undef S_ISFIFO
+# undef S_ISLNK
+# undef S_ISNAM
+# undef S_ISMPB
+# undef S_ISMPC
+# undef S_ISNWK
+# undef S_ISREG
+# undef S_ISSOCK
+#endif
+
+#ifndef S_ISBLK
+# ifdef S_IFBLK
+#  define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
+# else
+#  define S_ISBLK(m) 0
+# endif
+#endif
+
+#ifndef S_ISCHR
+# ifdef S_IFCHR
+#  define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
+# else
+#  define S_ISCHR(m) 0
+# endif
+#endif
+
+#ifndef S_ISDIR
+# ifdef S_IFDIR
+#  define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# else
+#  define S_ISDIR(m) 0
+# endif
+#endif
+
+#ifndef S_ISDOOR /* Solaris 2.5 and up */
+# define S_ISDOOR(m) 0
+#endif
+
+#ifndef S_ISFIFO
+# ifdef S_IFIFO
+#  define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
+# else
+#  define S_ISFIFO(m) 0
+# endif
+#endif
+
+#ifndef S_ISLNK
+# ifdef S_IFLNK
+#  define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+# else
+#  define S_ISLNK(m) 0
+# endif
+#endif
+
+#ifndef S_ISMPB /* V7 */
+# ifdef S_IFMPB
+#  define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB)
+#  define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC)
+# else
+#  define S_ISMPB(m) 0
+#  define S_ISMPC(m) 0
+# endif
+#endif
+
+#ifndef S_ISNAM /* Xenix */
+# ifdef S_IFNAM
+#  define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM)
+# else
+#  define S_ISNAM(m) 0
+# endif
+#endif
+
+#ifndef S_ISNWK /* HP/UX */
+# ifdef S_IFNWK
+#  define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
+# else
+#  define S_ISNWK(m) 0
+# endif
+#endif
+
+#ifndef S_ISPORT /* Solaris 10 and up */
+# define S_ISPORT(m) 0
+#endif
+
+#ifndef S_ISREG
+# ifdef S_IFREG
+#  define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+# else
+#  define S_ISREG(m) 0
+# endif
+#endif
+
+#ifndef S_ISSOCK
+# ifdef S_IFSOCK
+#  define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
+# else
+#  define S_ISSOCK(m) 0
+# endif
+#endif
+
+
+#ifndef S_TYPEISMQ
+# define S_TYPEISMQ(p) 0
+#endif
+
+#ifndef S_TYPEISTMO
+# define S_TYPEISTMO(p) 0
+#endif
+
+
+#ifndef S_TYPEISSEM
+# ifdef S_INSEM
+#  define S_TYPEISSEM(p) (S_ISNAM ((p)->st_mode) && (p)->st_rdev == S_INSEM)
+# else
+#  define S_TYPEISSEM(p) 0
+# endif
+#endif
+
+#ifndef S_TYPEISSHM
+# ifdef S_INSHD
+#  define S_TYPEISSHM(p) (S_ISNAM ((p)->st_mode) && (p)->st_rdev == S_INSHD)
+# else
+#  define S_TYPEISSHM(p) 0
+# endif
+#endif
+
+/* high performance ("contiguous data") */
+#ifndef S_ISCTG
+# define S_ISCTG(p) 0
+#endif
+
+/* Cray DMF (data migration facility): off line, with data  */
+#ifndef S_ISOFD
+# define S_ISOFD(p) 0
+#endif
+
+/* Cray DMF (data migration facility): off line, with no data  */
+#ifndef S_ISOFL
+# define S_ISOFL(p) 0
+#endif
+
+/* 4.4BSD whiteout */
+#ifndef S_ISWHT
+# define S_ISWHT(m) 0
+#endif
+
+/* If any of the following are undefined,
+   define them to their de facto standard values.  */
+#if !S_ISUID
+# define S_ISUID 04000
+#endif
+#if !S_ISGID
+# define S_ISGID 02000
+#endif
+
+/* S_ISVTX is a common extension to POSIX.  */
+#ifndef S_ISVTX
+# define S_ISVTX 01000
+#endif
+
+#if !S_IRUSR && S_IREAD
+# define S_IRUSR S_IREAD
+#endif
+#if !S_IRUSR
+# define S_IRUSR 00400
+#endif
+#if !S_IRGRP
+# define S_IRGRP (S_IRUSR >> 3)
+#endif
+#if !S_IROTH
+# define S_IROTH (S_IRUSR >> 6)
+#endif
+
+#if !S_IWUSR && S_IWRITE
+# define S_IWUSR S_IWRITE
+#endif
+#if !S_IWUSR
+# define S_IWUSR 00200
+#endif
+#if !S_IWGRP
+# define S_IWGRP (S_IWUSR >> 3)
+#endif
+#if !S_IWOTH
+# define S_IWOTH (S_IWUSR >> 6)
+#endif
+
+#if !S_IXUSR && S_IEXEC
+# define S_IXUSR S_IEXEC
+#endif
+#if !S_IXUSR
+# define S_IXUSR 00100
+#endif
+#if !S_IXGRP
+# define S_IXGRP (S_IXUSR >> 3)
+#endif
+#if !S_IXOTH
+# define S_IXOTH (S_IXUSR >> 6)
+#endif
+
+#if !S_IRWXU
+# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)
+#endif
+#if !S_IRWXG
+# define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP)
+#endif
+#if !S_IRWXO
+# define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH)
+#endif
+
+/* S_IXUGO is a common extension to POSIX.  */
+#if !S_IXUGO
+# define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH)
+#endif
+
+#ifndef S_IRWXUGO
+# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO)
+#endif
+
+/* mingw does not support symlinks, therefore it does not have lstat.  But
+   without links, stat does just fine.  */
+#if ! @HAVE_LSTAT@
+# define lstat stat
+#endif
+
+/* mingw's _mkdir() function has 1 argument, but we pass 2 arguments.
+   Additionally, it declares _mkdir (and depending on compile flags, an
+   alias mkdir), only in the nonstandard io.h.  */
+#if ! @HAVE_DECL_MKDIR@ && @HAVE_IO_H@
+# include <io.h>
+
+static inline int
+rpl_mkdir (char const *name, mode_t mode)
+{
+  return _mkdir (name);
+}
+
+# define mkdir rpl_mkdir
+#endif
+
+#endif /* _GL_SYS_STAT_H */
+#endif /* _GL_SYS_STAT_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/sys_time.in.h b/Build/source/utils/texinfo/gnulib/lib/sys_time.in.h
new file mode 100644
index 00000000000..295d1645e88
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/sys_time.in.h
@@ -0,0 +1,52 @@
+/* Provide a more complete sys/time.h.
+
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Paul Eggert.  */
+
+#if defined _GL_SYS_TIME_H
+
+/* Simply delegate to the system's header, without adding anything.  */
+# if @HAVE_SYS_TIME_H@
+#  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
+# endif
+
+#else
+
+# define _GL_SYS_TIME_H
+
+# if @HAVE_SYS_TIME_H@
+#  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
+# else
+#  include <time.h>
+# endif
+
+# if ! @HAVE_STRUCT_TIMEVAL@
+struct timeval
+{
+  time_t tv_sec;
+  long int tv_usec;
+};
+# endif
+
+# if @REPLACE_GETTIMEOFDAY@
+#  undef gettimeofday
+#  define gettimeofday rpl_gettimeofday
+int gettimeofday (struct timeval *restrict, void *restrict);
+# endif
+
+#endif /* _GL_SYS_TIME_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/tempname.c b/Build/source/utils/texinfo/gnulib/lib/tempname.c
new file mode 100644
index 00000000000..5a3a3260c4e
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/tempname.c
@@ -0,0 +1,314 @@
+/* tempname.c - generate the name of a temporary file.
+
+   Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2005, 2006, 2007 Free Software Foundation,
+   Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Extracted from glibc sysdeps/posix/tempname.c.  See also tmpdir.c.  */
+
+#if !_LIBC
+# include <config.h>
+# include "tempname.h"
+#endif
+
+#include <sys/types.h>
+#include <assert.h>
+
+#include <errno.h>
+#ifndef __set_errno
+# define __set_errno(Val) errno = (Val)
+#endif
+
+#include <stdio.h>
+#ifndef P_tmpdir
+# define P_tmpdir "/tmp"
+#endif
+#ifndef TMP_MAX
+# define TMP_MAX 238328
+#endif
+#ifndef __GT_FILE
+# define __GT_FILE	0
+# define __GT_BIGFILE	1
+# define __GT_DIR	2
+# define __GT_NOCREATE	3
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <fcntl.h>
+#include <sys/time.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#include <sys/stat.h>
+
+#if _LIBC
+# define struct_stat64 struct stat64
+# define small_open __open
+# define large_open __open64
+#else
+# define struct_stat64 struct stat
+# define small_open open
+# define large_open open
+# define __gen_tempname gen_tempname
+# define __getpid getpid
+# define __gettimeofday gettimeofday
+# define __mkdir mkdir
+# define __lxstat64(version, file, buf) lstat (file, buf)
+# define __xstat64(version, file, buf) stat (file, buf)
+#endif
+
+#if ! (HAVE___SECURE_GETENV || _LIBC)
+# define __secure_getenv getenv
+#endif
+
+#ifdef _LIBC
+# include <hp-timing.h>
+# if HP_TIMING_AVAIL
+#  define RANDOM_BITS(Var) \
+  if (__builtin_expect (value == UINT64_C (0), 0))			      \
+    {									      \
+      /* If this is the first time this function is used initialize	      \
+	 the variable we accumulate the value in to some somewhat	      \
+	 random value.  If we'd not do this programs at startup time	      \
+	 might have a reduced set of possible names, at least on slow	      \
+	 machines.  */							      \
+      struct timeval tv;						      \
+      __gettimeofday (&tv, NULL);					      \
+      value = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;		      \
+    }									      \
+  HP_TIMING_NOW (Var)
+# endif
+#endif
+
+/* Use the widest available unsigned type if uint64_t is not
+   available.  The algorithm below extracts a number less than 62**6
+   (approximately 2**35.725) from uint64_t, so ancient hosts where
+   uintmax_t is only 32 bits lose about 3.725 bits of randomness,
+   which is better than not having mkstemp at all.  */
+#if !defined UINT64_MAX && !defined uint64_t
+# define uint64_t uintmax_t
+#endif
+
+#if _LIBC
+/* Return nonzero if DIR is an existent directory.  */
+static int
+direxists (const char *dir)
+{
+  struct_stat64 buf;
+  return __xstat64 (_STAT_VER, dir, &buf) == 0 && S_ISDIR (buf.st_mode);
+}
+
+/* Path search algorithm, for tmpnam, tmpfile, etc.  If DIR is
+   non-null and exists, uses it; otherwise uses the first of $TMPDIR,
+   P_tmpdir, /tmp that exists.  Copies into TMPL a template suitable
+   for use with mk[s]temp.  Will fail (-1) if DIR is non-null and
+   doesn't exist, none of the searched dirs exists, or there's not
+   enough space in TMPL. */
+int
+__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
+	       int try_tmpdir)
+{
+  const char *d;
+  size_t dlen, plen;
+
+  if (!pfx || !pfx[0])
+    {
+      pfx = "file";
+      plen = 4;
+    }
+  else
+    {
+      plen = strlen (pfx);
+      if (plen > 5)
+	plen = 5;
+    }
+
+  if (try_tmpdir)
+    {
+      d = __secure_getenv ("TMPDIR");
+      if (d != NULL && direxists (d))
+	dir = d;
+      else if (dir != NULL && direxists (dir))
+	/* nothing */ ;
+      else
+	dir = NULL;
+    }
+  if (dir == NULL)
+    {
+      if (direxists (P_tmpdir))
+	dir = P_tmpdir;
+      else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
+	dir = "/tmp";
+      else
+	{
+	  __set_errno (ENOENT);
+	  return -1;
+	}
+    }
+
+  dlen = strlen (dir);
+  while (dlen > 1 && dir[dlen - 1] == '/')
+    dlen--;			/* remove trailing slashes */
+
+  /* check we have room for "${dir}/${pfx}XXXXXX\0" */
+  if (tmpl_len < dlen + 1 + plen + 6 + 1)
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
+  return 0;
+}
+#endif /* _LIBC */
+
+/* These are the characters used in temporary file names.  */
+static const char letters[] =
+"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+/* Generate a temporary file name based on TMPL.  TMPL must match the
+   rules for mk[s]temp (i.e. end in "XXXXXX").  The name constructed
+   does not exist at the time of the call to __gen_tempname.  TMPL is
+   overwritten with the result.
+
+   KIND may be one of:
+   __GT_NOCREATE:	simply verify that the name does not exist
+			at the time of the call.
+   __GT_FILE:		create the file using open(O_CREAT|O_EXCL)
+			and return a read-write fd.  The file is mode 0600.
+   __GT_BIGFILE:	same as __GT_FILE but use open64().
+   __GT_DIR:		create a directory, which will be mode 0700.
+
+   We use a clever algorithm to get hard-to-predict names. */
+int
+__gen_tempname (char *tmpl, int kind)
+{
+  int len;
+  char *XXXXXX;
+  static uint64_t value;
+  uint64_t random_time_bits;
+  unsigned int count;
+  int fd = -1;
+  int save_errno = errno;
+  struct_stat64 st;
+
+  /* A lower bound on the number of temporary files to attempt to
+     generate.  The maximum total number of temporary file names that
+     can exist for a given template is 62**6.  It should never be
+     necessary to try all these combinations.  Instead if a reasonable
+     number of names is tried (we define reasonable as 62**3) fail to
+     give the system administrator the chance to remove the problems.  */
+#define ATTEMPTS_MIN (62 * 62 * 62)
+
+  /* The number of times to attempt to generate a temporary file.  To
+     conform to POSIX, this must be no smaller than TMP_MAX.  */
+#if ATTEMPTS_MIN < TMP_MAX
+  unsigned int attempts = TMP_MAX;
+#else
+  unsigned int attempts = ATTEMPTS_MIN;
+#endif
+
+  len = strlen (tmpl);
+  if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  /* This is where the Xs start.  */
+  XXXXXX = &tmpl[len - 6];
+
+  /* Get some more or less random data.  */
+#ifdef RANDOM_BITS
+  RANDOM_BITS (random_time_bits);
+#else
+  {
+    struct timeval tv;
+    __gettimeofday (&tv, NULL);
+    random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;
+  }
+#endif
+  value += random_time_bits ^ __getpid ();
+
+  for (count = 0; count < attempts; value += 7777, ++count)
+    {
+      uint64_t v = value;
+
+      /* Fill in the random bits.  */
+      XXXXXX[0] = letters[v % 62];
+      v /= 62;
+      XXXXXX[1] = letters[v % 62];
+      v /= 62;
+      XXXXXX[2] = letters[v % 62];
+      v /= 62;
+      XXXXXX[3] = letters[v % 62];
+      v /= 62;
+      XXXXXX[4] = letters[v % 62];
+      v /= 62;
+      XXXXXX[5] = letters[v % 62];
+
+      switch (kind)
+	{
+	case __GT_FILE:
+	  fd = small_open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+	  break;
+
+	case __GT_BIGFILE:
+	  fd = large_open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+	  break;
+
+	case __GT_DIR:
+	  fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
+	  break;
+
+	case __GT_NOCREATE:
+	  /* This case is backward from the other three.  __gen_tempname
+	     succeeds if __xstat fails because the name does not exist.
+	     Note the continue to bypass the common logic at the bottom
+	     of the loop.  */
+	  if (__lxstat64 (_STAT_VER, tmpl, &st) < 0)
+	    {
+	      if (errno == ENOENT)
+		{
+		  __set_errno (save_errno);
+		  return 0;
+		}
+	      else
+		/* Give up now. */
+		return -1;
+	    }
+	  continue;
+
+	default:
+	  assert (! "invalid KIND in __gen_tempname");
+	}
+
+      if (fd >= 0)
+	{
+	  __set_errno (save_errno);
+	  return fd;
+	}
+      else if (errno != EEXIST)
+	return -1;
+    }
+
+  /* We got out of the loop because we ran out of combinations to try.  */
+  __set_errno (EEXIST);
+  return -1;
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/tempname.h b/Build/source/utils/texinfo/gnulib/lib/tempname.h
new file mode 100644
index 00000000000..74da03b3b29
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/tempname.h
@@ -0,0 +1,39 @@
+/* Create a temporary file or directory.
+
+   Copyright (C) 2006 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* header written by Eric Blake */
+
+/* In gnulib, always prefer large files.  GT_FILE maps to
+   __GT_BIGFILE, not __GT_FILE, for a reason.  */
+#define GT_FILE		1
+#define GT_DIR		2
+#define GT_NOCREATE	3
+
+/* Generate a temporary file name based on TMPL.  TMPL must match the
+   rules for mk[s]temp (i.e. end in "XXXXXX").  The name constructed
+   does not exist at the time of the call to gen_tempname.  TMPL is
+   overwritten with the result.
+
+   KIND may be one of:
+   GT_NOCREATE:		simply verify that the name does not exist
+			at the time of the call.
+   GT_FILE:		create a large file using open(O_CREAT|O_EXCL)
+			and return a read-write fd.  The file is mode 0600.
+   GT_DIR:		create a directory, which will be mode 0700.
+
+   We use a clever algorithm to get hard-to-predict names. */
+extern int gen_tempname (char *tmpl, int kind);
diff --git a/Build/source/utils/texinfo/gnulib/lib/unistd.in.h b/Build/source/utils/texinfo/gnulib/lib/unistd.in.h
new file mode 100644
index 00000000000..17b29affdd2
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/unistd.in.h
@@ -0,0 +1,340 @@
+/* Substitute for and wrapper around <unistd.h>.
+   Copyright (C) 2004-2008 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _GL_UNISTD_H
+
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_UNISTD_H@
+# @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+#endif
+
+#ifndef _GL_UNISTD_H
+#define _GL_UNISTD_H
+
+/* mingw doesn't define the SEEK_* macros in <unistd.h>.  */
+#if !(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET)
+# include <stdio.h>
+#endif
+
+/* mingw fails to declare _exit in <unistd.h>.  */
+#include <stdlib.h>
+
+/* The definition of GL_LINK_WARNING is copied here.  */
+
+
+/* Declare overridden functions.  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#if @GNULIB_CHOWN@
+# if @REPLACE_CHOWN@
+#  ifndef REPLACE_CHOWN
+#   define REPLACE_CHOWN 1
+#  endif
+#  if REPLACE_CHOWN
+/* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
+   to GID (if GID is not -1).  Follow symbolic links.
+   Return 0 if successful, otherwise -1 and errno set.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/chown.html>.  */
+#   define chown rpl_chown
+extern int chown (const char *file, uid_t uid, gid_t gid);
+#  endif
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef chown
+# define chown(f,u,g) \
+    (GL_LINK_WARNING ("chown fails to follow symlinks on some systems and " \
+                      "doesn't treat a uid or gid of -1 on some systems - " \
+                      "use gnulib module chown for portability"), \
+     chown (f, u, g))
+#endif
+
+
+#if @GNULIB_DUP2@
+# if !@HAVE_DUP2@
+/* Copy the file descriptor OLDFD into file descriptor NEWFD.  Do nothing if
+   NEWFD = OLDFD, otherwise close NEWFD first if it is open.
+   Return 0 if successful, otherwise -1 and errno set.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/dup2.html>.  */
+extern int dup2 (int oldfd, int newfd);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef dup2
+# define dup2(o,n) \
+    (GL_LINK_WARNING ("dup2 is unportable - " \
+                      "use gnulib module dup2 for portability"), \
+     dup2 (o, n))
+#endif
+
+
+#if @GNULIB_ENVIRON@
+# if !@HAVE_DECL_ENVIRON@
+/* Set of environment variables and values.  An array of strings of the form
+   "VARIABLE=VALUE", terminated with a NULL.  */
+#  if defined __APPLE__ && defined __MACH__
+#   include <crt_externs.h>
+#   define environ (*_NSGetEnviron ())
+#  else
+extern char **environ;
+#  endif
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef environ
+# define environ \
+    (GL_LINK_WARNING ("environ is unportable - " \
+                      "use gnulib module environ for portability"), \
+     environ)
+#endif
+
+
+#if @GNULIB_FCHDIR@
+# if @REPLACE_FCHDIR@
+
+/* Change the process' current working directory to the directory on which
+   the given file descriptor is open.
+   Return 0 if successful, otherwise -1 and errno set.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/fchdir.html>.  */
+extern int fchdir (int /*fd*/);
+
+#  define close rpl_close
+extern int close (int);
+#  define dup rpl_dup
+extern int dup (int);
+#  define dup2 rpl_dup2
+extern int dup2 (int, int);
+
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef fchdir
+# define fchdir(f) \
+    (GL_LINK_WARNING ("fchdir is unportable - " \
+                      "use gnulib module fchdir for portability"), \
+     fchdir (f))
+#endif
+
+
+#if @GNULIB_FTRUNCATE@
+# if !@HAVE_FTRUNCATE@
+/* Change the size of the file to which FD is opened to become equal to LENGTH.
+   Return 0 if successful, otherwise -1 and errno set.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/ftruncate.html>.  */
+extern int ftruncate (int fd, off_t length);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef ftruncate
+# define ftruncate(f,l) \
+    (GL_LINK_WARNING ("ftruncate is unportable - " \
+                      "use gnulib module ftruncate for portability"), \
+     ftruncate (f, l))
+#endif
+
+
+#if @GNULIB_GETCWD@
+/* Include the headers that might declare getcwd so that they will not
+   cause confusion if included after this file.  */
+# include <stdlib.h>
+# if @REPLACE_GETCWD@
+/* Get the name of the current working directory, and put it in SIZE bytes
+   of BUF.
+   Return BUF if successful, or NULL if the directory couldn't be determined
+   or SIZE was too small.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/getcwd.html>.
+   Additionally, the gnulib module 'getcwd' guarantees the following GNU
+   extension: If BUF is NULL, an array is allocated with 'malloc'; the array
+   is SIZE bytes long, unless SIZE == 0, in which case it is as big as
+   necessary.  */
+#  define getcwd rpl_getcwd
+extern char * getcwd (char *buf, size_t size);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getcwd
+# define getcwd(b,s) \
+    (GL_LINK_WARNING ("getcwd is unportable - " \
+                      "use gnulib module getcwd for portability"), \
+     getcwd (b, s))
+#endif
+
+
+#if @GNULIB_GETLOGIN_R@
+/* Copies the user's login name to NAME.
+   The array pointed to by NAME has room for SIZE bytes.
+
+   Returns 0 if successful.  Upon error, an error number is returned, or -1 in
+   the case that the login name cannot be found but no specific error is
+   provided (this case is hopefully rare but is left open by the POSIX spec).
+
+   See <http://www.opengroup.org/susv3xsh/getlogin.html>.
+ */
+# if !@HAVE_DECL_GETLOGIN_R@
+#  include <stddef.h>
+extern int getlogin_r (char *name, size_t size);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getlogin_r
+# define getlogin_r(n,s) \
+    (GL_LINK_WARNING ("getlogin_r is unportable - " \
+                      "use gnulib module getlogin_r for portability"), \
+     getlogin_r (n, s))
+#endif
+
+
+#if @GNULIB_GETPAGESIZE@
+# if @REPLACE_GETPAGESIZE@
+#  define getpagesize rpl_getpagesize
+extern int getpagesize (void);
+# elif !@HAVE_GETPAGESIZE@
+/* This is for POSIX systems.  */
+#  if !defined getpagesize && defined _SC_PAGESIZE
+#   if ! (defined __VMS && __VMS_VER < 70000000)
+#    define getpagesize() sysconf (_SC_PAGESIZE)
+#   endif
+#  endif
+/* This is for older VMS.  */
+#  if !defined getpagesize && defined __VMS
+#   ifdef __ALPHA
+#    define getpagesize() 8192
+#   else
+#    define getpagesize() 512
+#   endif
+#  endif
+/* This is for BeOS.  */
+#  if !defined getpagesize && @HAVE_OS_H@
+#   include <OS.h>
+#   if defined B_PAGE_SIZE
+#    define getpagesize() B_PAGE_SIZE
+#   endif
+#  endif
+/* This is for AmigaOS4.0.  */
+#  if !defined getpagesize && defined __amigaos4__
+#   define getpagesize() 2048
+#  endif
+/* This is for older Unix systems.  */
+#  if !defined getpagesize && @HAVE_SYS_PARAM_H@
+#   include <sys/param.h>
+#   ifdef EXEC_PAGESIZE
+#    define getpagesize() EXEC_PAGESIZE
+#   else
+#    ifdef NBPG
+#     ifndef CLSIZE
+#      define CLSIZE 1
+#     endif
+#     define getpagesize() (NBPG * CLSIZE)
+#    else
+#     ifdef NBPC
+#      define getpagesize() NBPC
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getpagesize
+# define getpagesize() \
+    (GL_LINK_WARNING ("getpagesize is unportable - " \
+                      "use gnulib module getpagesize for portability"), \
+     getpagesize ())
+#endif
+
+
+#if @GNULIB_LCHOWN@
+# if @REPLACE_LCHOWN@
+/* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
+   to GID (if GID is not -1).  Do not follow symbolic links.
+   Return 0 if successful, otherwise -1 and errno set.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/lchown.html>.  */
+#  define lchown rpl_lchown
+extern int lchown (char const *file, uid_t owner, gid_t group);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef lchown
+# define lchown(f,u,g) \
+    (GL_LINK_WARNING ("lchown is unportable to pre-POSIX.1-2001 " \
+                      "systems - use gnulib module lchown for portability"), \
+     lchown (f, u, g))
+#endif
+
+
+#if @GNULIB_LSEEK@
+# if @REPLACE_LSEEK@
+/* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END.
+   Return the new offset if successful, otherwise -1 and errno set.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/lseek.html>.  */
+#  define lseek rpl_lseek
+   extern off_t lseek (int fd, off_t offset, int whence);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef lseek
+# define lseek(f,o,w) \
+    (GL_LINK_WARNING ("lseek does not fail with ESPIPE on pipes on some " \
+                      "systems - use gnulib module lseek for portability"), \
+     lseek (f, o, w))
+#endif
+
+
+#if @GNULIB_READLINK@
+/* Read the contents of the symbolic link FILE and place the first BUFSIZE
+   bytes of it into BUF.  Return the number of bytes placed into BUF if
+   successful, otherwise -1 and errno set.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/readlink.html>.  */
+# if !@HAVE_READLINK@
+#  include <stddef.h>
+extern int readlink (const char *file, char *buf, size_t bufsize);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef readlink
+# define readlink(f,b,s) \
+    (GL_LINK_WARNING ("readlink is unportable - " \
+                      "use gnulib module readlink for portability"), \
+     readlink (f, b, s))
+#endif
+
+
+#if @GNULIB_SLEEP@
+/* Pause the execution of the current thread for N seconds.
+   Returns the number of seconds left to sleep.
+   See the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/sleep.html>.  */
+# if !@HAVE_SLEEP@
+extern unsigned int sleep (unsigned int n);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef sleep
+# define sleep(n) \
+    (GL_LINK_WARNING ("sleep is unportable - " \
+                      "use gnulib module sleep for portability"), \
+     sleep (n))
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _GL_UNISTD_H */
+#endif /* _GL_UNISTD_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/unitypes.h b/Build/source/utils/texinfo/gnulib/lib/unitypes.h
new file mode 100644
index 00000000000..12e2628c654
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/unitypes.h
@@ -0,0 +1,26 @@
+/* Elementary types for the GNU UniString library.
+   Copyright (C) 2002, 2005-2006 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _UNITYPES_H
+#define _UNITYPES_H
+
+/* Get uint8_t, uint16_t, uint32_t.  */
+#include <stdint.h>
+
+/* Type representing a Unicode character.  */
+typedef uint32_t ucs4_t;
+
+#endif /* _UNITYPES_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/uniwidth.h b/Build/source/utils/texinfo/gnulib/lib/uniwidth.h
new file mode 100644
index 00000000000..5b4867f0b3e
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/uniwidth.h
@@ -0,0 +1,64 @@
+/* Display width functions.
+   Copyright (C) 2001-2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _UNIWIDTH_H
+#define _UNIWIDTH_H
+
+#include "unitypes.h"
+
+/* Get size_t.  */
+#include <stddef.h>
+
+/* Get locale_charset() declaration.  */
+#include "localcharset.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Display width.  */
+
+/* These functions are locale dependent.  The encoding argument identifies
+   the encoding (e.g. "ISO-8859-2" for Polish).  */
+
+/* Determine number of column positions required for UC.  */
+extern int
+       uc_width (ucs4_t uc, const char *encoding);
+
+/* Determine number of column positions required for first N units
+   (or fewer if S ends before this) in S.  */
+extern int
+       u8_width (const uint8_t *s, size_t n, const char *encoding);
+extern int
+       u16_width (const uint16_t *s, size_t n, const char *encoding);
+extern int
+       u32_width (const uint32_t *s, size_t n, const char *encoding);
+
+/* Determine number of column positions required for S.  */
+extern int
+       u8_strwidth (const uint8_t *s, const char *encoding);
+extern int
+       u16_strwidth (const uint16_t *s, const char *encoding);
+extern int
+       u32_strwidth (const uint32_t *s, const char *encoding);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UNIWIDTH_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/uniwidth/cjk.h b/Build/source/utils/texinfo/gnulib/lib/uniwidth/cjk.h
new file mode 100644
index 00000000000..c8ccb937494
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/uniwidth/cjk.h
@@ -0,0 +1,37 @@
+/* Test for CJK encoding.
+   Copyright (C) 2001-2002, 2005-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "streq.h"
+
+static int
+is_cjk_encoding (const char *encoding)
+{
+  if (0
+      /* Legacy Japanese encodings */
+      || STREQ (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)
+      /* Legacy Chinese encodings */
+      || STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
+      || STREQ (encoding, "GBK", 'G', 'B', 'K', 0, 0, 0, 0, 0, 0)
+      || STREQ (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)
+      || STREQ (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)
+      /* Legacy Korean encodings */
+      || STREQ (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+      || STREQ (encoding, "CP949", 'C', 'P', '9', '4', '9', 0, 0, 0, 0)
+      || STREQ (encoding, "JOHAB", 'J', 'O', 'H', 'A', 'B', 0, 0, 0, 0))
+    return 1;
+  return 0;
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/uniwidth/width.c b/Build/source/utils/texinfo/gnulib/lib/uniwidth/width.c
new file mode 100644
index 00000000000..7d75bda7229
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/uniwidth/width.c
@@ -0,0 +1,323 @@
+/* Determine display width of Unicode character.
+   Copyright (C) 2001-2002, 2006-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "uniwidth.h"
+
+#include "cjk.h"
+
+/*
+ * Non-spacing attribute table.
+ * Consists of:
+ * - Non-spacing characters; generated from PropList.txt or
+ *   "grep '^[^;]*;[^;]*;[^;]*;[^;]*;NSM;' UnicodeData.txt"
+ * - Format control characters; generated from
+ *   "grep '^[^;]*;[^;]*;Cf;' UnicodeData.txt"
+ * - Zero width characters; generated from
+ *   "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt"
+ */
+static const unsigned char nonspacing_table_data[22*64] = {
+  /* 0x0000-0x01ff */
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x08, 0x00, 0x00, /* 0x0080-0x00bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00c0-0x00ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0100-0x013f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0140-0x017f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0180-0x01bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x01c0-0x01ff */
+  /* 0x0200-0x03ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0200-0x023f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0240-0x027f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0280-0x02bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x02c0-0x02ff */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x0300-0x033f */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, /* 0x0340-0x037f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0380-0x03bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x03c0-0x03ff */
+  /* 0x0400-0x05ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0400-0x043f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0440-0x047f */
+  0x78, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0480-0x04bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04c0-0x04ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0500-0x053f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0540-0x057f */
+  0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, /* 0x0580-0x05bf */
+  0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */
+  /* 0x0600-0x07ff */
+  0x0f, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */
+  0x00, 0xf8, 0xff, 0x7f, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */
+  0x00, 0x00, 0xc0, 0xff, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */
+  0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x0700-0x073f */
+  0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0740-0x077f */
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, /* 0x0780-0x07bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x07c0-0x07ff */
+  /* 0x0800-0x09ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0800-0x083f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08c0-0x08ff */
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0900-0x093f */
+  0xfe, 0x21, 0x1e, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */
+  0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x09c0-0x09ff */
+  /* 0x0a00-0x0bff */
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a00-0x0a3f */
+  0x86, 0x39, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, /* 0x0a40-0x0a7f */
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a80-0x0abf */
+  0xbe, 0x21, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0ac0-0x0aff */
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, /* 0x0b00-0x0b3f */
+  0x0e, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0b40-0x0b7f */
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0b80-0x0bbf */
+  0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0bc0-0x0bff */
+  /* 0x0c00-0x0dff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, /* 0x0c00-0x0c3f */
+  0xc1, 0x3d, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0c40-0x0c7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0c80-0x0cbf */
+  0x00, 0x30, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0cc0-0x0cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d00-0x0d3f */
+  0x0e, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d40-0x0d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d80-0x0dbf */
+  0x00, 0x04, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0dc0-0x0dff */
+  /* 0x0e00-0x0fff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x07, /* 0x0e00-0x0e3f */
+  0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0e40-0x0e7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x1b, /* 0x0e80-0x0ebf */
+  0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0ec0-0x0eff */
+  0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xa0, 0x02, /* 0x0f00-0x0f3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, /* 0x0f40-0x0f7f */
+  0xdf, 0x00, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */
+  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0fc0-0x0fff */
+  /* 0x1000-0x11ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xc5, 0x02, /* 0x1000-0x103f */
+  0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, /* 0x1040-0x107f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c0-0x10ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1100-0x113f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1140-0x117f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1180-0x11bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11c0-0x11ff */
+  /* 0x1200-0x13ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1200-0x123f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1240-0x127f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1280-0x12bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x12c0-0x12ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1300-0x133f */
+  0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1380-0x13bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13c0-0x13ff */
+  /* 0x1600-0x17ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1600-0x163f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1640-0x167f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1680-0x16bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16c0-0x16ff */
+  0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 0x00, /* 0x1700-0x173f */
+  0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, /* 0x1740-0x177f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x3f, /* 0x1780-0x17bf */
+  0x40, 0xfe, 0x0f, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x17c0-0x17ff */
+  /* 0x1800-0x19ff */
+  0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1800-0x183f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1840-0x187f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x1880-0x18bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18c0-0x18ff */
+  0x00, 0x00, 0x00, 0x00, 0x87, 0x0f, 0x04, 0x0e, /* 0x1900-0x193f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1940-0x197f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1980-0x19bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x19c0-0x19ff */
+  /* 0x1a00-0x1bff */
+  0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, /* 0x1a00-0x1a3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a40-0x1a7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a80-0x1abf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ac0-0x1aff */
+  0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x17, /* 0x1b00-0x1b3f */
+  0x04, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x1b40-0x1b7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1b80-0x1bbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc0-0x1bff */
+  /* 0x1c00-0x1dff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c00-0x1c3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c40-0x1c7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c80-0x1cbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cc0-0x1cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */
+  0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, /* 0x1dc0-0x1dff */
+  /* 0x2000-0x21ff */
+  0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */
+  0x00, 0x00, 0x00, 0x00, 0x0f, 0xfc, 0x00, 0x00, /* 0x2040-0x207f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2080-0x20bf */
+  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, /* 0x20c0-0x20ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2100-0x213f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2140-0x217f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2180-0x21bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x21c0-0x21ff */
+  /* 0x3000-0x31ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, /* 0x3000-0x303f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3040-0x307f */
+  0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, /* 0x3080-0x30bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30c0-0x30ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3100-0x313f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3140-0x317f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3180-0x31bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x31c0-0x31ff */
+  /* 0xa800-0xa9ff */
+  0x44, 0x08, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0xa800-0xa83f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa840-0xa87f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa880-0xa8bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8c0-0xa8ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa900-0xa93f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa980-0xa9bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */
+  /* 0xfa00-0xfbff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa00-0xfa3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa40-0xfa7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa80-0xfabf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfac0-0xfaff */
+  0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, /* 0xfb00-0xfb3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb40-0xfb7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb80-0xfbbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfbc0-0xfbff */
+  /* 0xfe00-0xffff */
+  0xff, 0xff, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, /* 0xfe00-0xfe3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe40-0xfe7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe80-0xfebf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0xfec0-0xfeff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff00-0xff3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff40-0xff7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff80-0xffbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, /* 0xffc0-0xffff */
+  /* 0x10a00-0x10bff */
+  0x6e, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, /* 0x10a00-0x10a3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a40-0x10a7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a80-0x10abf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10ac0-0x10aff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b00-0x10b3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b40-0x10b7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b80-0x10bbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10bc0-0x10bff */
+  /* 0x1d000-0x1d1ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d000-0x1d03f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d040-0x1d07f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d080-0x1d0bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d0c0-0x1d0ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d100-0x1d13f */
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0xf8, /* 0x1d140-0x1d17f */
+  0xe7, 0x0f, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, /* 0x1d180-0x1d1bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d1c0-0x1d1ff */
+  /* 0x1d200-0x1d3ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d200-0x1d23f */
+  0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d240-0x1d27f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d280-0x1d2bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d2c0-0x1d2ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d300-0x1d33f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d340-0x1d37f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d380-0x1d3bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00  /* 0x1d3c0-0x1d3ff */
+};
+static const signed char nonspacing_table_ind[240] = {
+   0,  1,  2,  3,  4,  5,  6,  7, /* 0x0000-0x0fff */
+   8,  9, -1, 10, 11, 12, 13, -1, /* 0x1000-0x1fff */
+  14, -1, -1, -1, -1, -1, -1, -1, /* 0x2000-0x2fff */
+  15, -1, -1, -1, -1, -1, -1, -1, /* 0x3000-0x3fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x4000-0x4fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x5000-0x5fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x6000-0x6fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x7000-0x7fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x8000-0x8fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x9000-0x9fff */
+  -1, -1, -1, -1, 16, -1, -1, -1, /* 0xa000-0xafff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xb000-0xbfff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xc000-0xcfff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xd000-0xdfff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */
+  -1, -1, -1, -1, -1, 17, -1, 18, /* 0xf000-0xffff */
+  -1, -1, -1, -1, -1, 19, -1, -1, /* 0x10000-0x10fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x15000-0x15fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x16000-0x16fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x17000-0x17fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x18000-0x18fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x19000-0x19fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1b000-0x1bfff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */
+  20, 21, -1, -1, -1, -1, -1, -1  /* 0x1d000-0x1dfff */
+};
+
+/* Determine number of column positions required for UC.  */
+int
+uc_width (ucs4_t uc, const char *encoding)
+{
+  /* Test for non-spacing or control character.  */
+  if ((uc >> 9) < 240)
+    {
+      int ind = nonspacing_table_ind[uc >> 9];
+      if (ind >= 0)
+	if ((nonspacing_table_data[64*ind + ((uc >> 3) & 63)] >> (uc & 7)) & 1)
+	  {
+	    if (uc > 0 && uc < 0xa0)
+	      return -1;
+	    else
+	      return 0;
+	  }
+    }
+  else if ((uc >> 9) == (0xe0000 >> 9))
+    {
+      if (uc >= 0xe0100)
+	{
+	  if (uc <= 0xe01ef)
+	    return 0;
+	}
+      else
+	{
+	  if (uc >= 0xe0020 ? uc <= 0xe007f : uc == 0xe0001)
+	    return 0;
+	}
+    }
+  /* Test for double-width character.
+   * Generated from "grep '^....;[WF]' EastAsianWidth.txt"
+   * and            "grep '^....;[^WF]' EastAsianWidth.txt"
+   */
+  if (uc >= 0x1100
+      && ((uc < 0x1160) /* Hangul Jamo */
+	  || (uc >= 0x2329 && uc < 0x232b) /* Angle Brackets */
+	  || (uc >= 0x2e80 && uc < 0xa4d0  /* CJK ... Yi */
+	      && !(uc == 0x303f) && !(uc >= 0x4dc0 && uc < 0x4e00))
+	  || (uc >= 0xac00 && uc < 0xd7a4) /* Hangul Syllables */
+	  || (uc >= 0xf900 && uc < 0xfb00) /* CJK Compatibility Ideographs */
+	  || (uc >= 0xfe10 && uc < 0xfe20) /* Presentation Forms for Vertical */
+	  || (uc >= 0xfe30 && uc < 0xfe70) /* CJK Compatibility Forms */
+	  || (uc >= 0xff00 && uc < 0xff61) /* Fullwidth Forms */
+	  || (uc >= 0xffe0 && uc < 0xffe7) /* Fullwidth Signs */
+	  || (uc >= 0x20000 && uc <= 0x2a6d6) /* CJK */
+	  || (uc >= 0x2f800 && uc <= 0x2fa1d) /* CJK Compatibility Ideographs */
+     )   )
+    return 2;
+  /* In ancient CJK encodings, Cyrillic and most other characters are
+     double-width as well.  */
+  if (uc >= 0x00A1 && uc < 0xFF61 && uc != 0x20A9
+      && is_cjk_encoding (encoding))
+    return 2;
+  return 1;
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/unsetenv.c b/Build/source/utils/texinfo/gnulib/lib/unsetenv.c
new file mode 100644
index 00000000000..73ea878a688
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/unsetenv.c
@@ -0,0 +1,90 @@
+/* Copyright (C) 1992,1995-1999,2000-2002,2005-2008 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <stdlib.h>
+
+#include <errno.h>
+#if !_LIBC
+# define __set_errno(ev) ((errno) = (ev))
+#endif
+
+#include <string.h>
+#include <unistd.h>
+
+#if !_LIBC
+# define __environ	environ
+#endif
+
+#if _LIBC
+/* This lock protects against simultaneous modifications of `environ'.  */
+# include <bits/libc-lock.h>
+__libc_lock_define_initialized (static, envlock)
+# define LOCK	__libc_lock_lock (envlock)
+# define UNLOCK	__libc_lock_unlock (envlock)
+#else
+# define LOCK
+# define UNLOCK
+#endif
+
+/* In the GNU C library we must keep the namespace clean.  */
+#ifdef _LIBC
+# define unsetenv __unsetenv
+#endif
+
+
+int
+unsetenv (const char *name)
+{
+  size_t len;
+  char **ep;
+
+  if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  len = strlen (name);
+
+  LOCK;
+
+  ep = __environ;
+  while (*ep != NULL)
+    if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+      {
+	/* Found it.  Remove this pointer by moving later ones back.  */
+	char **dp = ep;
+
+	do
+	  dp[0] = dp[1];
+	while (*dp++);
+	/* Continue the loop in case NAME appears again.  */
+      }
+    else
+      ++ep;
+
+  UNLOCK;
+
+  return 0;
+}
+
+#ifdef _LIBC
+# undef unsetenv
+weak_alias (__unsetenv, unsetenv)
+#endif
diff --git a/Build/source/utils/texinfo/gnulib/lib/wchar.in.h b/Build/source/utils/texinfo/gnulib/lib/wchar.in.h
new file mode 100644
index 00000000000..f7961679710
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/wchar.in.h
@@ -0,0 +1,91 @@
+/* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+
+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Eric Blake.  */
+
+/*
+ * ISO C 99 <wchar.h> for platforms that have issues.
+ * <http://www.opengroup.org/susv3xbd/wchar.h.html>
+ *
+ * For now, this just ensures proper prerequisite inclusion order and
+ * the declaration of wcwidth().
+ */
+
+#ifdef __need_mbstate_t
+/* Special invocation convention inside uClibc header files.  */
+
+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _GL_WCHAR_H
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+
+/* Include the original <wchar.h> if it exists.
+   Some builds of uClibc lack it.  */
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_WCHAR_H@
+# @INCLUDE_NEXT@ @NEXT_WCHAR_H@
+#endif
+
+#ifndef _GL_WCHAR_H
+#define _GL_WCHAR_H
+
+/* The definition of GL_LINK_WARNING is copied here.  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Return the number of screen columns needed for WC.  */
+#if @GNULIB_WCWIDTH@
+# if @REPLACE_WCWIDTH@
+#  undef wcwidth
+#  define wcwidth rpl_wcwidth
+extern int wcwidth (wchar_t);
+# else
+#  if !defined wcwidth && !@HAVE_DECL_WCWIDTH@
+/* wcwidth exists but is not declared.  */
+extern int wcwidth (int /* actually wchar_t */);
+#  endif
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef wcwidth
+# define wcwidth(w) \
+    (GL_LINK_WARNING ("wcwidth is unportable - " \
+                      "use gnulib module wcwidth for portability"), \
+     wcwidth (w))
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GL_WCHAR_H */
+#endif /* _GL_WCHAR_H */
+#endif
diff --git a/Build/source/utils/texinfo/gnulib/lib/wctype.in.h b/Build/source/utils/texinfo/gnulib/lib/wctype.in.h
new file mode 100644
index 00000000000..a86b5ad4075
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/wctype.in.h
@@ -0,0 +1,161 @@
+/* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
+
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Bruno Haible and Paul Eggert.  */
+
+/*
+ * ISO C 99 <wctype.h> for platforms that lack it.
+ * <http://www.opengroup.org/susv3xbd/wctype.h.html>
+ *
+ * iswctype, towctrans, towlower, towupper, wctrans, wctype,
+ * wctrans_t, and wctype_t are not yet implemented.
+ */
+
+#ifndef _GL_WCTYPE_H
+
+#if @HAVE_WINT_T@
+/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
+   Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+# include <wchar.h>
+#endif
+
+/* Include the original <wctype.h> if it exists.
+   BeOS 5 has the functions but no <wctype.h>.  */
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_WCTYPE_H@
+# @INCLUDE_NEXT@ @NEXT_WCTYPE_H@
+#endif
+
+#ifndef _GL_WCTYPE_H
+#define _GL_WCTYPE_H
+
+#if @HAVE_WINT_T@
+typedef wint_t __wctype_wint_t;
+#else
+typedef int __wctype_wint_t;
+#endif
+
+/* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
+   Assume all 12 functions are implemented the same way, or not at all.  */
+#if ! @HAVE_ISWCNTRL@
+
+/* IRIX 5.3 has macros but no functions, its isw* macros refer to an
+   undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
+   refer to system functions like _iswctype that are not in the
+   standard C library.  Rather than try to get ancient buggy
+   implementations like this to work, just disable them.  */
+#  undef iswalnum
+#  undef iswalpha
+#  undef iswblank
+#  undef iswcntrl
+#  undef iswdigit
+#  undef iswgraph
+#  undef iswlower
+#  undef iswprint
+#  undef iswpunct
+#  undef iswspace
+#  undef iswupper
+#  undef iswxdigit
+
+static inline int
+iswalnum (__wctype_wint_t wc)
+{
+  return ((wc >= '0' && wc <= '9')
+	  || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
+}
+
+static inline int
+iswalpha (__wctype_wint_t wc)
+{
+  return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
+}
+
+static inline int
+iswblank (__wctype_wint_t wc)
+{
+  return wc == ' ' || wc == '\t';
+}
+
+static inline int
+iswcntrl (__wctype_wint_t wc)
+{
+  return (wc & ~0x1f) == 0 || wc == 0x7f;
+}
+
+static inline int
+iswdigit (__wctype_wint_t wc)
+{
+  return wc >= '0' && wc <= '9';
+}
+
+static inline int
+iswgraph (__wctype_wint_t wc)
+{
+  return wc >= '!' && wc <= '~';
+}
+
+static inline int
+iswlower (__wctype_wint_t wc)
+{
+  return wc >= 'a' && wc <= 'z';
+}
+
+static inline int
+iswprint (__wctype_wint_t wc)
+{
+  return wc >= ' ' && wc <= '~';
+}
+
+static inline int
+iswpunct (__wctype_wint_t wc)
+{
+  return (wc >= '!' && wc <= '~'
+	  && !((wc >= '0' && wc <= '9')
+	       || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')));
+}
+
+static inline int
+iswspace (__wctype_wint_t wc)
+{
+  return (wc == ' ' || wc == '\t'
+	  || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
+}
+
+static inline int
+iswupper (__wctype_wint_t wc)
+{
+  return wc >= 'A' && wc <= 'Z';
+}
+
+static inline int
+iswxdigit (__wctype_wint_t wc)
+{
+  return ((wc >= '0' && wc <= '9')
+	  || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));
+}
+
+# endif /* ! HAVE_ISWCNTRL */
+
+#endif /* _GL_WCTYPE_H */
+#endif /* _GL_WCTYPE_H */
diff --git a/Build/source/utils/texinfo/gnulib/lib/wcwidth.c b/Build/source/utils/texinfo/gnulib/lib/wcwidth.c
new file mode 100644
index 00000000000..4885071d066
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/wcwidth.c
@@ -0,0 +1,51 @@
+/* Determine the number of screen columns needed for a character.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wchar.h>
+
+/* Get iswprint.  */
+#include <wctype.h>
+
+#include "localcharset.h"
+#include "streq.h"
+#include "uniwidth.h"
+
+#undef wcwidth
+
+int
+rpl_wcwidth (wchar_t wc)
+{
+  /* In UTF-8 locales, use a Unicode aware width function.  */
+  const char *encoding = locale_charset ();
+  if (STREQ (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0))
+    {
+      /* We assume that in a UTF-8 locale, a wide character is the same as a
+	 Unicode character.  */
+      return uc_width (wc, encoding);
+    }
+  else
+    {
+      /* Otherwise, fall back to the system's wcwidth function.  */
+#if HAVE_WCWIDTH
+      return wcwidth (wc);
+#else
+      return wc == 0 ? 0 : iswprint (wc) ? 1 : -1;
+#endif
+    }
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/xalloc-die.c b/Build/source/utils/texinfo/gnulib/lib/xalloc-die.c
new file mode 100644
index 00000000000..0a0694fcfe8
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/xalloc-die.c
@@ -0,0 +1,41 @@
+/* Report a memory allocation failure and exit.
+
+   Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2006 Free
+   Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "xalloc.h"
+
+#include <stdlib.h>
+
+#include "error.h"
+#include "exitfail.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
+void
+xalloc_die (void)
+{
+  error (exit_failure, 0, "%s", _("memory exhausted"));
+
+  /* The `noreturn' cannot be given to error, since it may return if
+     its first argument is 0.  To help compilers understand the
+     xalloc_die does not return, call abort.  Also, the abort is a
+     safety feature if exit_failure is 0 (which shouldn't happen).  */
+  abort ();
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/xalloc.h b/Build/source/utils/texinfo/gnulib/lib/xalloc.h
new file mode 100644
index 00000000000..40dcf4bd54c
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/xalloc.h
@@ -0,0 +1,270 @@
+/* xalloc.h -- malloc with out-of-memory checking
+
+   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef XALLOC_H_
+# define XALLOC_H_
+
+# include <stddef.h>
+
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+
+# ifndef __attribute__
+#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
+#   define __attribute__(x)
+#  endif
+# endif
+
+# ifndef ATTRIBUTE_NORETURN
+#  define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+# endif
+
+/* This function is always triggered when memory is exhausted.
+   It must be defined by the application, either explicitly
+   or by using gnulib's xalloc-die module.  This is the
+   function to call when one wants the program to die because of a
+   memory allocation failure.  */
+extern void xalloc_die (void) ATTRIBUTE_NORETURN;
+
+void *xmalloc (size_t s);
+void *xzalloc (size_t s);
+void *xcalloc (size_t n, size_t s);
+void *xrealloc (void *p, size_t s);
+void *x2realloc (void *p, size_t *pn);
+void *xmemdup (void const *p, size_t s);
+char *xstrdup (char const *str);
+
+/* Return 1 if an array of N objects, each of size S, cannot exist due
+   to size arithmetic overflow.  S must be positive and N must be
+   nonnegative.  This is a macro, not an inline function, so that it
+   works correctly even when SIZE_MAX < N.
+
+   By gnulib convention, SIZE_MAX represents overflow in size
+   calculations, so the conservative dividend to use here is
+   SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value.
+   However, malloc (SIZE_MAX) fails on all known hosts where
+   sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for
+   exactly-SIZE_MAX allocations on such hosts; this avoids a test and
+   branch when S is known to be 1.  */
+# define xalloc_oversized(n, s) \
+    ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
+
+
+/* In the following macros, T must be an elementary or structure/union or
+   typedef'ed type, or a pointer to such a type.  To apply one of the
+   following macros to a function pointer or array type, you need to typedef
+   it first and use the typedef name.  */
+
+/* Allocate an object of type T dynamically, with error checking.  */
+/* extern t *XMALLOC (typename t); */
+# define XMALLOC(t) ((t *) xmalloc (sizeof (t)))
+
+/* Allocate memory for N elements of type T, with error checking.  */
+/* extern t *XNMALLOC (size_t n, typename t); */
+# define XNMALLOC(n, t) \
+    ((t *) (sizeof (t) == 1 ? xmalloc (n) : xnmalloc (n, sizeof (t))))
+
+/* Allocate an object of type T dynamically, with error checking,
+   and zero it.  */
+/* extern t *XZALLOC (typename t); */
+# define XZALLOC(t) ((t *) xzalloc (sizeof (t)))
+
+/* Allocate memory for N elements of type T, with error checking,
+   and zero it.  */
+/* extern t *XCALLOC (size_t n, typename t); */
+# define XCALLOC(n, t) \
+    ((t *) (sizeof (t) == 1 ? xzalloc (n) : xcalloc (n, sizeof (t))))
+
+
+# if HAVE_INLINE
+#  define static_inline static inline
+# else
+   void *xnmalloc (size_t n, size_t s);
+   void *xnrealloc (void *p, size_t n, size_t s);
+   void *x2nrealloc (void *p, size_t *pn, size_t s);
+   char *xcharalloc (size_t n);
+# endif
+
+# ifdef static_inline
+
+/* Allocate an array of N objects, each with S bytes of memory,
+   dynamically, with error checking.  S must be nonzero.  */
+
+static_inline void *
+xnmalloc (size_t n, size_t s)
+{
+  if (xalloc_oversized (n, s))
+    xalloc_die ();
+  return xmalloc (n * s);
+}
+
+/* Change the size of an allocated block of memory P to an array of N
+   objects each of S bytes, with error checking.  S must be nonzero.  */
+
+static_inline void *
+xnrealloc (void *p, size_t n, size_t s)
+{
+  if (xalloc_oversized (n, s))
+    xalloc_die ();
+  return xrealloc (p, n * s);
+}
+
+/* If P is null, allocate a block of at least *PN such objects;
+   otherwise, reallocate P so that it contains more than *PN objects
+   each of S bytes.  *PN must be nonzero unless P is null, and S must
+   be nonzero.  Set *PN to the new number of objects, and return the
+   pointer to the new block.  *PN is never set to zero, and the
+   returned pointer is never null.
+
+   Repeated reallocations are guaranteed to make progress, either by
+   allocating an initial block with a nonzero size, or by allocating a
+   larger block.
+
+   In the following implementation, nonzero sizes are increased by a
+   factor of approximately 1.5 so that repeated reallocations have
+   O(N) overall cost rather than O(N**2) cost, but the
+   specification for this function does not guarantee that rate.
+
+   Here is an example of use:
+
+     int *p = NULL;
+     size_t used = 0;
+     size_t allocated = 0;
+
+     void
+     append_int (int value)
+       {
+	 if (used == allocated)
+	   p = x2nrealloc (p, &allocated, sizeof *p);
+	 p[used++] = value;
+       }
+
+   This causes x2nrealloc to allocate a block of some nonzero size the
+   first time it is called.
+
+   To have finer-grained control over the initial size, set *PN to a
+   nonzero value before calling this function with P == NULL.  For
+   example:
+
+     int *p = NULL;
+     size_t used = 0;
+     size_t allocated = 0;
+     size_t allocated1 = 1000;
+
+     void
+     append_int (int value)
+       {
+	 if (used == allocated)
+	   {
+	     p = x2nrealloc (p, &allocated1, sizeof *p);
+	     allocated = allocated1;
+	   }
+	 p[used++] = value;
+       }
+
+   */
+
+static_inline void *
+x2nrealloc (void *p, size_t *pn, size_t s)
+{
+  size_t n = *pn;
+
+  if (! p)
+    {
+      if (! n)
+	{
+	  /* The approximate size to use for initial small allocation
+	     requests, when the invoking code specifies an old size of
+	     zero.  64 bytes is the largest "small" request for the
+	     GNU C library malloc.  */
+	  enum { DEFAULT_MXFAST = 64 };
+
+	  n = DEFAULT_MXFAST / s;
+	  n += !n;
+	}
+    }
+  else
+    {
+      /* Set N = ceil (1.5 * N) so that progress is made if N == 1.
+	 Check for overflow, so that N * S stays in size_t range.
+	 The check is slightly conservative, but an exact check isn't
+	 worth the trouble.  */
+      if ((size_t) -1 / 3 * 2 / s <= n)
+	xalloc_die ();
+      n += (n + 1) / 2;
+    }
+
+  *pn = n;
+  return xrealloc (p, n * s);
+}
+
+/* Return a pointer to a new buffer of N bytes.  This is like xmalloc,
+   except it returns char *.  */
+
+static_inline char *
+xcharalloc (size_t n)
+{
+  return XNMALLOC (n, char);
+}
+
+# endif
+
+# ifdef __cplusplus
+}
+
+/* C++ does not allow conversions from void * to other pointer types
+   without a cast.  Use templates to work around the problem when
+   possible.  */
+
+template <typename T> inline T *
+xrealloc (T *p, size_t s)
+{
+  return (T *) xrealloc ((void *) p, s);
+}
+
+template <typename T> inline T *
+xnrealloc (T *p, size_t n, size_t s)
+{
+  return (T *) xnrealloc ((void *) p, n, s);
+}
+
+template <typename T> inline T *
+x2realloc (T *p, size_t *pn)
+{
+  return (T *) x2realloc ((void *) p, pn);
+}
+
+template <typename T> inline T *
+x2nrealloc (T *p, size_t *pn, size_t s)
+{
+  return (T *) x2nrealloc ((void *) p, pn, s);
+}
+
+template <typename T> inline T *
+xmemdup (T const *p, size_t s)
+{
+  return (T *) xmemdup ((void const *) p, s);
+}
+
+# endif
+
+
+#endif /* !XALLOC_H_ */
diff --git a/Build/source/utils/texinfo/gnulib/lib/xmalloc.c b/Build/source/utils/texinfo/gnulib/lib/xmalloc.c
new file mode 100644
index 00000000000..3a123457431
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/xmalloc.c
@@ -0,0 +1,122 @@
+/* xmalloc.c -- malloc with out of memory checking
+
+   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+   Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#if ! HAVE_INLINE
+# define static_inline
+#endif
+#include "xalloc.h"
+#undef static_inline
+
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+
+/* 1 if calloc is known to be compatible with GNU calloc.  This
+   matters if we are not also using the calloc module, which defines
+   HAVE_CALLOC and supports the GNU API even on non-GNU platforms.  */
+#if defined HAVE_CALLOC || defined __GLIBC__
+enum { HAVE_GNU_CALLOC = 1 };
+#else
+enum { HAVE_GNU_CALLOC = 0 };
+#endif
+
+/* Allocate N bytes of memory dynamically, with error checking.  */
+
+void *
+xmalloc (size_t n)
+{
+  void *p = malloc (n);
+  if (!p && n != 0)
+    xalloc_die ();
+  return p;
+}
+
+/* Change the size of an allocated block of memory P to N bytes,
+   with error checking.  */
+
+void *
+xrealloc (void *p, size_t n)
+{
+  p = realloc (p, n);
+  if (!p && n != 0)
+    xalloc_die ();
+  return p;
+}
+
+/* If P is null, allocate a block of at least *PN bytes; otherwise,
+   reallocate P so that it contains more than *PN bytes.  *PN must be
+   nonzero unless P is null.  Set *PN to the new block's size, and
+   return the pointer to the new block.  *PN is never set to zero, and
+   the returned pointer is never null.  */
+
+void *
+x2realloc (void *p, size_t *pn)
+{
+  return x2nrealloc (p, pn, 1);
+}
+
+/* Allocate S bytes of zeroed memory dynamically, with error checking.
+   There's no need for xnzalloc (N, S), since it would be equivalent
+   to xcalloc (N, S).  */
+
+void *
+xzalloc (size_t s)
+{
+  return memset (xmalloc (s), 0, s);
+}
+
+/* Allocate zeroed memory for N elements of S bytes, with error
+   checking.  S must be nonzero.  */
+
+void *
+xcalloc (size_t n, size_t s)
+{
+  void *p;
+  /* Test for overflow, since some calloc implementations don't have
+     proper overflow checks.  But omit overflow and size-zero tests if
+     HAVE_GNU_CALLOC, since GNU calloc catches overflow and never
+     returns NULL if successful.  */
+  if ((! HAVE_GNU_CALLOC && xalloc_oversized (n, s))
+      || (! (p = calloc (n, s)) && (HAVE_GNU_CALLOC || n != 0)))
+    xalloc_die ();
+  return p;
+}
+
+/* Clone an object P of size S, with error checking.  There's no need
+   for xnmemdup (P, N, S), since xmemdup (P, N * S) works without any
+   need for an arithmetic overflow check.  */
+
+void *
+xmemdup (void const *p, size_t s)
+{
+  return memcpy (xmalloc (s), p, s);
+}
+
+/* Clone STRING.  */
+
+char *
+xstrdup (char const *string)
+{
+  return xmemdup (string, strlen (string) + 1);
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/xsetenv.c b/Build/source/utils/texinfo/gnulib/lib/xsetenv.c
new file mode 100644
index 00000000000..44e5c3f9f7b
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/xsetenv.c
@@ -0,0 +1,38 @@
+/* Setting environment variables, with out-of-memory checking.
+   Copyright (C) 2001-2002, 2005-2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "xsetenv.h"
+
+#include <stdlib.h>
+
+#include "error.h"
+#include "gettext.h"
+
+#define _(str) gettext (str)
+
+
+/* Set NAME to VALUE in the environment.
+   If REPLACE is nonzero, overwrite an existing value.
+   With error checking.  */
+void
+xsetenv (const char *name, const char *value, int replace)
+{
+  if (setenv (name, value, replace) < 0)
+    error (EXIT_FAILURE, 0, _("memory exhausted"));
+}
diff --git a/Build/source/utils/texinfo/gnulib/lib/xsetenv.h b/Build/source/utils/texinfo/gnulib/lib/xsetenv.h
new file mode 100644
index 00000000000..0b65f4ffb8d
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/lib/xsetenv.h
@@ -0,0 +1,31 @@
+/* Setting environment variables, with out-of-memory checking.
+   Copyright (C) 2001-2002, 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Get unsetenv().  It can be used without error checking.  */
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Set NAME to VALUE in the environment.
+   If REPLACE is nonzero, overwrite an existing value.
+   With error checking.  */
+extern void xsetenv (const char *name, const char *value, int replace);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/Build/source/utils/texinfo/gnulib/m4/alloca.m4 b/Build/source/utils/texinfo/gnulib/m4/alloca.m4
new file mode 100644
index 00000000000..95f54a6d48c
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/alloca.m4
@@ -0,0 +1,46 @@
+# alloca.m4 serial 8
+dnl Copyright (C) 2002-2004, 2006, 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_ALLOCA],
+[
+  dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
+  AC_REQUIRE([AC_PROG_CPP])
+  AC_REQUIRE([AC_PROG_EGREP])
+
+  AC_REQUIRE([AC_FUNC_ALLOCA])
+  if test $ac_cv_func_alloca_works = no; then
+    gl_PREREQ_ALLOCA
+  fi
+
+  # Define an additional variable used in the Makefile substitution.
+  if test $ac_cv_working_alloca_h = yes; then
+    AC_CACHE_CHECK([for alloca as a compiler built-in], [gl_cv_rpl_alloca], [
+      AC_EGREP_CPP([Need own alloca], [
+#if defined __GNUC__ || defined _AIX || defined _MSC_VER
+        Need own alloca
+#endif
+        ], [gl_cv_rpl_alloca=yes], [gl_cv_rpl_alloca=no])
+    ])
+    if test $gl_cv_rpl_alloca = yes; then
+      dnl OK, alloca can be implemented through a compiler built-in.
+      AC_DEFINE([HAVE_ALLOCA], 1,
+        [Define to 1 if you have 'alloca' after including <alloca.h>,
+         a header that may be supplied by this distribution.])
+      ALLOCA_H=alloca.h
+    else
+      dnl alloca exists as a library function, i.e. it is slow and probably
+      dnl a memory leak. Don't define HAVE_ALLOCA in this case.
+      ALLOCA_H=
+    fi
+  else
+    ALLOCA_H=alloca.h
+  fi
+  AC_SUBST([ALLOCA_H])
+])
+
+# Prerequisites of lib/alloca.c.
+# STACK_DIRECTION is already handled by AC_FUNC_ALLOCA.
+AC_DEFUN([gl_PREREQ_ALLOCA], [:])
diff --git a/Build/source/utils/texinfo/gnulib/m4/argz.m4 b/Build/source/utils/texinfo/gnulib/m4/argz.m4
new file mode 100644
index 00000000000..edc99bbce24
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/argz.m4
@@ -0,0 +1,79 @@
+# Portability macros for glibc argz.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+#   Written by Gary V. Vaughan <gary@gnu.org>
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 argz.m4
+
+AC_DEFUN([gl_FUNC_ARGZ],
+[gl_PREREQ_ARGZ
+
+AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
+
+AC_CHECK_TYPES([error_t],
+  [],
+  [AC_DEFINE([error_t], [int],
+   [Define to a type to use for `error_t' if it is not otherwise available.])
+   AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h
+    does not typedef error_t.])],
+  [#if defined(HAVE_ARGZ_H)
+#  include <argz.h>
+#endif])
+
+ARGZ_H=
+AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \
+	argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])])
+
+dnl if have system argz functions, allow forced use of 
+dnl libltdl-supplied implementation (and default to do so
+dnl on "known bad" systems). Could use a runtime check, but
+dnl (a) detecting malloc issues is notoriously unreliable
+dnl (b) only known system that declares argz functions,
+dnl     provides them, yet they are broken, is cygwin
+dnl     releases prior to 16-Mar-2007 (1.5.24 and earlier)
+dnl So, it's more straightforward simply to special case 
+dnl this for known bad systems.
+AS_IF([test -z "$ARGZ_H"],
+    [AC_CACHE_CHECK(
+        [if argz actually works],
+        [lt_cv_sys_argz_works],
+        [[case $host_os in #(
+	 *cygwin*)
+	   lt_cv_sys_argz_works=no
+	   if test "$cross_compiling" != no; then
+	     lt_cv_sys_argz_works="guessing no"
+	   else
+	     lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
+	     save_IFS=$IFS
+	     IFS=-.
+	     set x `uname -r | sed -e "$lt_sed_extract_leading_digits"`
+	     IFS=$save_IFS
+	     lt_os_major=${2-0}
+	     lt_os_minor=${3-0}
+	     lt_os_micro=${4-0}
+	     if test "$lt_os_major" -gt 1 \
+		|| { test "$lt_os_major" -eq 1 \
+		  && { test "$lt_os_minor" -gt 5 \
+		    || { test "$lt_os_minor" -eq 5 \
+		      && test "$lt_os_micro" -gt 24; }; }; }; then
+	       lt_cv_sys_argz_works=yes
+	     fi
+	   fi
+	   ;; #(
+	 *) lt_cv_sys_argz_works=yes ;;
+	 esac]])
+     AS_IF([test $lt_cv_sys_argz_works = yes],
+        [AC_DEFINE([HAVE_WORKING_ARGZ], 1,
+                   [This value is set to 1 to indicate that the system argz facility works])],
+        [ARGZ_H=argz.h
+        AC_LIBOBJ([argz])])])
+
+AC_SUBST([ARGZ_H])
+])
+
+# Prerequisites of lib/argz.c.
+AC_DEFUN([gl_PREREQ_ARGZ], [:])
diff --git a/Build/source/utils/texinfo/gnulib/m4/codeset.m4 b/Build/source/utils/texinfo/gnulib/m4/codeset.m4
new file mode 100644
index 00000000000..223955b454a
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/codeset.m4
@@ -0,0 +1,21 @@
+# codeset.m4 serial 2 (gettext-0.16)
+dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET); return !cs;],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/eealloc.m4 b/Build/source/utils/texinfo/gnulib/m4/eealloc.m4
new file mode 100644
index 00000000000..adcfd06c958
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/eealloc.m4
@@ -0,0 +1,32 @@
+# eealloc.m4 serial 1
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_EEALLOC],
+[
+  AC_REQUIRE([gl_EEMALLOC])
+  AC_REQUIRE([gl_EEREALLOC])
+  AC_REQUIRE([AC_C_INLINE])
+])
+
+AC_DEFUN([gl_EEMALLOC],
+[
+  _AC_FUNC_MALLOC_IF(
+    [gl_cv_func_malloc_0_nonnull=1],
+    [gl_cv_func_malloc_0_nonnull=0])
+  AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], $gl_cv_func_malloc_0_nonnull,
+    [If malloc(0) is != NULL, define this to 1.  Otherwise define this
+     to 0.])
+])
+
+AC_DEFUN([gl_EEREALLOC],
+[
+  _AC_FUNC_REALLOC_IF(
+    [gl_cv_func_realloc_0_nonnull=1],
+    [gl_cv_func_realloc_0_nonnull=0])
+  AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], $gl_cv_func_realloc_0_nonnull,
+    [If realloc(NULL,0) is != NULL, define this to 1.  Otherwise define this
+     to 0.])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/environ.m4 b/Build/source/utils/texinfo/gnulib/m4/environ.m4
new file mode 100644
index 00000000000..fac0c055565
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/environ.m4
@@ -0,0 +1,36 @@
+# environ.m4 serial 1
+dnl Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_ENVIRON],
+[
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  dnl Persuade glibc <unistd.h> to declare environ.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
+  if test $gt_cv_var_environ_declaration != yes; then
+    HAVE_DECL_ENVIRON=0
+  fi
+])
+
+# Check if a variable is properly declared.
+# gt_CHECK_VAR_DECL(includes,variable)
+AC_DEFUN([gt_CHECK_VAR_DECL],
+[
+  define([gt_cv_var], [gt_cv_var_]$2[_declaration])
+  AC_MSG_CHECKING([if $2 is properly declared])
+  AC_CACHE_VAL(gt_cv_var, [
+    AC_TRY_COMPILE([$1
+      extern struct { int foo; } $2;],
+      [$2.foo = 1;],
+      gt_cv_var=no,
+      gt_cv_var=yes)])
+  AC_MSG_RESULT($gt_cv_var)
+  if test $gt_cv_var = yes; then
+    AC_DEFINE([HAVE_]translit($2, [a-z], [A-Z])[_DECL], 1,
+              [Define if you have the declaration of $2.])
+  fi
+  undefine([gt_cv_var])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/error.m4 b/Build/source/utils/texinfo/gnulib/m4/error.m4
new file mode 100644
index 00000000000..7c7746e2cc8
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/error.m4
@@ -0,0 +1,22 @@
+#serial 11
+
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software
+# Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_ERROR],
+[
+  AC_FUNC_ERROR_AT_LINE
+  dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
+  gl_PREREQ_ERROR
+])
+
+# Prerequisites of lib/error.c.
+AC_DEFUN([gl_PREREQ_ERROR],
+[
+  AC_REQUIRE([AC_FUNC_STRERROR_R])
+  :
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/exitfail.m4 b/Build/source/utils/texinfo/gnulib/m4/exitfail.m4
new file mode 100644
index 00000000000..b7a691e501e
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/exitfail.m4
@@ -0,0 +1,13 @@
+# exitfail.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_EXITFAIL],
+[
+  AC_LIBOBJ([exitfail])
+
+  dnl No prerequisites of lib/exitfail.c.
+  :
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/extensions.m4 b/Build/source/utils/texinfo/gnulib/m4/extensions.m4
new file mode 100644
index 00000000000..917af948054
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/extensions.m4
@@ -0,0 +1,82 @@
+# serial 5  -*- Autoconf -*-
+# Enable extensions on systems that normally disable them.
+
+# Copyright (C) 2003, 2006-2008 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
+# Autoconf.  Perhaps we can remove this once we can assume Autoconf
+# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
+# enough in this area it's likely we'll need to redefine
+# AC_USE_SYSTEM_EXTENSIONS for quite some time.
+
+# AC_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+# Remember that #undef in AH_VERBATIM gets replaced with #define by
+# AC_DEFINE.  The goal here is to define all known feature-enabling
+# macros, then, if reports of conflicts are made, disable macros that
+# cause problems on some platforms (such as __EXTENSIONS__).
+AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
+
+  AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
+  if test "$MINIX" = yes; then
+    AC_DEFINE([_POSIX_SOURCE], [1],
+      [Define to 1 if you need to in order for `stat' and other
+       things to work.])
+    AC_DEFINE([_POSIX_1_SOURCE], [2],
+      [Define to 2 if the system does not provide POSIX.1 features
+       except with this defined.])
+    AC_DEFINE([_MINIX], [1],
+      [Define to 1 if on MINIX.])
+  fi
+
+  AH_VERBATIM([__EXTENSIONS__],
+[/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+])
+  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
+    [ac_cv_safe_to_define___extensions__],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[
+#	  define __EXTENSIONS__ 1
+	  ]AC_INCLUDES_DEFAULT])],
+       [ac_cv_safe_to_define___extensions__=yes],
+       [ac_cv_safe_to_define___extensions__=no])])
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    AC_DEFINE([__EXTENSIONS__])
+  AC_DEFINE([_ALL_SOURCE])
+  AC_DEFINE([_GNU_SOURCE])
+  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+  AC_DEFINE([_TANDEM_SOURCE])
+])# AC_USE_SYSTEM_EXTENSIONS
+
+# gl_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS],
+  [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])])
diff --git a/Build/source/utils/texinfo/gnulib/m4/getopt.m4 b/Build/source/utils/texinfo/gnulib/m4/getopt.m4
new file mode 100644
index 00000000000..9b683c2febb
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/getopt.m4
@@ -0,0 +1,83 @@
+# getopt.m4 serial 14
+dnl Copyright (C) 2002-2006, 2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# The getopt module assume you want GNU getopt, with getopt_long etc,
+# rather than vanilla POSIX getopt.  This means your code should
+# always include <getopt.h> for the getopt prototypes.
+
+AC_DEFUN([gl_GETOPT_SUBSTITUTE],
+[
+  AC_LIBOBJ([getopt])
+  AC_LIBOBJ([getopt1])
+  gl_GETOPT_SUBSTITUTE_HEADER
+  gl_PREREQ_GETOPT
+])
+
+AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
+[
+  GETOPT_H=getopt.h
+  AC_DEFINE([__GETOPT_PREFIX], [[rpl_]],
+    [Define to rpl_ if the getopt replacement functions and variables
+     should be used.])
+  AC_SUBST([GETOPT_H])
+])
+
+AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
+[
+  if test -z "$GETOPT_H"; then
+    AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
+  fi
+
+  if test -z "$GETOPT_H"; then
+    AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
+  fi
+
+  dnl BSD getopt_long uses an incompatible method to reset option processing,
+  dnl and (as of 2004-10-15) mishandles optional option-arguments.
+  if test -z "$GETOPT_H"; then
+    AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>])
+  fi
+
+  dnl Solaris 10 getopt doesn't handle `+' as a leading character in an
+  dnl option string (as of 2005-05-05).
+  if test -z "$GETOPT_H"; then
+    AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_gnu_getopt],
+      [AC_RUN_IFELSE(
+	[AC_LANG_PROGRAM([[#include <getopt.h>]],
+	   [[
+	     char *myargv[3];
+	     myargv[0] = "conftest";
+	     myargv[1] = "-+";
+	     myargv[2] = 0;
+	     return getopt (2, myargv, "+a") != '?';
+	   ]])],
+	[gl_cv_func_gnu_getopt=yes],
+	[gl_cv_func_gnu_getopt=no],
+	[dnl cross compiling - pessimistically guess based on decls
+	 dnl Solaris 10 getopt doesn't handle `+' as a leading character in an
+	 dnl option string (as of 2005-05-05).
+	 AC_CHECK_DECL([getopt_clip],
+	   [gl_cv_func_gnu_getopt=no], [gl_cv_func_gnu_getopt=yes],
+	   [#include <getopt.h>])])])
+    if test "$gl_cv_func_gnu_getopt" = "no"; then
+      GETOPT_H=getopt.h
+    fi
+  fi
+])
+
+AC_DEFUN([gl_GETOPT_IFELSE],
+[
+  AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
+  AS_IF([test -n "$GETOPT_H"], [$1], [$2])
+])
+
+AC_DEFUN([gl_GETOPT], [gl_GETOPT_IFELSE([gl_GETOPT_SUBSTITUTE])])
+
+# Prerequisites of lib/getopt*.
+AC_DEFUN([gl_PREREQ_GETOPT],
+[
+  AC_CHECK_DECLS_ONCE([getenv])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/gettext.m4 b/Build/source/utils/texinfo/gnulib/m4/gettext.m4
new file mode 100644
index 00000000000..c9ae1f7de86
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/gettext.m4
@@ -0,0 +1,381 @@
+# gettext.m4 serial 60 (gettext-0.17)
+dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl    default (if it is not specified or empty) is 'no-libtool'.
+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+  dnl Argument checking.
+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+  define([gt_included_intl],
+    ifelse([$1], [external],
+      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+      [yes]))
+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
+
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  ifelse(gt_included_intl, yes, [
+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
+  ])
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
+  dnl Set USE_NLS.
+  AC_REQUIRE([AM_NLS])
+
+  ifelse(gt_included_intl, yes, [
+    BUILD_INCLUDED_LIBINTL=no
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    ifelse(gt_included_intl, yes, [
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH(included-gettext,
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
+            [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
+          ifelse(gt_included_intl, yes, , [
+            AM_ICONV_LINK
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in libintl],
+            [$gt_func_gnugettext_libintl],
+           [gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+            dnl Now see whether libintl exists and does not depend on libiconv.
+            AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+              [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
+            dnl Now see whether libintl exists and depends on libiconv.
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+                [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+               [LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
+               ])
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"])
+        fi
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+          dnl Reset the values set by searching for libintl.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    ifelse(gt_included_intl, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      CATOBJEXT=
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions to use GNU gettext tools.
+        CATOBJEXT=.gmo
+      fi
+    ])
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        AC_MSG_CHECKING([how to link with libintl])
+        AC_MSG_RESULT([$LIBINTL])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE(HAVE_GETTEXT, 1,
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE(HAVE_DCGETTEXT, 1,
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  ifelse(gt_included_intl, yes, [
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
+    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST(CATOBJEXT)
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST(DATADIRNAME)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST(INSTOBJEXT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST(GENCAT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLOBJS=
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
+      INTLOBJS="\$(GETTOBJS)"
+    fi
+    AC_SUBST(INTLOBJS)
+
+    dnl Enable libtool support if the surrounding package wishes it.
+    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+  ])
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  INTLLIBS="$LIBINTL"
+  AC_SUBST(INTLLIBS)
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST(LIBINTL)
+  AC_SUBST(LTLIBINTL)
+  AC_SUBST(POSUB)
+])
+
+
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/Build/source/utils/texinfo/gnulib/m4/gettimeofday.m4 b/Build/source/utils/texinfo/gnulib/m4/gettimeofday.m4
new file mode 100644
index 00000000000..b9bbb1081bc
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/gettimeofday.m4
@@ -0,0 +1,101 @@
+#serial 11
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+dnl From Jim Meyering.
+
+AC_DEFUN([gl_FUNC_GETTIMEOFDAY],
+[
+  AC_REQUIRE([AC_C_RESTRICT])
+  AC_REQUIRE([gl_HEADER_SYS_TIME_H])
+  AC_CHECK_FUNCS_ONCE([gettimeofday])
+
+  AC_CACHE_CHECK([for gettimeofday with POSIX signature],
+    [gl_cv_func_gettimeofday_posix_signature],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+	  [[#include <sys/time.h>
+	    struct timeval c;
+	  ]],
+	  [[
+	    int (*f) (struct timeval *restrict, void *restrict) = gettimeofday;
+	    int x = f (&c, 0);
+	    return !(x | c.tv_sec | c.tv_usec);
+	  ]])],
+	[gl_cv_func_gettimeofday_posix_signature=yes],
+	[gl_cv_func_gettimeofday_posix_signature=no])])
+
+  gl_FUNC_GETTIMEOFDAY_CLOBBER
+
+  if test $gl_cv_func_gettimeofday_posix_signature != yes; then
+    REPLACE_GETTIMEOFDAY=1
+    SYS_TIME_H=sys/time.h
+    if test $gl_cv_func_gettimeofday_clobber != yes; then
+      AC_LIBOBJ(gettimeofday)
+      gl_PREREQ_GETTIMEOFDAY
+    fi
+  fi
+])
+
+
+dnl See if gettimeofday clobbers the static buffer that localtime uses
+dnl for its return value.  The gettimeofday function from Mac OS X 10.0.4
+dnl (i.e., Darwin 1.3.7) has this problem.
+dnl
+dnl If it does, then arrange to use gettimeofday and localtime only via
+dnl the wrapper functions that work around the problem.
+
+AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
+[
+ AC_REQUIRE([gl_HEADER_SYS_TIME_H])
+
+ AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer],
+  [gl_cv_func_gettimeofday_clobber],
+  [AC_RUN_IFELSE(
+     [AC_LANG_PROGRAM(
+	[[#include <string.h>
+	  #include <sys/time.h>
+	  #include <time.h>
+	  #include <stdlib.h>
+	]],
+	[[
+	  time_t t = 0;
+	  struct tm *lt;
+	  struct tm saved_lt;
+	  struct timeval tv;
+	  lt = localtime (&t);
+	  saved_lt = *lt;
+	  gettimeofday (&tv, NULL);
+	  return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0;
+	]])],
+     [gl_cv_func_gettimeofday_clobber=no],
+     [gl_cv_func_gettimeofday_clobber=yes],
+     dnl When crosscompiling, assume it is broken.
+     [gl_cv_func_gettimeofday_clobber=yes])])
+
+ if test $gl_cv_func_gettimeofday_clobber = yes; then
+   REPLACE_GETTIMEOFDAY=1
+   SYS_TIME_H=sys/time.h
+   gl_GETTIMEOFDAY_REPLACE_LOCALTIME
+   AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], 1,
+     [Define if gettimeofday clobbers the localtime buffer.])
+ fi
+])
+
+AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [
+  AC_LIBOBJ(gettimeofday)
+  gl_PREREQ_GETTIMEOFDAY
+  AC_DEFINE([gmtime], [rpl_gmtime],
+    [Define to rpl_gmtime if the replacement function should be used.])
+  AC_DEFINE([localtime], [rpl_localtime],
+    [Define to rpl_localtime if the replacement function should be used.])
+])
+
+# Prerequisites of lib/gettimeofday.c.
+AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [
+  AC_CHECK_HEADERS([sys/timeb.h])
+  AC_CHECK_FUNCS([_ftime])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/glibc21.m4 b/Build/source/utils/texinfo/gnulib/m4/glibc21.m4
new file mode 100644
index 00000000000..d95fd986132
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/glibc21.m4
@@ -0,0 +1,30 @@
+# glibc21.m4 serial 3
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([gl_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
diff --git a/Build/source/utils/texinfo/gnulib/m4/gnulib-common.m4 b/Build/source/utils/texinfo/gnulib/m4/gnulib-common.m4
new file mode 100644
index 00000000000..3edfc120f81
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/gnulib-common.m4
@@ -0,0 +1,84 @@
+# gnulib-common.m4 serial 4
+dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# gl_COMMON
+# is expanded unconditionally through gnulib-tool magic.
+AC_DEFUN([gl_COMMON], [
+  dnl Use AC_REQUIRE here, so that the code is expanded once only.
+  AC_REQUIRE([gl_COMMON_BODY])
+])
+AC_DEFUN([gl_COMMON_BODY], [
+  AH_VERBATIM([isoc99_inline],
+[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
+   __APPLE__ && __MACH__ test for MacOS X.
+   __APPLE_CC__ tests for the Apple compiler and its version.
+   __STDC_VERSION__ tests for the C99 mode.  */
+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
+# define __GNUC_STDC_INLINE__ 1
+#endif])
+])
+
+# gl_MODULE_INDICATOR([modulename])
+# defines a C macro indicating the presence of the given module.
+AC_DEFUN([gl_MODULE_INDICATOR],
+[
+  AC_DEFINE([GNULIB_]translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
+    [Define to 1 when using the gnulib module ]$1[.])
+])
+
+# AC_PROG_MKDIR_P
+# is a backport of autoconf-2.60's AC_PROG_MKDIR_P.
+# Remove this macro when we can assume autoconf >= 2.60.
+m4_ifdef([AC_PROG_MKDIR_P], [], [
+  AC_DEFUN([AC_PROG_MKDIR_P],
+    [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+     MKDIR_P='$(mkdir_p)'
+     AC_SUBST([MKDIR_P])])])
+
+# AC_C_RESTRICT
+# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
+# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
+# works.
+# This definition can be removed once autoconf >= 2.62 can be assumed.
+AC_DEFUN([AC_C_RESTRICT],
+[AC_CACHE_CHECK([for C/C++ restrict keyword], ac_cv_c_restrict,
+  [ac_cv_c_restrict=no
+   # The order here caters to the fact that C++ does not require restrict.
+   for ac_kw in __restrict __restrict__ _Restrict restrict; do
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+      [[typedef int * int_ptr;
+	int foo (int_ptr $ac_kw ip) {
+	return ip[0];
+       }]],
+      [[int s[1];
+	int * $ac_kw t = s;
+	t[0] = 0;
+	return foo(t)]])],
+      [ac_cv_c_restrict=$ac_kw])
+     test "$ac_cv_c_restrict" != no && break
+   done
+  ])
+ AH_VERBATIM([restrict],
+[/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#undef restrict
+/* Work around a bug in Sun C++: it does not support _Restrict, even
+   though the corresponding Sun C compiler does, which causes
+   "#define restrict _Restrict" in the previous line.  Perhaps some future
+   version of Sun C++ will work with _Restrict; if so, it'll probably
+   define __RESTRICT, just as Sun C does.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+#endif])
+ case $ac_cv_c_restrict in
+   restrict) ;;
+   no) AC_DEFINE([restrict], []) ;;
+   *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
+ esac
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/gnulib-comp.m4 b/Build/source/utils/texinfo/gnulib/m4/gnulib-comp.m4
new file mode 100644
index 00000000000..64108b9b938
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/gnulib-comp.m4
@@ -0,0 +1,358 @@
+# DO NOT EDIT! GENERATED AUTOMATICALLY!
+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+#
+# This file represents the compiled summary of the specification in
+# gnulib-cache.m4. It lists the computed macro invocations that need
+# to be invoked from configure.ac.
+# In projects using CVS, this file can be treated like other built files.
+
+
+# This macro should be invoked from ./configure.ac, in the section
+# "Checks for programs", right after AC_PROG_CC, and certainly before
+# any checks for libraries, header files, types and library functions.
+AC_DEFUN([gl_EARLY],
+[
+  m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
+  m4_pattern_allow([^gl_ES$])dnl a valid locale name
+  m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
+  m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
+  AC_REQUIRE([AC_PROG_RANLIB])
+  AC_REQUIRE([AM_PROG_CC_C_O])
+  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+])
+
+# This macro should be invoked from ./configure.ac, in the section
+# "Check for header files, types and library functions".
+AC_DEFUN([gl_INIT],
+[
+  AM_CONDITIONAL([GL_COND_LIBTOOL], [false])
+  gl_cond_libtool=false
+  gl_libdeps=
+  gl_ltlibdeps=
+  m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
+  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
+  m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
+  gl_COMMON
+  gl_source_base='gnulib/lib'
+  gl_FUNC_ALLOCA
+  gl_FUNC_ARGZ
+  gl_ENVIRON
+  gl_UNISTD_MODULE_INDICATOR([environ])
+  gl_ERROR
+  m4_ifdef([AM_XGETTEXT_OPTION],
+    [AM_XGETTEXT_OPTION([--flag=error:3:c-format])
+     AM_XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
+  gl_EXITFAIL
+  gl_GETOPT
+  dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
+  AM_GNU_GETTEXT_VERSION([0.17])
+  AC_SUBST([LIBINTL])
+  AC_SUBST([LTLIBINTL])
+  gl_FUNC_GETTIMEOFDAY
+  gl_INLINE
+  gl_LOCALCHARSET
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+  AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
+  gl_FUNC_MALLOC_POSIX
+  gl_STDLIB_MODULE_INDICATOR([malloc-posix])
+  gl_MALLOCA
+  gl_MBCHAR
+  gl_FUNC_MBSCASECMP
+  gl_STRING_MODULE_INDICATOR([mbscasecmp])
+  gl_FUNC_MBSNCASECMP
+  gl_STRING_MODULE_INDICATOR([mbsncasecmp])
+  gl_MBSWIDTH
+  gl_MBITER
+  gl_FUNC_MEMCHR
+  gl_FUNC_MEMCPY
+  gl_FUNC_MEMMOVE
+  gl_FUNC_MKSTEMP
+  gl_STDLIB_MODULE_INDICATOR([mkstemp])
+  gl_FUNC_SETENV
+  gl_STDLIB_MODULE_INDICATOR([setenv])
+  AM_STDBOOL_H
+  gl_STDINT_H
+  gl_STDLIB_H
+  gl_FUNC_STRDUP
+  gl_STRING_MODULE_INDICATOR([strdup])
+  gl_FUNC_STRERROR
+  gl_STRING_MODULE_INDICATOR([strerror])
+  gl_HEADER_STRING_H
+  gl_HEADER_SYS_STAT_H
+  AC_PROG_MKDIR_P
+  gl_HEADER_SYS_TIME_H
+  AC_PROG_MKDIR_P
+  gl_FUNC_GEN_TEMPNAME
+  gl_UNISTD_H
+  gl_FUNC_UNSETENV
+  gl_STDLIB_MODULE_INDICATOR([unsetenv])
+  gl_WCHAR_H
+  gl_WCTYPE_H
+  gl_FUNC_WCWIDTH
+  gl_WCHAR_MODULE_INDICATOR([wcwidth])
+  gl_XALLOC
+  m4_popdef([AC_LIBSOURCES])
+  m4_popdef([AC_REPLACE_FUNCS])
+  m4_popdef([AC_LIBOBJ])
+  AC_CONFIG_COMMANDS_PRE([
+    gl_libobjs=
+    gl_ltlibobjs=
+    if test -n "$gl_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
+        gl_libobjs="$gl_libobjs $i.$ac_objext"
+        gl_ltlibobjs="$gl_ltlibobjs $i.lo"
+      done
+    fi
+    AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
+    AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
+  ])
+  gltests_libdeps=
+  gltests_ltlibdeps=
+  m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ]))
+  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS]))
+  m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES]))
+  gl_COMMON
+  gl_source_base='tests'
+  m4_popdef([AC_LIBSOURCES])
+  m4_popdef([AC_REPLACE_FUNCS])
+  m4_popdef([AC_LIBOBJ])
+  AC_CONFIG_COMMANDS_PRE([
+    gltests_libobjs=
+    gltests_ltlibobjs=
+    if test -n "$gltests_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
+        gltests_libobjs="$gltests_libobjs $i.$ac_objext"
+        gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
+      done
+    fi
+    AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs])
+    AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs])
+  ])
+  LIBGNU_LIBDEPS="$gl_libdeps"
+  AC_SUBST([LIBGNU_LIBDEPS])
+  LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
+  AC_SUBST([LIBGNU_LTLIBDEPS])
+])
+
+# Like AC_LIBOBJ, except that the module name goes
+# into gl_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gl_LIBOBJ], [
+  AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
+  gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
+])
+
+# m4_foreach_w is provided by autoconf-2.59c and later.
+# This definition is to accommodate developers using versions
+# of autoconf older than that.
+m4_ifndef([m4_foreach_w],
+  [m4_define([m4_foreach_w],
+    [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
+
+# Like AC_REPLACE_FUNCS, except that the module name goes
+# into gl_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gl_REPLACE_FUNCS], [
+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
+  AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
+])
+
+# Like AC_LIBSOURCES, except the directory where the source file is
+# expected is derived from the gnulib-tool parametrization,
+# and alloca is special cased (for the alloca-opt module).
+# We could also entirely rely on EXTRA_lib..._SOURCES.
+AC_DEFUN([gl_LIBSOURCES], [
+  m4_foreach([_gl_NAME], [$1], [
+    m4_if(_gl_NAME, [alloca.c], [], [
+      m4_syscmd([test -r gnulib/lib/]_gl_NAME[ || test ! -d gnulib/lib])dnl
+      m4_if(m4_sysval, [0], [],
+        [AC_FATAL([missing gnulib/lib/]_gl_NAME)])
+    ])
+  ])
+])
+
+# Like AC_LIBOBJ, except that the module name goes
+# into gltests_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gltests_LIBOBJ], [
+  AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl
+  gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext"
+])
+
+# m4_foreach_w is provided by autoconf-2.59c and later.
+# This definition is to accommodate developers using versions
+# of autoconf older than that.
+m4_ifndef([m4_foreach_w],
+  [m4_define([m4_foreach_w],
+    [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
+
+# Like AC_REPLACE_FUNCS, except that the module name goes
+# into gltests_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gltests_REPLACE_FUNCS], [
+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
+  AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)])
+])
+
+# Like AC_LIBSOURCES, except the directory where the source file is
+# expected is derived from the gnulib-tool parametrization,
+# and alloca is special cased (for the alloca-opt module).
+# We could also entirely rely on EXTRA_lib..._SOURCES.
+AC_DEFUN([gltests_LIBSOURCES], [
+  m4_foreach([_gl_NAME], [$1], [
+    m4_if(_gl_NAME, [alloca.c], [], [
+      m4_syscmd([test -r tests/]_gl_NAME[ || test ! -d tests])dnl
+      m4_if(m4_sysval, [0], [],
+        [AC_FATAL([missing tests/]_gl_NAME)])
+    ])
+  ])
+])
+
+# This macro records the list of files which have been installed by
+# gnulib-tool and may be removed by future gnulib-tool invocations.
+AC_DEFUN([gl_FILE_LIST], [
+  build-aux/config.rpath
+  build-aux/link-warning.h
+  lib/alloca.in.h
+  lib/argz.c
+  lib/argz.in.h
+  lib/config.charset
+  lib/error.c
+  lib/error.h
+  lib/exitfail.c
+  lib/exitfail.h
+  lib/getopt.c
+  lib/getopt.in.h
+  lib/getopt1.c
+  lib/getopt_int.h
+  lib/gettext.h
+  lib/gettimeofday.c
+  lib/intprops.h
+  lib/localcharset.c
+  lib/localcharset.h
+  lib/malloc.c
+  lib/malloca.c
+  lib/malloca.h
+  lib/malloca.valgrind
+  lib/mbchar.c
+  lib/mbchar.h
+  lib/mbscasecmp.c
+  lib/mbsncasecmp.c
+  lib/mbswidth.c
+  lib/mbswidth.h
+  lib/mbuiter.h
+  lib/memchr.c
+  lib/memcpy.c
+  lib/memmove.c
+  lib/mkstemp.c
+  lib/ref-add.sin
+  lib/ref-del.sin
+  lib/setenv.c
+  lib/stdbool.in.h
+  lib/stdint.in.h
+  lib/stdlib.in.h
+  lib/strdup.c
+  lib/streq.h
+  lib/strerror.c
+  lib/string.in.h
+  lib/strnlen1.c
+  lib/strnlen1.h
+  lib/sys_stat.in.h
+  lib/sys_time.in.h
+  lib/tempname.c
+  lib/tempname.h
+  lib/unistd.in.h
+  lib/unitypes.h
+  lib/uniwidth.h
+  lib/uniwidth/cjk.h
+  lib/uniwidth/width.c
+  lib/unsetenv.c
+  lib/wchar.in.h
+  lib/wctype.in.h
+  lib/wcwidth.c
+  lib/xalloc-die.c
+  lib/xalloc.h
+  lib/xmalloc.c
+  lib/xsetenv.c
+  lib/xsetenv.h
+  m4/alloca.m4
+  m4/argz.m4
+  m4/codeset.m4
+  m4/eealloc.m4
+  m4/environ.m4
+  m4/error.m4
+  m4/exitfail.m4
+  m4/extensions.m4
+  m4/getopt.m4
+  m4/gettext.m4
+  m4/gettimeofday.m4
+  m4/glibc2.m4
+  m4/glibc21.m4
+  m4/gnulib-common.m4
+  m4/iconv.m4
+  m4/include_next.m4
+  m4/inline.m4
+  m4/intdiv0.m4
+  m4/intl.m4
+  m4/intldir.m4
+  m4/intlmacosx.m4
+  m4/intmax.m4
+  m4/inttypes-pri.m4
+  m4/inttypes_h.m4
+  m4/lcmessage.m4
+  m4/lib-ld.m4
+  m4/lib-link.m4
+  m4/lib-prefix.m4
+  m4/localcharset.m4
+  m4/lock.m4
+  m4/longlong.m4
+  m4/malloc.m4
+  m4/malloca.m4
+  m4/mbchar.m4
+  m4/mbiter.m4
+  m4/mbrtowc.m4
+  m4/mbscasecmp.m4
+  m4/mbsncasecmp.m4
+  m4/mbstate_t.m4
+  m4/mbswidth.m4
+  m4/memchr.m4
+  m4/memcpy.m4
+  m4/memmove.m4
+  m4/mkstemp.m4
+  m4/nls.m4
+  m4/onceonly.m4
+  m4/po.m4
+  m4/printf-posix.m4
+  m4/progtest.m4
+  m4/setenv.m4
+  m4/size_max.m4
+  m4/stdbool.m4
+  m4/stdint.m4
+  m4/stdint_h.m4
+  m4/stdlib_h.m4
+  m4/strdup.m4
+  m4/strerror.m4
+  m4/string_h.m4
+  m4/sys_stat_h.m4
+  m4/sys_time_h.m4
+  m4/tempname.m4
+  m4/uintmax_t.m4
+  m4/unistd_h.m4
+  m4/visibility.m4
+  m4/wchar.m4
+  m4/wchar_t.m4
+  m4/wctype.m4
+  m4/wcwidth.m4
+  m4/wint_t.m4
+  m4/xalloc.m4
+  m4/xsize.m4
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/iconv.m4 b/Build/source/utils/texinfo/gnulib/m4/iconv.m4
new file mode 100644
index 00000000000..66bc76f48c9
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/iconv.m4
@@ -0,0 +1,180 @@
+# iconv.m4 serial AM6 (gettext-0.17)
+dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libiconv and not disabled its use
+  dnl via --without-libiconv-prefix, he wants to use it. The first
+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  am_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+  AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      am_cv_func_iconv=yes)
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
+      dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+        [case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac])
+      LIBS="$am_save_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1,
+      [Define if you have the iconv() function and it works.])
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    AC_MSG_CHECKING([how to link with libiconv])
+    AC_MSG_RESULT([$LIBICONV])
+  else
+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+    dnl either.
+    CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  AC_SUBST(LIBICONV)
+  AC_SUBST(LTLIBICONV)
+])
+
+AC_DEFUN([AM_ICONV],
+[
+  AM_ICONV_LINK
+  if test "$am_cv_func_iconv" = yes; then
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/include_next.m4 b/Build/source/utils/texinfo/gnulib/m4/include_next.m4
new file mode 100644
index 00000000000..a842e2a2368
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/include_next.m4
@@ -0,0 +1,110 @@
+# include_next.m4 serial 6
+dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert and Derek Price.
+
+AC_DEFUN([gl_INCLUDE_NEXT],
+[
+  AC_LANG_PREPROC_REQUIRE()
+  AC_CACHE_CHECK([whether the preprocessor supports include_next],
+    [gl_cv_have_include_next],
+    [rm -rf conftestd1 conftestd2
+     mkdir conftestd1 conftestd2
+     cat <<EOF > conftestd1/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd2/conftest.h
+#ifndef DEFINED_IN_CONFTESTD1
+#error "include_next test doesn't work"
+#endif
+#define DEFINED_IN_CONFTESTD2
+EOF
+     save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2"
+     AC_COMPILE_IFELSE([#include <conftest.h>],
+       [gl_cv_have_include_next=yes],
+       [gl_cv_have_include_next=no])
+     CPPFLAGS="$save_CPPFLAGS"
+     rm -rf conftestd1 conftestd2
+    ])
+  if test $gl_cv_have_include_next = yes; then
+
+    dnl FIXME: Remove HAVE_INCLUDE_NEXT and update everything that uses it
+    dnl to use @INCLUDE_NEXT@ instead.
+    AC_DEFINE([HAVE_INCLUDE_NEXT], 1,
+	      [Define if your compiler supports the #include_next directive.])
+
+    INCLUDE_NEXT=include_next
+  else
+    INCLUDE_NEXT=include
+  fi
+  AC_SUBST([INCLUDE_NEXT])
+])
+
+# gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...)
+# ------------------------------------------
+# For each arg foo.h, if #include_next works, define NEXT_FOO_H to be
+# '<foo.h>'; otherwise define it to be
+# '"///usr/include/foo.h"', or whatever other absolute file name is suitable.
+# That way, a header file with the following line:
+#	#@INCLUDE_NEXT@ @NEXT_FOO_H@
+# behaves (after sed substitution) as if it contained
+#	#include_next <foo.h>
+# even if the compiler does not support include_next.
+# The three "///" are to pacify Sun C 5.8, which otherwise would say
+# "warning: #include of /usr/include/... may be non-portable".
+# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
+# Note: This macro assumes that the header file is not empty after
+# preprocessing, i.e. it does not only define preprocessor macros but also
+# provides some type/enum definitions or function/variable declarations.
+AC_DEFUN([gl_CHECK_NEXT_HEADERS],
+[
+  AC_REQUIRE([gl_INCLUDE_NEXT])
+  AC_CHECK_HEADERS_ONCE([$1])
+
+  m4_foreach_w([gl_HEADER_NAME], [$1],
+    [AS_VAR_PUSHDEF([gl_next_header],
+		    [gl_cv_next_]m4_quote(m4_defn([gl_HEADER_NAME])))
+     if test $gl_cv_have_include_next = yes; then
+       AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
+     else
+       AC_CACHE_CHECK(
+	 [absolute name of <]m4_quote(m4_defn([gl_HEADER_NAME]))[>],
+	 m4_quote(m4_defn([gl_next_header])),
+	 [AS_VAR_PUSHDEF([gl_header_exists],
+			 [ac_cv_header_]m4_quote(m4_defn([gl_HEADER_NAME])))
+	  if test AS_VAR_GET(gl_header_exists) = yes; then
+	    AC_LANG_CONFTEST(
+	      [AC_LANG_SOURCE(
+		 [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
+	       )])
+	    dnl eval is necessary to expand ac_cpp.
+	    dnl Ultrix and Pyramid sh refuse to redirect output of eval,
+	    dnl so use subshell.
+	    AS_VAR_SET([gl_next_header],
+	      ['"'`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+	       sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
+		 s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
+		 s#^/[^/]#//&#
+		 p
+		 q
+	       }'`'"'])
+	  else
+	    AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
+	  fi
+	  AS_VAR_POPDEF([gl_header_exists])])
+     fi
+     AC_SUBST(
+       AS_TR_CPP([NEXT_]m4_quote(m4_defn([gl_HEADER_NAME]))),
+       [AS_VAR_GET([gl_next_header])])
+     AS_VAR_POPDEF([gl_next_header])])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/inline.m4 b/Build/source/utils/texinfo/gnulib/m4/inline.m4
new file mode 100644
index 00000000000..a07076cd6b3
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/inline.m4
@@ -0,0 +1,40 @@
+# inline.m4 serial 3
+dnl Copyright (C) 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Test for the 'inline' keyword or equivalent.
+dnl Define 'inline' to a supported equivalent, or to nothing if not supported,
+dnl like AC_C_INLINE does.  Also, define HAVE_INLINE if 'inline' or an
+dnl equivalent is effectively supported, i.e. if the compiler is likely to
+dnl drop unused 'static inline' functions.
+AC_DEFUN([gl_INLINE],
+[
+  AC_REQUIRE([AC_C_INLINE])
+  AC_CACHE_CHECK([whether the compiler generally respects inline],
+    [gl_cv_c_inline_effective],
+    [if test $ac_cv_c_inline = no; then
+       gl_cv_c_inline_effective=no
+     else
+       dnl GCC defines __NO_INLINE__ if not optimizing or if -fno-inline is
+       dnl specified.
+       dnl Use AC_COMPILE_IFELSE here, not AC_EGREP_CPP, because the result
+       dnl depends on optimization flags, which can be in CFLAGS.
+       dnl (AC_EGREP_CPP looks only at the CPPFLAGS.)
+       AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[]],
+           [[#ifdef __NO_INLINE__
+               #error "inline is not effective"
+             #endif]])],
+         [gl_cv_c_inline_effective=yes],
+         [gl_cv_c_inline_effective=no])
+     fi
+    ])
+  if test $gl_cv_c_inline_effective = yes; then
+    AC_DEFINE([HAVE_INLINE], 1,
+      [Define to 1 if the compiler supports one of the keywords
+       'inline', '__inline__', '__inline' and effectively inlines
+       functions marked as such.])
+  fi
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/intlmacosx.m4 b/Build/source/utils/texinfo/gnulib/m4/intlmacosx.m4
new file mode 100644
index 00000000000..d3f0d904d26
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/intlmacosx.m4
@@ -0,0 +1,51 @@
+# intlmacosx.m4 serial 1 (gettext-0.17)
+dnl Copyright (C) 2004-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    gt_cv_func_CFPreferencesCopyAppValue,
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/lib-ld.m4 b/Build/source/utils/texinfo/gnulib/m4/lib-ld.m4
new file mode 100644
index 00000000000..96c4e2c3396
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/lib-ld.m4
@@ -0,0 +1,110 @@
+# lib-ld.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH(gnu-ld,
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(acl_cv_path_LD,
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break ;;
+      *)
+	test "$with_gnu_ld" != yes && break ;;
+      esac
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/lib-link.m4 b/Build/source/utils/texinfo/gnulib/m4/lib-link.m4
new file mode 100644
index 00000000000..16028951051
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/lib-link.m4
@@ -0,0 +1,739 @@
+# lib-link.m4 serial 15 (gettext-0.18)
+dnl Copyright (C) 2001-2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ(2.54)
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    LIBS="$LIBS $LIB[]NAME"
+    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN([AC_LIB_FROMPACKAGE],
+[
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_frompackage_]NAME, [$2])
+  popdef([NAME])
+  pushdef([PACK],[$2])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_libsinpackage_]PACKUP,
+    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+  popdef([PACKUP])
+  popdef([PACK])
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_ARG_WITH(P_A_C_K[-prefix],
+[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
+  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$acl_hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                LIB[]NAME[]_PREFIX="$basedir"
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+  popdef([P_A_C_K])
+  popdef([PACKLIBS])
+  popdef([PACKUP])
+  popdef([PACK])
+  popdef([NAME])
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$acl_hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/lib-prefix.m4 b/Build/source/utils/texinfo/gnulib/m4/lib-prefix.m4
new file mode 100644
index 00000000000..a8684e17e3a
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/lib-prefix.m4
@@ -0,0 +1,185 @@
+# lib-prefix.m4 serial 5 (gettext-0.15)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+dnl the basename of the libdir, either "lib" or "lib64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64. The current
+  dnl practice is that on a system supporting 32-bit and 64-bit instruction
+  dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+  dnl libraries go under $prefix/lib. We determine the compiler's default
+  dnl mode by looking at the compiler's library search path. If at least
+  dnl of its elements ends in /lib64 or points to a directory whose absolute
+  dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+  dnl default, namely "lib".
+  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
+        esac
+      fi
+    done
+    IFS="$acl_save_IFS"
+  fi
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/localcharset.m4 b/Build/source/utils/texinfo/gnulib/m4/localcharset.m4
new file mode 100644
index 00000000000..b2b77338e34
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/localcharset.m4
@@ -0,0 +1,16 @@
+# localcharset.m4 serial 5
+dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_LOCALCHARSET],
+[
+  dnl Prerequisites of lib/localcharset.c.
+  AC_REQUIRE([AM_LANGINFO_CODESET])
+  AC_CHECK_DECLS_ONCE(getc_unlocked)
+
+  dnl Prerequisites of the lib/Makefile.am snippet.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_GLIBC21])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/longlong.m4 b/Build/source/utils/texinfo/gnulib/m4/longlong.m4
new file mode 100644
index 00000000000..15bf9dacadb
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/longlong.m4
@@ -0,0 +1,106 @@
+# longlong.m4 serial 13
+dnl Copyright (C) 1999-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG_INT if 'long long int' works.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
+
+# Note: If the type 'long long int' exists but is only 32 bits large
+# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
+# defined. In this case you can treat 'long long int' like 'long int'.
+
+AC_DEFUN([AC_TYPE_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
+    [AC_LINK_IFELSE(
+       [_AC_TYPE_LONG_LONG_SNIPPET],
+       [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
+	dnl If cross compiling, assume the bug isn't important, since
+	dnl nobody cross compiles for this platform as far as we know.
+	AC_RUN_IFELSE(
+	  [AC_LANG_PROGRAM(
+	     [[@%:@include <limits.h>
+	       @%:@ifndef LLONG_MAX
+	       @%:@ define HALF \
+			(1LL << (sizeof (long long int) * CHAR_BIT - 2))
+	       @%:@ define LLONG_MAX (HALF - 1 + HALF)
+	       @%:@endif]],
+	     [[long long int n = 1;
+	       int i;
+	       for (i = 0; ; i++)
+		 {
+		   long long int m = n << i;
+		   if (m >> i != n)
+		     return 1;
+		   if (LLONG_MAX / 2 < m)
+		     break;
+		 }
+	       return 0;]])],
+	  [ac_cv_type_long_long_int=yes],
+	  [ac_cv_type_long_long_int=no],
+	  [ac_cv_type_long_long_int=yes])],
+       [ac_cv_type_long_long_int=no])])
+  if test $ac_cv_type_long_long_int = yes; then
+    AC_DEFINE([HAVE_LONG_LONG_INT], 1,
+      [Define to 1 if the system has the type `long long int'.])
+  fi
+])
+
+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
+
+# Note: If the type 'unsigned long long int' exists but is only 32 bits
+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
+# will not be defined. In this case you can treat 'unsigned long long int'
+# like 'unsigned long int'.
+
+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for unsigned long long int],
+    [ac_cv_type_unsigned_long_long_int],
+    [AC_LINK_IFELSE(
+       [_AC_TYPE_LONG_LONG_SNIPPET],
+       [ac_cv_type_unsigned_long_long_int=yes],
+       [ac_cv_type_unsigned_long_long_int=no])])
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1,
+      [Define to 1 if the system has the type `unsigned long long int'.])
+  fi
+])
+
+# Expands to a C program that can be used to test for simultaneous support
+# of 'long long' and 'unsigned long long'. We don't want to say that
+# 'long long' is available if 'unsigned long long' is not, or vice versa,
+# because too many programs rely on the symmetry between signed and unsigned
+# integer types (excluding 'bool').
+AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
+[
+  AC_LANG_PROGRAM(
+    [[/* For now, do not test the preprocessor; as of 2007 there are too many
+	 implementations with broken preprocessors.  Perhaps this can
+	 be revisited in 2012.  In the meantime, code should not expect
+	 #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+		     ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+		     ? 1 : -1)];
+      int i = 63;]],
+    [[/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+	      | (llmax / ll) | (llmax % ll)
+	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+	      | (ullmax / ull) | (ullmax % ull));]])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/malloc.m4 b/Build/source/utils/texinfo/gnulib/m4/malloc.m4
new file mode 100644
index 00000000000..764f2a9fa19
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/malloc.m4
@@ -0,0 +1,41 @@
+# malloc.m4 serial 8
+dnl Copyright (C) 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# gl_FUNC_MALLOC_POSIX
+# --------------------
+# Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it
+# fails), and replace malloc if it is not.
+AC_DEFUN([gl_FUNC_MALLOC_POSIX],
+[
+  AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
+  if test $gl_cv_func_malloc_posix = yes; then
+    HAVE_MALLOC_POSIX=1
+    AC_DEFINE([HAVE_MALLOC_POSIX], 1,
+      [Define if the 'malloc' function is POSIX compliant.])
+  else
+    AC_LIBOBJ([malloc])
+    HAVE_MALLOC_POSIX=0
+  fi
+  AC_SUBST([HAVE_MALLOC_POSIX])
+])
+
+# Test whether malloc, realloc, calloc are POSIX compliant,
+# Set gl_cv_func_malloc_posix to yes or no accordingly.
+AC_DEFUN([gl_CHECK_MALLOC_POSIX],
+[
+  AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant],
+    [gl_cv_func_malloc_posix],
+    [
+      dnl It is too dangerous to try to allocate a large amount of memory:
+      dnl some systems go to their knees when you do that. So assume that
+      dnl all Unix implementations of the function are POSIX compliant.
+      AC_TRY_COMPILE([],
+        [#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+         choke me
+         #endif
+        ], [gl_cv_func_malloc_posix=yes], [gl_cv_func_malloc_posix=no])
+    ])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/malloca.m4 b/Build/source/utils/texinfo/gnulib/m4/malloca.m4
new file mode 100644
index 00000000000..2841ae83a74
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/malloca.m4
@@ -0,0 +1,14 @@
+# malloca.m4 serial 1
+dnl Copyright (C) 2003-2004, 2006-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_MALLOCA],
+[
+  dnl Use the autoconf tests for alloca(), but not the AC_SUBSTed variables
+  dnl @ALLOCA@ and @LTALLOCA@.
+  dnl gl_FUNC_ALLOCA   dnl Already brought in by the module dependencies.
+  AC_REQUIRE([gl_EEMALLOC])
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/mbchar.m4 b/Build/source/utils/texinfo/gnulib/m4/mbchar.m4
new file mode 100644
index 00000000000..e73e2b4befb
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/mbchar.m4
@@ -0,0 +1,13 @@
+# mbchar.m4 serial 7
+dnl Copyright (C) 2005-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl autoconf tests required for use of mbchar.m4
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_MBCHAR],
+[
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/mbiter.m4 b/Build/source/utils/texinfo/gnulib/m4/mbiter.m4
new file mode 100644
index 00000000000..7d51af10dc5
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/mbiter.m4
@@ -0,0 +1,17 @@
+# mbiter.m4 serial 2
+dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl autoconf tests required for use of mbiter.h
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_MBITER],
+[
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  dnl The following line is that so the user can test HAVE_MBRTOWC before
+  dnl #include "mbiter.h" or "mbuiter.h".
+  AC_REQUIRE([gl_FUNC_MBRTOWC])
+  :
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/mbrtowc.m4 b/Build/source/utils/texinfo/gnulib/m4/mbrtowc.m4
new file mode 100644
index 00000000000..a3bd9114c39
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/mbrtowc.m4
@@ -0,0 +1,31 @@
+# mbrtowc.m4 serial 8
+dnl Copyright (C) 2001-2002, 2004-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert
+
+dnl This file can be removed, and gl_FUNC_MBRTOWC replaced with
+dnl AC_FUNC_MBRTOWC, when autoconf 2.60 can be assumed everywhere.
+
+AC_DEFUN([gl_FUNC_MBRTOWC],
+[
+  dnl Same as AC_FUNC_MBRTOWC in autoconf-2.60.
+  AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
+    gl_cv_func_mbrtowc,
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+            [[#include <wchar.h>]],
+            [[wchar_t wc;
+              char const s[] = "";
+              size_t n = 1;
+              mbstate_t state;
+              return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));]])],
+       gl_cv_func_mbrtowc=yes,
+       gl_cv_func_mbrtowc=no)])
+  if test $gl_cv_func_mbrtowc = yes; then
+    AC_DEFINE([HAVE_MBRTOWC], 1,
+      [Define to 1 if mbrtowc and mbstate_t are properly declared.])
+  fi
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/mbscasecmp.m4 b/Build/source/utils/texinfo/gnulib/m4/mbscasecmp.m4
new file mode 100644
index 00000000000..73577699383
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/mbscasecmp.m4
@@ -0,0 +1,16 @@
+# mbscasecmp.m4 serial 1
+dnl Copyright (C) 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_MBSCASECMP],
+[
+  gl_PREREQ_MBSCASECMP
+])
+
+# Prerequisites of lib/mbscasecmp.c.
+AC_DEFUN([gl_PREREQ_MBSCASECMP], [
+  AC_REQUIRE([gl_FUNC_MBRTOWC])
+  :
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/mbsncasecmp.m4 b/Build/source/utils/texinfo/gnulib/m4/mbsncasecmp.m4
new file mode 100644
index 00000000000..e59032034c5
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/mbsncasecmp.m4
@@ -0,0 +1,16 @@
+# mbsncasecmp.m4 serial 1
+dnl Copyright (C) 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_MBSNCASECMP],
+[
+  gl_PREREQ_MBSNCASECMP
+])
+
+# Prerequisites of lib/mbsncasecmp.c.
+AC_DEFUN([gl_PREREQ_MBSNCASECMP], [
+  AC_REQUIRE([gl_FUNC_MBRTOWC])
+  :
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/mbstate_t.m4 b/Build/source/utils/texinfo/gnulib/m4/mbstate_t.m4
new file mode 100644
index 00000000000..0da32b6b48b
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/mbstate_t.m4
@@ -0,0 +1,30 @@
+# mbstate_t.m4 serial 10
+dnl Copyright (C) 2000-2002, 2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# From Paul Eggert.
+
+# BeOS 5 has <wchar.h> but does not define mbstate_t,
+# so you can't declare an object of that type.
+# Check for this incompatibility with Standard C.
+
+# AC_TYPE_MBSTATE_T
+# -----------------
+AC_DEFUN([AC_TYPE_MBSTATE_T],
+  [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t,
+     [AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM(
+	   [AC_INCLUDES_DEFAULT[
+#	    include <wchar.h>]],
+	   [[mbstate_t x; return sizeof x;]])],
+	[ac_cv_type_mbstate_t=yes],
+	[ac_cv_type_mbstate_t=no])])
+   if test $ac_cv_type_mbstate_t = yes; then
+     AC_DEFINE([HAVE_MBSTATE_T], 1,
+	       [Define to 1 if <wchar.h> declares mbstate_t.])
+   else
+     AC_DEFINE([mbstate_t], int,
+	       [Define to a type if <wchar.h> does not define.])
+   fi])
diff --git a/Build/source/utils/texinfo/gnulib/m4/mbswidth.m4 b/Build/source/utils/texinfo/gnulib/m4/mbswidth.m4
new file mode 100644
index 00000000000..241865fb436
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/mbswidth.m4
@@ -0,0 +1,42 @@
+# mbswidth.m4 serial 14
+dnl Copyright (C) 2000-2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl autoconf tests required for use of mbswidth.c
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_MBSWIDTH],
+[
+  AC_CHECK_HEADERS_ONCE([wchar.h])
+  AC_CHECK_FUNCS_ONCE([isascii mbsinit])
+  gl_FUNC_MBRTOWC
+
+  dnl UnixWare 7.1.1 <wchar.h> has a declaration of a function mbswidth()
+  dnl that clashes with ours.
+  AC_CACHE_CHECK([whether mbswidth is declared in <wchar.h>],
+    ac_cv_have_decl_mbswidth,
+    [AC_TRY_COMPILE([
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+], [
+  char *p = (char *) mbswidth;
+  return !p;
+], ac_cv_have_decl_mbswidth=yes, ac_cv_have_decl_mbswidth=no)])
+  if test $ac_cv_have_decl_mbswidth = yes; then
+    ac_val=1
+  else
+    ac_val=0
+  fi
+  AC_DEFINE_UNQUOTED(HAVE_DECL_MBSWIDTH_IN_WCHAR_H, $ac_val,
+    [Define to 1 if you have a declaration of mbswidth() in <wchar.h>, and to 0 otherwise.])
+
+  AC_TYPE_MBSTATE_T
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/memchr.m4 b/Build/source/utils/texinfo/gnulib/m4/memchr.m4
new file mode 100644
index 00000000000..91b8636eb86
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/memchr.m4
@@ -0,0 +1,18 @@
+# memchr.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_MEMCHR],
+[
+  AC_REPLACE_FUNCS(memchr)
+  if test $ac_cv_func_memchr = no; then
+    gl_PREREQ_MEMCHR
+  fi
+])
+
+# Prerequisites of lib/memchr.c.
+AC_DEFUN([gl_PREREQ_MEMCHR], [
+  AC_CHECK_HEADERS(bp-sym.h)
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/memcpy.m4 b/Build/source/utils/texinfo/gnulib/m4/memcpy.m4
new file mode 100644
index 00000000000..3edc62e466b
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/memcpy.m4
@@ -0,0 +1,18 @@
+# memcpy.m4 serial 2
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_MEMCPY],
+[
+  AC_REPLACE_FUNCS(memcpy)
+  if test $ac_cv_func_memcpy = no; then
+    gl_PREREQ_MEMCPY
+  fi
+])
+
+# Prerequisites of lib/memcpy.c.
+AC_DEFUN([gl_PREREQ_MEMCPY], [
+  :
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/memmove.m4 b/Build/source/utils/texinfo/gnulib/m4/memmove.m4
new file mode 100644
index 00000000000..66054e4416a
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/memmove.m4
@@ -0,0 +1,18 @@
+# memmove.m4 serial 2
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_MEMMOVE],
+[
+  AC_REPLACE_FUNCS(memmove)
+  if test $ac_cv_func_memmove = no; then
+    gl_PREREQ_MEMMOVE
+  fi
+])
+
+# Prerequisites of lib/memmove.c.
+AC_DEFUN([gl_PREREQ_MEMMOVE], [
+  :
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/mkstemp.m4 b/Build/source/utils/texinfo/gnulib/m4/mkstemp.m4
new file mode 100644
index 00000000000..20d8a1b7015
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/mkstemp.m4
@@ -0,0 +1,56 @@
+#serial 17
+
+# Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a
+# silly limit that it can create no more than 26 files from a given template.
+# Other systems lack mkstemp altogether.
+# On OSF1/Tru64 V4.0F, the system-provided mkstemp function can create
+# only 32 files per process.
+# On systems like the above, arrange to use the replacement function.
+AC_DEFUN([gl_FUNC_MKSTEMP],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([AC_SYS_LARGEFILE])
+
+  AC_CACHE_CHECK([for working mkstemp],
+    [gl_cv_func_working_mkstemp],
+    [
+      mkdir conftest.mkstemp
+      AC_RUN_IFELSE(
+	[AC_LANG_PROGRAM(
+	  [AC_INCLUDES_DEFAULT],
+	  [[int i;
+	    off_t large = (off_t) 4294967295u;
+	    if (large < 0)
+	      large = 2147483647;
+	    for (i = 0; i < 70; i++)
+	      {
+		char templ[] = "conftest.mkstemp/coXXXXXX";
+		int (*mkstemp_function) (char *) = mkstemp;
+		int fd = mkstemp_function (templ);
+		if (fd < 0 || lseek (fd, large, SEEK_SET) != large)
+		  return 1;
+		close (fd);
+	      }
+	    return 0;]])],
+	[gl_cv_func_working_mkstemp=yes],
+	[gl_cv_func_working_mkstemp=no],
+	[gl_cv_func_working_mkstemp=no])
+      rm -rf conftest.mkstemp
+    ])
+
+  if test $gl_cv_func_working_mkstemp != yes; then
+    REPLACE_MKSTEMP=1
+    AC_LIBOBJ([mkstemp])
+    gl_PREREQ_MKSTEMP
+  fi
+])
+
+# Prerequisites of lib/mkstemp.c.
+AC_DEFUN([gl_PREREQ_MKSTEMP],
+[
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/nls.m4 b/Build/source/utils/texinfo/gnulib/m4/nls.m4
new file mode 100644
index 00000000000..7967cc2f9ac
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/nls.m4
@@ -0,0 +1,31 @@
+# nls.m4 serial 3 (gettext-0.15)
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ(2.50)
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE(nls,
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT($USE_NLS)
+  AC_SUBST(USE_NLS)
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/onceonly.m4 b/Build/source/utils/texinfo/gnulib/m4/onceonly.m4
new file mode 100644
index 00000000000..2bf1590d59c
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/onceonly.m4
@@ -0,0 +1,87 @@
+# onceonly.m4 serial 5
+dnl Copyright (C) 2002-2003, 2005-2006, 2008 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl This file defines some "once only" variants of standard autoconf macros.
+dnl   AC_CHECK_HEADERS_ONCE          like  AC_CHECK_HEADERS
+dnl   AC_CHECK_FUNCS_ONCE            like  AC_CHECK_FUNCS
+dnl   AC_CHECK_DECLS_ONCE            like  AC_CHECK_DECLS
+dnl   AC_REQUIRE([AC_FUNC_STRCOLL])  like  AC_FUNC_STRCOLL
+dnl The advantage is that the check for each of the headers/functions/decls
+dnl will be put only once into the 'configure' file. It keeps the size of
+dnl the 'configure' file down, and avoids redundant output when 'configure'
+dnl is run.
+dnl The drawback is that the checks cannot be conditionalized. If you write
+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
+dnl function.
+
+dnl This is like onceonly.m4, except that it uses diversions to named sections
+dnl DEFAULTS and INIT_PREPARE in order to check all requested headers at once,
+dnl thus reducing the size of 'configure'. Works with autoconf-2.57. The
+dnl size reduction is ca. 9%.
+
+dnl Autoconf version 2.59 plus gnulib is required; this file is not needed
+dnl with Autoconf 2.60 or greater.
+AC_PREREQ([2.59])
+
+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
+  :
+  m4_foreach_w([gl_HEADER_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                 [./-], [___])), [
+      m4_divert_text([INIT_PREPARE],
+        [gl_header_list="$gl_header_list gl_HEADER_NAME"])
+      gl_HEADERS_EXPANSION
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])),
+        [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.])
+    ])
+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                   [./-], [___])))
+  ])
+])
+m4_define([gl_HEADERS_EXPANSION], [
+  m4_divert_text([DEFAULTS], [gl_header_list=])
+  AC_CHECK_HEADERS([$gl_header_list])
+  m4_define([gl_HEADERS_EXPANSION], [])
+])
+
+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
+  :
+  m4_foreach_w([gl_FUNC_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
+      m4_divert_text([INIT_PREPARE],
+        [gl_func_list="$gl_func_list gl_FUNC_NAME"])
+      gl_FUNCS_EXPANSION
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_FUNC_NAME])),
+        [Define to 1 if you have the `]m4_defn([gl_FUNC_NAME])[' function.])
+    ])
+    AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
+  ])
+])
+m4_define([gl_FUNCS_EXPANSION], [
+  m4_divert_text([DEFAULTS], [gl_func_list=])
+  AC_CHECK_FUNCS([$gl_func_list])
+  m4_define([gl_FUNCS_EXPANSION], [])
+])
+
+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
+# AC_CHECK_DECLS(DECL1, DECL2, ...).
+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
+  :
+  m4_foreach_w([gl_DECL_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
+  ])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/po.m4 b/Build/source/utils/texinfo/gnulib/m4/po.m4
new file mode 100644
index 00000000000..0734762ab10
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/po.m4
@@ -0,0 +1,449 @@
+# po.m4 serial 15 (gettext-0.17)
+dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ(2.50)
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([GMSGFMT_015])
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([XGETTEXT_015])
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST([localedir])
+
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+  AC_CONFIG_COMMANDS([po-directories], [[
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done]],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake < 1.5.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+  # When this code is run, in config.status, two variables have already been
+  # set:
+  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+  # - LINGUAS is the value of the environment variable LINGUAS at configure
+  #   time.
+
+changequote(,)dnl
+  # Adjust a relative srcdir.
+  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  # In autoconf-2.13 it is called $ac_given_srcdir.
+  # In autoconf-2.50 it is called $srcdir.
+  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  case "$ac_given_srcdir" in
+    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+    /*) top_srcdir="$ac_given_srcdir" ;;
+    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  # Find a way to echo strings without interpreting backslash.
+  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+    gt_echo='echo'
+  else
+    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+      gt_echo='printf %s\n'
+    else
+      echo_func () {
+        cat <<EOT
+$*
+EOT
+      }
+      gt_echo='echo_func'
+    fi
+  fi
+
+  # A sed script that extracts the value of VARIABLE from a Makefile.
+  sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^[	 ]*VARIABLE[	 ]*=/{
+  # Seen the first line of the variable definition.
+  s/^[	 ]*VARIABLE[	 ]*=//
+  ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+  # Set POTFILES to the value of the Makefile variable POTFILES.
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+  # Compute POTFILES_DEPS as
+  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+  POTFILES_DEPS=
+  for file in $POTFILES; do
+    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+  done
+  POMAKEFILEDEPS=""
+
+  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+    # The LINGUAS file contains the set of available languages.
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+  else
+    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+  fi
+  # Hide the ALL_LINGUAS assigment from automake < 1.5.
+  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+  # Compute POFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+  # Compute UPDATEPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+  # Compute DUMMYPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+  # Compute GMOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+  # Compute PROPERTIESFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+  # Compute CLASSFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+  # Compute QMFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+  # Compute MSGFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+  # Compute RESOURCESDLLFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+  case "$ac_given_srcdir" in
+    .) srcdirpre= ;;
+    *) srcdirpre='$(srcdir)/' ;;
+  esac
+  POFILES=
+  UPDATEPOFILES=
+  DUMMYPOFILES=
+  GMOFILES=
+  PROPERTIESFILES=
+  CLASSFILES=
+  QMFILES=
+  MSGFILES=
+  RESOURCESDLLFILES=
+  for lang in $ALL_LINGUAS; do
+    POFILES="$POFILES $srcdirpre$lang.po"
+    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+    QMFILES="$QMFILES $srcdirpre$lang.qm"
+    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+  done
+  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+  # environment variable.
+  INST_LINGUAS=
+  if test -n "$ALL_LINGUAS"; then
+    for presentlang in $ALL_LINGUAS; do
+      useit=no
+      if test "%UNSET%" != "$LINGUAS"; then
+        desiredlanguages="$LINGUAS"
+      else
+        desiredlanguages="$ALL_LINGUAS"
+      fi
+      for desiredlang in $desiredlanguages; do
+        # Use the presentlang catalog if desiredlang is
+        #   a. equal to presentlang, or
+        #   b. a variant of presentlang (because in this case,
+        #      presentlang can be used as a fallback for messages
+        #      which are not translated in the desiredlang catalog).
+        case "$desiredlang" in
+          "$presentlang"*) useit=yes;;
+        esac
+      done
+      if test $useit = yes; then
+        INST_LINGUAS="$INST_LINGUAS $presentlang"
+      fi
+    done
+  fi
+  CATALOGS=
+  JAVACATALOGS=
+  QTCATALOGS=
+  TCLCATALOGS=
+  CSHARPCATALOGS=
+  if test -n "$INST_LINGUAS"; then
+    for lang in $INST_LINGUAS; do
+      CATALOGS="$CATALOGS $lang.gmo"
+      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+      QTCATALOGS="$QTCATALOGS $lang.qm"
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+    done
+  fi
+
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if test -n "$POMAKEFILEDEPS"; then
+    cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+  fi
+  mv "$ac_file.tmp" "$ac_file"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/progtest.m4 b/Build/source/utils/texinfo/gnulib/m4/progtest.m4
new file mode 100644
index 00000000000..a56365cd37f
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/progtest.m4
@@ -0,0 +1,92 @@
+# progtest.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+AC_PREREQ(2.50)
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+    ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/setenv.m4 b/Build/source/utils/texinfo/gnulib/m4/setenv.m4
new file mode 100644
index 00000000000..7af13d72416
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/setenv.m4
@@ -0,0 +1,71 @@
+# setenv.m4 serial 10
+dnl Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_SETENV],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([setenv])
+  if test $ac_cv_func_setenv = no; then
+    HAVE_SETENV=0
+    AC_LIBOBJ([setenv])
+    gl_PREREQ_SETENV
+  fi
+])
+
+# Like gl_FUNC_SETENV, except prepare for separate compilation (no AC_LIBOBJ).
+AC_DEFUN([gl_FUNC_SETENV_SEPARATE],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([setenv])
+  if test $ac_cv_func_setenv = no; then
+    HAVE_SETENV=0
+  fi
+  gl_PREREQ_SETENV
+])
+
+AC_DEFUN([gl_FUNC_UNSETENV],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_CHECK_FUNCS([unsetenv])
+  if test $ac_cv_func_unsetenv = no; then
+    HAVE_UNSETENV=0
+    AC_LIBOBJ([unsetenv])
+    gl_PREREQ_UNSETENV
+  else
+    AC_CACHE_CHECK([for unsetenv() return type], gt_cv_func_unsetenv_ret,
+      [AC_TRY_COMPILE([#include <stdlib.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+int unsetenv (const char *name);
+#else
+int unsetenv();
+#endif
+], , gt_cv_func_unsetenv_ret='int', gt_cv_func_unsetenv_ret='void')])
+    if test $gt_cv_func_unsetenv_ret = 'void'; then
+      VOID_UNSETENV=1
+    fi
+  fi
+])
+
+# Prerequisites of lib/setenv.c.
+AC_DEFUN([gl_PREREQ_SETENV],
+[
+  AC_REQUIRE([AC_FUNC_ALLOCA])
+  AC_REQUIRE([gl_ENVIRON])
+  AC_CHECK_HEADERS_ONCE(unistd.h)
+  AC_CHECK_HEADERS(search.h)
+  AC_CHECK_FUNCS(tsearch)
+])
+
+# Prerequisites of lib/unsetenv.c.
+AC_DEFUN([gl_PREREQ_UNSETENV],
+[
+  AC_REQUIRE([gl_ENVIRON])
+  AC_CHECK_HEADERS_ONCE(unistd.h)
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/stdbool.m4 b/Build/source/utils/texinfo/gnulib/m4/stdbool.m4
new file mode 100644
index 00000000000..2204ecd9840
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/stdbool.m4
@@ -0,0 +1,115 @@
+# Check for stdbool.h that conforms to C99.
+
+dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Prepare for substituting <stdbool.h> if it is not supported.
+
+AC_DEFUN([AM_STDBOOL_H],
+[
+  AC_REQUIRE([AC_HEADER_STDBOOL])
+
+  # Define two additional variables used in the Makefile substitution.
+
+  if test "$ac_cv_header_stdbool_h" = yes; then
+    STDBOOL_H=''
+  else
+    STDBOOL_H='stdbool.h'
+  fi
+  AC_SUBST([STDBOOL_H])
+
+  if test "$ac_cv_type__Bool" = yes; then
+    HAVE__BOOL=1
+  else
+    HAVE__BOOL=0
+  fi
+  AC_SUBST([HAVE__BOOL])
+])
+
+# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.
+AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])
+
+# This macro is only needed in autoconf <= 2.59.  Newer versions of autoconf
+# have this macro built-in.
+
+AC_DEFUN([AC_HEADER_STDBOOL],
+  [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
+     [ac_cv_header_stdbool_h],
+     [AC_TRY_COMPILE(
+	[
+	  #include <stdbool.h>
+	  #ifndef bool
+	   "error: bool is not defined"
+	  #endif
+	  #ifndef false
+	   "error: false is not defined"
+	  #endif
+	  #if false
+	   "error: false is not 0"
+	  #endif
+	  #ifndef true
+	   "error: true is not defined"
+	  #endif
+	  #if true != 1
+	   "error: true is not 1"
+	  #endif
+	  #ifndef __bool_true_false_are_defined
+	   "error: __bool_true_false_are_defined is not defined"
+	  #endif
+
+	  struct s { _Bool s: 1; _Bool t; } s;
+
+	  char a[true == 1 ? 1 : -1];
+	  char b[false == 0 ? 1 : -1];
+	  char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+	  char d[(bool) 0.5 == true ? 1 : -1];
+	  bool e = &s;
+	  char f[(_Bool) 0.0 == false ? 1 : -1];
+	  char g[true];
+	  char h[sizeof (_Bool)];
+	  char i[sizeof s.t];
+	  enum { j = false, k = true, l = false * true, m = true * 256 };
+	  _Bool n[m];
+	  char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+	  char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+	  #if defined __xlc__ || defined __GNUC__
+	   /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+	      reported by James Lemley on 2005-10-05; see
+	      http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+	      This test is not quite right, since xlc is allowed to
+	      reject this program, as the initializer for xlcbug is
+	      not one of the forms that C requires support for.
+	      However, doing the test right would require a run-time
+	      test, and that would make cross-compilation harder.
+	      Let us hope that IBM fixes the xlc bug, and also adds
+	      support for this kind of constant expression.  In the
+	      meantime, this test will reject xlc, which is OK, since
+	      our stdbool.h substitute should suffice.  We also test
+	      this with GCC, where it should work, to detect more
+	      quickly whether someone messes up the test in the
+	      future.  */
+	   char digs[] = "0123456789";
+	   int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+	  #endif
+	  /* Catch a bug in an HP-UX C compiler.  See
+	     http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+	     http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+	   */
+	  _Bool q = true;
+	  _Bool *pq = &q;
+	],
+	[
+	  *pq |= q;
+	  *pq |= ! q;
+	  /* Refer to every declared value, to avoid compiler optimizations.  */
+	  return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+		  + !m + !n + !o + !p + !q + !pq);
+	],
+	[ac_cv_header_stdbool_h=yes],
+	[ac_cv_header_stdbool_h=no])])
+   AC_CHECK_TYPES([_Bool])
+   if test $ac_cv_header_stdbool_h = yes; then
+     AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.])
+   fi])
diff --git a/Build/source/utils/texinfo/gnulib/m4/stdint.m4 b/Build/source/utils/texinfo/gnulib/m4/stdint.m4
new file mode 100644
index 00000000000..b2556925670
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/stdint.m4
@@ -0,0 +1,395 @@
+# stdint.m4 serial 31
+dnl Copyright (C) 2001-2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert and Bruno Haible.
+dnl Test whether <stdint.h> is supported or must be substituted.
+
+AC_DEFUN([gl_STDINT_H],
+[
+  AC_PREREQ(2.59)dnl
+
+  dnl Check for long long int and unsigned long long int.
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
+  if test $ac_cv_type_long_long_int = yes; then
+    HAVE_LONG_LONG_INT=1
+  else
+    HAVE_LONG_LONG_INT=0
+  fi
+  AC_SUBST([HAVE_LONG_LONG_INT])
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    HAVE_UNSIGNED_LONG_LONG_INT=1
+  else
+    HAVE_UNSIGNED_LONG_LONG_INT=0
+  fi
+  AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT])
+
+  dnl Check for <inttypes.h>.
+  dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h.
+  if test $ac_cv_header_inttypes_h = yes; then
+    HAVE_INTTYPES_H=1
+  else
+    HAVE_INTTYPES_H=0
+  fi
+  AC_SUBST([HAVE_INTTYPES_H])
+
+  dnl Check for <sys/types.h>.
+  dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_sys_types_h.
+  if test $ac_cv_header_sys_types_h = yes; then
+    HAVE_SYS_TYPES_H=1
+  else
+    HAVE_SYS_TYPES_H=0
+  fi
+  AC_SUBST([HAVE_SYS_TYPES_H])
+
+  gl_CHECK_NEXT_HEADERS([stdint.h])
+  if test $ac_cv_header_stdint_h = yes; then
+    HAVE_STDINT_H=1
+  else
+    HAVE_STDINT_H=0
+  fi
+  AC_SUBST([HAVE_STDINT_H])
+
+  dnl Now see whether we need a substitute <stdint.h>.
+  if test $ac_cv_header_stdint_h = yes; then
+    AC_CACHE_CHECK([whether stdint.h conforms to C99],
+      [gl_cv_header_working_stdint_h],
+      [gl_cv_header_working_stdint_h=no
+       AC_COMPILE_IFELSE([
+         AC_LANG_PROGRAM([[
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#endif
+]
+gl_STDINT_INCLUDES
+[
+#ifdef INT8_MAX
+int8_t a1 = INT8_MAX;
+int8_t a1min = INT8_MIN;
+#endif
+#ifdef INT16_MAX
+int16_t a2 = INT16_MAX;
+int16_t a2min = INT16_MIN;
+#endif
+#ifdef INT32_MAX
+int32_t a3 = INT32_MAX;
+int32_t a3min = INT32_MIN;
+#endif
+#ifdef INT64_MAX
+int64_t a4 = INT64_MAX;
+int64_t a4min = INT64_MIN;
+#endif
+#ifdef UINT8_MAX
+uint8_t b1 = UINT8_MAX;
+#else
+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
+#endif
+#ifdef UINT16_MAX
+uint16_t b2 = UINT16_MAX;
+#endif
+#ifdef UINT32_MAX
+uint32_t b3 = UINT32_MAX;
+#endif
+#ifdef UINT64_MAX
+uint64_t b4 = UINT64_MAX;
+#endif
+int_least8_t c1 = INT8_C (0x7f);
+int_least8_t c1max = INT_LEAST8_MAX;
+int_least8_t c1min = INT_LEAST8_MIN;
+int_least16_t c2 = INT16_C (0x7fff);
+int_least16_t c2max = INT_LEAST16_MAX;
+int_least16_t c2min = INT_LEAST16_MIN;
+int_least32_t c3 = INT32_C (0x7fffffff);
+int_least32_t c3max = INT_LEAST32_MAX;
+int_least32_t c3min = INT_LEAST32_MIN;
+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
+int_least64_t c4max = INT_LEAST64_MAX;
+int_least64_t c4min = INT_LEAST64_MIN;
+uint_least8_t d1 = UINT8_C (0xff);
+uint_least8_t d1max = UINT_LEAST8_MAX;
+uint_least16_t d2 = UINT16_C (0xffff);
+uint_least16_t d2max = UINT_LEAST16_MAX;
+uint_least32_t d3 = UINT32_C (0xffffffff);
+uint_least32_t d3max = UINT_LEAST32_MAX;
+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
+uint_least64_t d4max = UINT_LEAST64_MAX;
+int_fast8_t e1 = INT_FAST8_MAX;
+int_fast8_t e1min = INT_FAST8_MIN;
+int_fast16_t e2 = INT_FAST16_MAX;
+int_fast16_t e2min = INT_FAST16_MIN;
+int_fast32_t e3 = INT_FAST32_MAX;
+int_fast32_t e3min = INT_FAST32_MIN;
+int_fast64_t e4 = INT_FAST64_MAX;
+int_fast64_t e4min = INT_FAST64_MIN;
+uint_fast8_t f1 = UINT_FAST8_MAX;
+uint_fast16_t f2 = UINT_FAST16_MAX;
+uint_fast32_t f3 = UINT_FAST32_MAX;
+uint_fast64_t f4 = UINT_FAST64_MAX;
+#ifdef INTPTR_MAX
+intptr_t g = INTPTR_MAX;
+intptr_t gmin = INTPTR_MIN;
+#endif
+#ifdef UINTPTR_MAX
+uintptr_t h = UINTPTR_MAX;
+#endif
+intmax_t i = INTMAX_MAX;
+uintmax_t j = UINTMAX_MAX;
+
+#include <limits.h> /* for CHAR_BIT */
+#define TYPE_MINIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+#define TYPE_MAXIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+struct s {
+  int check_PTRDIFF:
+      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
+      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
+      ? 1 : -1;
+  /* Detect bug in FreeBSD 6.0 / ia64.  */
+  int check_SIG_ATOMIC:
+      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
+      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
+      ? 1 : -1;
+  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
+  int check_WCHAR:
+      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
+      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
+      ? 1 : -1;
+  /* Detect bug in mingw.  */
+  int check_WINT:
+      WINT_MIN == TYPE_MINIMUM (wint_t)
+      && WINT_MAX == TYPE_MAXIMUM (wint_t)
+      ? 1 : -1;
+
+  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
+  int check_UINT8_C:
+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+  int check_UINT16_C:
+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
+
+  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
+#ifdef UINT8_MAX
+  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#endif
+#ifdef UINT16_MAX
+  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#endif
+#ifdef UINT32_MAX
+  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+#endif
+#ifdef UINT64_MAX
+  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
+#endif
+  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
+  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
+  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
+  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
+  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
+  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
+  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
+  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
+  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
+  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
+  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
+};
+         ]])],
+         [gl_cv_header_working_stdint_h=yes])])
+  fi
+  if test "$gl_cv_header_working_stdint_h" = yes; then
+    STDINT_H=
+  else
+    dnl Check for <sys/inttypes.h>, and for
+    dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
+    AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h])
+    if test $ac_cv_header_sys_inttypes_h = yes; then
+      HAVE_SYS_INTTYPES_H=1
+    else
+      HAVE_SYS_INTTYPES_H=0
+    fi
+    AC_SUBST([HAVE_SYS_INTTYPES_H])
+    if test $ac_cv_header_sys_bitypes_h = yes; then
+      HAVE_SYS_BITYPES_H=1
+    else
+      HAVE_SYS_BITYPES_H=0
+    fi
+    AC_SUBST([HAVE_SYS_BITYPES_H])
+
+    dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
+    dnl character support).
+    AC_CHECK_HEADERS_ONCE([wchar.h])
+
+    gl_STDINT_TYPE_PROPERTIES
+    STDINT_H=stdint.h
+  fi
+  AC_SUBST(STDINT_H)
+])
+
+dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)
+dnl Determine the size of each of the given types in bits.
+AC_DEFUN([gl_STDINT_BITSIZEOF],
+[
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+       [Define to the number of bits in type ']gltype['.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
+      [AC_COMPUTE_INT([result], [sizeof ($gltype) * CHAR_BIT],
+         [$2
+#include <limits.h>], [result=unknown])
+       eval gl_cv_bitsizeof_${gltype}=\$result
+      ])
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+      dnl Use a nonempty default, because some compilers, such as IRIX 5 cc,
+      dnl do a syntax check even on unused #if conditions and give an error
+      dnl on valid C code like this:
+      dnl   #if 0
+      dnl   # if  > 32
+      dnl   # endif
+      dnl   #endif
+      result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    AC_DEFINE_UNQUOTED([BITSIZEOF_${GLTYPE}], [$result])
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+])
+
+dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES)
+dnl Determine the signedness of each of the given types.
+dnl Define HAVE_SIGNED_TYPE if type is signed.
+AC_DEFUN([gl_CHECK_TYPES_SIGNED],
+[
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+       [Define to 1 if ']gltype[' is a signed integer type.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([$2[
+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];]])],
+         result=yes, result=no)
+       eval gl_cv_type_${gltype}_signed=\$result
+      ])
+    eval result=\$gl_cv_type_${gltype}_signed
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    if test "$result" = yes; then
+      AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], 1)
+      eval HAVE_SIGNED_${GLTYPE}=1
+    else
+      eval HAVE_SIGNED_${GLTYPE}=0
+    fi
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+])
+
+dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES)
+dnl Determine the suffix to use for integer constants of the given types.
+dnl Define t_SUFFIX for each such type.
+AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
+[
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
+       [Define to l, ll, u, ul, ull, etc., as suitable for
+        constants of type ']gltype['.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([for $gltype integer literal suffix],
+      [gl_cv_type_${gltype}_suffix],
+      [eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)	gltype1='long int';;
+           ll)	gltype1='long long int';;
+           i64)	gltype1='__int64';;
+           u)	gltype1='unsigned int';;
+           ul)	gltype1='unsigned long int';;
+           ull)	gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM([$2[
+              extern $gltype foo;
+              extern $gltype1 foo;]])],
+           [eval gl_cv_type_${gltype}_suffix=\$glsuf])
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done])
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], $result)
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
+])
+
+dnl gl_STDINT_INCLUDES
+AC_DEFUN([gl_STDINT_INCLUDES],
+[[
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+]])
+
+dnl gl_STDINT_TYPE_PROPERTIES
+dnl Compute HAVE_SIGNED_t, BITSIZEOF_t and t_SUFFIX, for all the types t
+dnl of interest to stdint.in.h.
+AC_DEFUN([gl_STDINT_TYPE_PROPERTIES],
+[
+  gl_STDINT_BITSIZEOF([ptrdiff_t sig_atomic_t size_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+  gl_CHECK_TYPES_SIGNED([sig_atomic_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+  gl_cv_type_ptrdiff_t_signed=yes
+  gl_cv_type_size_t_signed=no
+  gl_INTEGER_TYPE_SUFFIX([ptrdiff_t sig_atomic_t size_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+])
+
+dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
+dnl Remove this when we can assume autoconf >= 2.61.
+m4_ifdef([AC_COMPUTE_INT], [], [
+  AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
+])
+
+# Hey Emacs!
+# Local Variables:
+# indent-tabs-mode: nil
+# End:
diff --git a/Build/source/utils/texinfo/gnulib/m4/stdlib_h.m4 b/Build/source/utils/texinfo/gnulib/m4/stdlib_h.m4
new file mode 100644
index 00000000000..d9240b46a0d
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/stdlib_h.m4
@@ -0,0 +1,45 @@
+# stdlib_h.m4 serial 6
+dnl Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_STDLIB_H],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  gl_CHECK_NEXT_HEADERS([stdlib.h])
+])
+
+AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+])
+
+AC_DEFUN([gl_STDLIB_H_DEFAULTS],
+[
+  GNULIB_MALLOC_POSIX=0;  AC_SUBST([GNULIB_MALLOC_POSIX])
+  GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
+  GNULIB_CALLOC_POSIX=0;  AC_SUBST([GNULIB_CALLOC_POSIX])
+  GNULIB_GETSUBOPT=0;     AC_SUBST([GNULIB_GETSUBOPT])
+  GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
+  GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
+  GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
+  GNULIB_SETENV=0;        AC_SUBST([GNULIB_SETENV])
+  GNULIB_STRTOD=0;        AC_SUBST([GNULIB_STRTOD])
+  GNULIB_UNSETENV=0;      AC_SUBST([GNULIB_UNSETENV])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_CALLOC_POSIX=1;    AC_SUBST([HAVE_CALLOC_POSIX])
+  HAVE_GETSUBOPT=1;       AC_SUBST([HAVE_GETSUBOPT])
+  HAVE_MALLOC_POSIX=1;    AC_SUBST([HAVE_MALLOC_POSIX])
+  HAVE_MKDTEMP=1;         AC_SUBST([HAVE_MKDTEMP])
+  HAVE_REALLOC_POSIX=1;   AC_SUBST([HAVE_REALLOC_POSIX])
+  HAVE_SETENV=1;          AC_SUBST([HAVE_SETENV])
+  HAVE_STRTOD=1;          AC_SUBST([HAVE_STRTOD])
+  HAVE_UNSETENV=1;        AC_SUBST([HAVE_UNSETENV])
+  REPLACE_MKSTEMP=0;      AC_SUBST([REPLACE_MKSTEMP])
+  REPLACE_PUTENV=0;       AC_SUBST([REPLACE_PUTENV])
+  REPLACE_STRTOD=0;       AC_SUBST([REPLACE_STRTOD])
+  VOID_UNSETENV=0;        AC_SUBST([VOID_UNSETENV])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/strdup.m4 b/Build/source/utils/texinfo/gnulib/m4/strdup.m4
new file mode 100644
index 00000000000..8796e9e02f9
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/strdup.m4
@@ -0,0 +1,22 @@
+# strdup.m4 serial 9
+
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+dnl Foundation, Inc.
+
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_STRDUP],
+[
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
+  AC_REPLACE_FUNCS(strdup)
+  AC_CHECK_DECLS_ONCE(strdup)
+  if test $ac_cv_have_decl_strdup = no; then
+    HAVE_DECL_STRDUP=0
+  fi
+  gl_PREREQ_STRDUP
+])
+
+# Prerequisites of lib/strdup.c.
+AC_DEFUN([gl_PREREQ_STRDUP], [:])
diff --git a/Build/source/utils/texinfo/gnulib/m4/strerror.m4 b/Build/source/utils/texinfo/gnulib/m4/strerror.m4
new file mode 100644
index 00000000000..75d54621b1b
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/strerror.m4
@@ -0,0 +1,47 @@
+# strerror.m4 serial 8
+dnl Copyright (C) 2002, 2007-2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_STRERROR],
+[
+  AC_REQUIRE([gl_FUNC_STRERROR_SEPARATE])
+  if test $gl_cv_func_working_strerror = no; then
+    AC_LIBOBJ([strerror])
+    AC_DEFINE_UNQUOTED([REPLACE_STRERROR], [$REPLACE_STRERROR],
+      [Define this to 1 if strerror is broken.])
+  fi
+])
+
+# Like gl_FUNC_STRERROR, except prepare for separate compilation (no AC_LIBOBJ).
+AC_DEFUN([gl_FUNC_STRERROR_SEPARATE],
+[
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
+  AC_CACHE_CHECK([for working strerror function],
+   [gl_cv_func_working_strerror],
+   [AC_RUN_IFELSE(
+      [AC_LANG_PROGRAM(
+	 [[#include <string.h>
+	 ]],
+	 [[return !*strerror (-2);]])],
+      [gl_cv_func_working_strerror=yes],
+      [gl_cv_func_working_strerror=no],
+      [dnl Assume crossbuild works if it compiles.
+       AC_COMPILE_IFELSE(
+	 [AC_LANG_PROGRAM(
+	    [[#include <string.h>
+	    ]],
+	    [[return !*strerror (-2);]])],
+	 [gl_cv_func_working_strerror=yes],
+	 [gl_cv_func_working_strerror=no])])])
+  if test $gl_cv_func_working_strerror = no ; then
+    REPLACE_STRERROR=1
+    gl_PREREQ_STRERROR
+  fi
+])
+
+# Prerequisites of lib/strerror.c.
+AC_DEFUN([gl_PREREQ_STRERROR], [
+  AC_CHECK_DECLS([strerror])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/string_h.m4 b/Build/source/utils/texinfo/gnulib/m4/string_h.m4
new file mode 100644
index 00000000000..766d7e98494
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/string_h.m4
@@ -0,0 +1,87 @@
+# Configure a GNU-like replacement for <string.h>.
+
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# Written by Paul Eggert.
+
+AC_DEFUN([gl_HEADER_STRING_H],
+[
+  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
+  dnl once only, before all statements that occur in other macros.
+  AC_REQUIRE([gl_HEADER_STRING_H_BODY])
+])
+
+AC_DEFUN([gl_HEADER_STRING_H_BODY],
+[
+  AC_REQUIRE([AC_C_RESTRICT])
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
+  gl_CHECK_NEXT_HEADERS([string.h])
+])
+
+AC_DEFUN([gl_STRING_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
+  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+])
+
+AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
+[
+  GNULIB_MEMMEM=0;      AC_SUBST([GNULIB_MEMMEM])
+  GNULIB_MEMPCPY=0;     AC_SUBST([GNULIB_MEMPCPY])
+  GNULIB_MEMRCHR=0;     AC_SUBST([GNULIB_MEMRCHR])
+  GNULIB_STPCPY=0;      AC_SUBST([GNULIB_STPCPY])
+  GNULIB_STPNCPY=0;     AC_SUBST([GNULIB_STPNCPY])
+  GNULIB_STRCHRNUL=0;   AC_SUBST([GNULIB_STRCHRNUL])
+  GNULIB_STRDUP=0;      AC_SUBST([GNULIB_STRDUP])
+  GNULIB_STRNDUP=0;     AC_SUBST([GNULIB_STRNDUP])
+  GNULIB_STRNLEN=0;     AC_SUBST([GNULIB_STRNLEN])
+  GNULIB_STRPBRK=0;     AC_SUBST([GNULIB_STRPBRK])
+  GNULIB_STRSEP=0;      AC_SUBST([GNULIB_STRSEP])
+  GNULIB_STRSTR=0;      AC_SUBST([GNULIB_STRSTR])
+  GNULIB_STRCASESTR=0;  AC_SUBST([GNULIB_STRCASESTR])
+  GNULIB_STRTOK_R=0;    AC_SUBST([GNULIB_STRTOK_R])
+  GNULIB_MBSLEN=0;      AC_SUBST([GNULIB_MBSLEN])
+  GNULIB_MBSNLEN=0;     AC_SUBST([GNULIB_MBSNLEN])
+  GNULIB_MBSCHR=0;      AC_SUBST([GNULIB_MBSCHR])
+  GNULIB_MBSRCHR=0;     AC_SUBST([GNULIB_MBSRCHR])
+  GNULIB_MBSSTR=0;      AC_SUBST([GNULIB_MBSSTR])
+  GNULIB_MBSCASECMP=0;  AC_SUBST([GNULIB_MBSCASECMP])
+  GNULIB_MBSNCASECMP=0; AC_SUBST([GNULIB_MBSNCASECMP])
+  GNULIB_MBSPCASECMP=0; AC_SUBST([GNULIB_MBSPCASECMP])
+  GNULIB_MBSCASESTR=0;  AC_SUBST([GNULIB_MBSCASESTR])
+  GNULIB_MBSCSPN=0;     AC_SUBST([GNULIB_MBSCSPN])
+  GNULIB_MBSPBRK=0;     AC_SUBST([GNULIB_MBSPBRK])
+  GNULIB_MBSSPN=0;      AC_SUBST([GNULIB_MBSSPN])
+  GNULIB_MBSSEP=0;      AC_SUBST([GNULIB_MBSSEP])
+  GNULIB_MBSTOK_R=0;    AC_SUBST([GNULIB_MBSTOK_R])
+  GNULIB_STRERROR=0;    AC_SUBST([GNULIB_STRERROR])
+  GNULIB_STRSIGNAL=0;   AC_SUBST([GNULIB_STRSIGNAL])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DECL_MEMMEM=1;		AC_SUBST([HAVE_DECL_MEMMEM])
+  HAVE_MEMPCPY=1;		AC_SUBST([HAVE_MEMPCPY])
+  HAVE_DECL_MEMRCHR=1;		AC_SUBST([HAVE_DECL_MEMRCHR])
+  HAVE_STPCPY=1;		AC_SUBST([HAVE_STPCPY])
+  HAVE_STPNCPY=1;		AC_SUBST([HAVE_STPNCPY])
+  HAVE_STRCHRNUL=1;		AC_SUBST([HAVE_STRCHRNUL])
+  HAVE_DECL_STRDUP=1;		AC_SUBST([HAVE_DECL_STRDUP])
+  HAVE_STRNDUP=1;		AC_SUBST([HAVE_STRNDUP])
+  HAVE_DECL_STRNDUP=1;		AC_SUBST([HAVE_DECL_STRNDUP])
+  HAVE_DECL_STRNLEN=1;		AC_SUBST([HAVE_DECL_STRNLEN])
+  HAVE_STRPBRK=1;		AC_SUBST([HAVE_STRPBRK])
+  HAVE_STRSEP=1;		AC_SUBST([HAVE_STRSEP])
+  HAVE_STRCASESTR=1;		AC_SUBST([HAVE_STRCASESTR])
+  HAVE_DECL_STRTOK_R=1;		AC_SUBST([HAVE_DECL_STRTOK_R])
+  HAVE_DECL_STRERROR=1;		AC_SUBST([HAVE_DECL_STRERROR])
+  HAVE_DECL_STRSIGNAL=1;	AC_SUBST([HAVE_DECL_STRSIGNAL])
+  REPLACE_STRERROR=0;		AC_SUBST([REPLACE_STRERROR])
+  REPLACE_STRSIGNAL=0;		AC_SUBST([REPLACE_STRSIGNAL])
+  REPLACE_MEMMEM=0;		AC_SUBST([REPLACE_MEMMEM])
+  REPLACE_STRCASESTR=0;		AC_SUBST([REPLACE_STRCASESTR])
+  REPLACE_STRSTR=0;		AC_SUBST([REPLACE_STRSTR])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/sys_stat_h.m4 b/Build/source/utils/texinfo/gnulib/m4/sys_stat_h.m4
new file mode 100644
index 00000000000..1bc08a17261
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/sys_stat_h.m4
@@ -0,0 +1,48 @@
+# sys_stat_h.m4 serial 6   -*- Autoconf -*-
+dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Eric Blake.
+dnl Test whether <sys/stat.h> contains lstat and mkdir or must be substituted.
+
+AC_DEFUN([gl_HEADER_SYS_STAT_H],
+[
+  dnl Check for lstat.  Systems that lack it (mingw) also lack symlinks, so
+  dnl stat is a good replacement.
+  AC_CHECK_FUNCS_ONCE([lstat])
+  if test $ac_cv_func_lstat = yes; then
+    HAVE_LSTAT=1
+  else
+    HAVE_LSTAT=0
+  fi
+  AC_SUBST([HAVE_LSTAT])
+
+  dnl Check for mkdir.  Mingw has _mkdir(name) in the nonstandard <io.h>
+  dnl instead.
+  AC_CHECK_DECLS([mkdir],
+    [],
+    [AC_CHECK_HEADERS([io.h])],
+    [#include <sys/stat.h>])
+  if test $ac_cv_have_decl_mkdir = yes; then
+    HAVE_DECL_MKDIR=1
+  else
+    HAVE_DECL_MKDIR=0
+  fi
+  AC_SUBST([HAVE_DECL_MKDIR])
+  if test "$ac_cv_header_io_h" = yes; then
+    HAVE_IO_H=1
+  else
+    HAVE_IO_H=0
+  fi
+  AC_SUBST([HAVE_IO_H])
+  AC_REQUIRE([AC_C_INLINE])
+
+  dnl Check for broken stat macros.
+  AC_REQUIRE([AC_HEADER_STAT])
+
+  gl_CHECK_NEXT_HEADERS([sys/stat.h])
+  SYS_STAT_H='sys/stat.h'
+  AC_SUBST([SYS_STAT_H])
+]) # gl_HEADER_SYS_STAT_H
diff --git a/Build/source/utils/texinfo/gnulib/m4/sys_time_h.m4 b/Build/source/utils/texinfo/gnulib/m4/sys_time_h.m4
new file mode 100644
index 00000000000..13ac5763b3d
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/sys_time_h.m4
@@ -0,0 +1,57 @@
+# Configure a replacement for <sys/time.h>.
+
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Written by Paul Eggert and Martin Lambers.
+
+AC_DEFUN([gl_HEADER_SYS_TIME_H],
+[
+  dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement
+  dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1
+  dnl statements that occur in other macros.
+  AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY])
+])
+
+AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY],
+[
+  AC_REQUIRE([AC_C_RESTRICT])
+  gl_CHECK_NEXT_HEADERS([sys/time.h])
+
+  if test $ac_cv_header_sys_time_h = yes; then
+    HAVE_SYS_TIME_H=1
+  else
+    HAVE_SYS_TIME_H=0
+  fi
+  AC_SUBST([HAVE_SYS_TIME_H])
+
+  AC_CACHE_CHECK([for struct timeval], [gl_cv_sys_struct_timeval],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+	  [[#if HAVE_SYS_TIME_H
+	     #include <sys/time.h>
+	    #endif
+	    #include <time.h>
+	  ]],
+	  [[static struct timeval x; x.tv_sec = x.tv_usec;]])],
+       [gl_cv_sys_struct_timeval=yes],
+       [gl_cv_sys_struct_timeval=no])])
+  if test $gl_cv_sys_struct_timeval = yes; then
+    HAVE_STRUCT_TIMEVAL=1
+  else
+    HAVE_STRUCT_TIMEVAL=0
+  fi
+  AC_SUBST([HAVE_STRUCT_TIMEVAL])
+
+  dnl Assume POSIX behavior unless another module says otherwise.
+  REPLACE_GETTIMEOFDAY=0
+  AC_SUBST([REPLACE_GETTIMEOFDAY])
+  if test $HAVE_SYS_TIME_H = 0 || test $HAVE_STRUCT_TIMEVAL = 0; then
+    SYS_TIME_H=sys/time.h
+  else
+    SYS_TIME_H=
+  fi
+  AC_SUBST([SYS_TIME_H])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/tempname.m4 b/Build/source/utils/texinfo/gnulib/m4/tempname.m4
new file mode 100644
index 00000000000..4c44d37da94
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/tempname.m4
@@ -0,0 +1,22 @@
+#serial 3
+
+# Copyright (C) 2006-2007 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# glibc provides __gen_tempname as a wrapper for mk[ds]temp.  Expose
+# it as a public API, and provide it on systems that are lacking.
+AC_DEFUN([gl_FUNC_GEN_TEMPNAME],
+[
+  AC_REQUIRE([AC_SYS_LARGEFILE])
+
+  AC_LIBOBJ([tempname])
+  gl_PREREQ_TEMPNAME
+])
+
+# Prerequisites of lib/tempname.c.
+AC_DEFUN([gl_PREREQ_TEMPNAME],
+[
+  :
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/unistd_h.m4 b/Build/source/utils/texinfo/gnulib/m4/unistd_h.m4
new file mode 100644
index 00000000000..e8ccab16e83
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/unistd_h.m4
@@ -0,0 +1,63 @@
+# unistd_h.m4 serial 11
+dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Simon Josefsson, Bruno Haible.
+
+AC_DEFUN([gl_UNISTD_H],
+[
+  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
+  dnl once only, before all statements that occur in other macros.
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+
+  gl_CHECK_NEXT_HEADERS([unistd.h])
+
+  AC_CHECK_HEADERS_ONCE([unistd.h])
+  if test $ac_cv_header_unistd_h = yes; then
+    HAVE_UNISTD_H=1
+  else
+    HAVE_UNISTD_H=0
+  fi
+  AC_SUBST([HAVE_UNISTD_H])
+])
+
+AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+])
+
+AC_DEFUN([gl_UNISTD_H_DEFAULTS],
+[
+  GNULIB_CHOWN=0;         AC_SUBST([GNULIB_CHOWN])
+  GNULIB_DUP2=0;          AC_SUBST([GNULIB_DUP2])
+  GNULIB_ENVIRON=0;       AC_SUBST([GNULIB_ENVIRON])
+  GNULIB_FCHDIR=0;        AC_SUBST([GNULIB_FCHDIR])
+  GNULIB_FTRUNCATE=0;     AC_SUBST([GNULIB_FTRUNCATE])
+  GNULIB_GETCWD=0;        AC_SUBST([GNULIB_GETCWD])
+  GNULIB_GETLOGIN_R=0;    AC_SUBST([GNULIB_GETLOGIN_R])
+  GNULIB_GETPAGESIZE=0;   AC_SUBST([GNULIB_GETPAGESIZE])
+  GNULIB_LCHOWN=0;        AC_SUBST([GNULIB_LCHOWN])
+  GNULIB_LSEEK=0;         AC_SUBST([GNULIB_LSEEK])
+  GNULIB_READLINK=0;      AC_SUBST([GNULIB_READLINK])
+  GNULIB_SLEEP=0;         AC_SUBST([GNULIB_SLEEP])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DUP2=1;            AC_SUBST([HAVE_DUP2])
+  HAVE_FTRUNCATE=1;       AC_SUBST([HAVE_FTRUNCATE])
+  HAVE_GETPAGESIZE=1;     AC_SUBST([HAVE_GETPAGESIZE])
+  HAVE_READLINK=1;        AC_SUBST([HAVE_READLINK])
+  HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])
+  HAVE_DECL_ENVIRON=1;    AC_SUBST([HAVE_DECL_ENVIRON])
+  HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
+  HAVE_OS_H=0;            AC_SUBST([HAVE_OS_H])
+  HAVE_SYS_PARAM_H=0;     AC_SUBST([HAVE_SYS_PARAM_H])
+  REPLACE_CHOWN=0;        AC_SUBST([REPLACE_CHOWN])
+  REPLACE_FCHDIR=0;       AC_SUBST([REPLACE_FCHDIR])
+  REPLACE_GETCWD=0;       AC_SUBST([REPLACE_GETCWD])
+  REPLACE_GETPAGESIZE=0;  AC_SUBST([REPLACE_GETPAGESIZE])
+  REPLACE_LCHOWN=0;       AC_SUBST([REPLACE_LCHOWN])
+  REPLACE_LSEEK=0;        AC_SUBST([REPLACE_LSEEK])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/wchar.m4 b/Build/source/utils/texinfo/gnulib/m4/wchar.m4
new file mode 100644
index 00000000000..70b1248f8fc
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/wchar.m4
@@ -0,0 +1,54 @@
+dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
+
+dnl Copyright (C) 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Eric Blake.
+
+# wchar.m4 serial 4
+
+AC_DEFUN([gl_WCHAR_H],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  AC_CACHE_CHECK([whether <wchar.h> is standalone],
+    [gl_cv_header_wchar_h_standalone],
+    [AC_COMPILE_IFELSE([[#include <wchar.h>
+wchar_t w;]],
+      [gl_cv_header_wchar_h_standalone=yes],
+      [gl_cv_header_wchar_h_standalone=no])])
+  if test $gl_cv_header_wchar_h_standalone != yes; then
+    WCHAR_H=wchar.h
+  fi
+
+  dnl Prepare for creating substitute <wchar.h>.
+  dnl Do it always: WCHAR_H may be empty here but can be set later.
+  dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
+  dnl character support).
+  AC_CHECK_HEADERS_ONCE([wchar.h])
+  if test $ac_cv_header_wchar_h = yes; then
+    HAVE_WCHAR_H=1
+  else
+    HAVE_WCHAR_H=0
+  fi
+  AC_SUBST([HAVE_WCHAR_H])
+  gl_CHECK_NEXT_HEADERS([wchar.h])
+])
+
+AC_DEFUN([gl_WCHAR_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+])
+
+AC_DEFUN([gl_WCHAR_H_DEFAULTS],
+[
+  GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH])
+  REPLACE_WCWIDTH=0;   AC_SUBST([REPLACE_WCWIDTH])
+  WCHAR_H=
+  AC_SUBST([WCHAR_H])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/wchar_t.m4 b/Build/source/utils/texinfo/gnulib/m4/wchar_t.m4
new file mode 100644
index 00000000000..cde2129a972
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/wchar_t.m4
@@ -0,0 +1,20 @@
+# wchar_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <stddef.h> has the 'wchar_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WCHAR_T],
+[
+  AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
+    [AC_TRY_COMPILE([#include <stddef.h>
+       wchar_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
+  if test $gt_cv_c_wchar_t = yes; then
+    AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
+  fi
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/wctype.m4 b/Build/source/utils/texinfo/gnulib/m4/wctype.m4
new file mode 100644
index 00000000000..7483c4feaf5
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/wctype.m4
@@ -0,0 +1,44 @@
+dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
+
+dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Paul Eggert.
+
+AC_DEFUN([gl_WCTYPE_H],
+[
+  AC_CHECK_FUNCS_ONCE([iswcntrl])
+  if test $ac_cv_func_iswcntrl = yes; then
+    HAVE_ISWCNTRL=1
+  else
+    HAVE_ISWCNTRL=0
+  fi
+  AC_SUBST([HAVE_ISWCNTRL])
+  AC_CHECK_HEADERS_ONCE([wctype.h])
+  AC_REQUIRE([AC_C_INLINE])
+
+  AC_REQUIRE([gt_TYPE_WINT_T])
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+  AC_SUBST([HAVE_WINT_T])
+
+  WCTYPE_H=wctype.h
+  if test $ac_cv_header_wctype_h = yes; then
+    if test $ac_cv_func_iswcntrl = yes; then
+      WCTYPE_H=
+    fi
+    dnl Compute NEXT_WCTYPE_H even if WCTYPE_H is empty,
+    dnl for the benefit of builds from non-distclean directories.
+    gl_CHECK_NEXT_HEADERS([wctype.h])
+    HAVE_WCTYPE_H=1
+  else
+    HAVE_WCTYPE_H=0
+  fi
+  AC_SUBST([HAVE_WCTYPE_H])
+  AC_SUBST([WCTYPE_H])
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/wcwidth.m4 b/Build/source/utils/texinfo/gnulib/m4/wcwidth.m4
new file mode 100644
index 00000000000..04a9fc270b2
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/wcwidth.m4
@@ -0,0 +1,85 @@
+# wcwidth.m4 serial 13
+dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_WCWIDTH],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+
+  dnl Persuade glibc <wchar.h> to declare wcwidth().
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  AC_REQUIRE([gt_TYPE_WCHAR_T])
+  AC_REQUIRE([gt_TYPE_WINT_T])
+
+  AC_CHECK_HEADERS_ONCE([wchar.h])
+  AC_CHECK_FUNCS_ONCE([wcwidth])
+
+  AC_CHECK_DECLS([wcwidth], [], [], [
+/* AIX 3.2.5 declares wcwidth in <string.h>. */
+#include <string.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+])
+  if test $ac_cv_have_decl_wcwidth != yes; then
+    HAVE_DECL_WCWIDTH=0
+  fi
+
+  if test $ac_cv_func_wcwidth = no; then
+    REPLACE_WCWIDTH=1
+  else
+    dnl On MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
+    dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
+    dnl This leads to bugs in 'ls' (coreutils).
+    AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
+      [gl_cv_func_wcwidth_works],
+      [
+        AC_TRY_RUN([
+#include <locale.h>
+/* AIX 3.2.5 declares wcwidth in <string.h>. */
+#include <string.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+#if !HAVE_DECL_WCWIDTH
+extern
+# ifdef __cplusplus
+"C"
+# endif
+int wcwidth (int);
+#endif
+int main ()
+{
+  if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
+    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
+      return 1;
+  return 0;
+}], [gl_cv_func_wcwidth_works=yes], [gl_cv_func_wcwidth_works=no],
+          [gl_cv_func_wcwidth_works="guessing no"])
+      ])
+    case "$gl_cv_func_wcwidth_works" in
+      *yes) ;;
+      *no) REPLACE_WCWIDTH=1 ;;
+    esac
+  fi
+  if test $REPLACE_WCWIDTH = 1; then
+    AC_LIBOBJ([wcwidth])
+  fi
+
+  if test $REPLACE_WCWIDTH = 1 || test $HAVE_DECL_WCWIDTH = 0; then
+    WCHAR_H=wchar.h
+  fi
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/wint_t.m4 b/Build/source/utils/texinfo/gnulib/m4/wint_t.m4
new file mode 100644
index 00000000000..af5ed936cc4
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/wint_t.m4
@@ -0,0 +1,28 @@
+# wint_t.m4 serial 2 (gettext-0.17)
+dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <wchar.h> has the 'wint_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+  AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
+    [AC_TRY_COMPILE([
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+       wint_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
+  if test $gt_cv_c_wint_t = yes; then
+    AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
+  fi
+])
diff --git a/Build/source/utils/texinfo/gnulib/m4/xalloc.m4 b/Build/source/utils/texinfo/gnulib/m4/xalloc.m4
new file mode 100644
index 00000000000..837a948c1da
--- /dev/null
+++ b/Build/source/utils/texinfo/gnulib/m4/xalloc.m4
@@ -0,0 +1,24 @@
+# xalloc.m4 serial 16
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_XALLOC],
+[
+  AC_LIBOBJ([xmalloc])
+
+  gl_PREREQ_XALLOC
+  gl_PREREQ_XMALLOC
+])
+
+# Prerequisites of lib/xalloc.h.
+AC_DEFUN([gl_PREREQ_XALLOC], [
+  AC_REQUIRE([gl_INLINE])
+  :
+])
+
+# Prerequisites of lib/xmalloc.c.
+AC_DEFUN([gl_PREREQ_XMALLOC], [
+  :
+])
diff --git a/Build/source/utils/texinfo/info/Makefile.am b/Build/source/utils/texinfo/info/Makefile.am
index 176f5939a53..5a3d35a314a 100644
--- a/Build/source/utils/texinfo/info/Makefile.am
+++ b/Build/source/utils/texinfo/info/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.8 2004/10/28 14:03:27 karl Exp $
+# $Id: Makefile.am,v 1.15 2008/03/28 23:39:20 karl Exp $
 # Makefile.am for texinfo/info.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -19,13 +19,17 @@ transform = s/ginfo/info/; $(program_transform_name)
 localedir = $(datadir)/locale
 infodir2 = $(datadir)/info
 
-# -I. for funs.h.
-# Automake puts -I.. and -I$(srcdir) into DEFS by default, but
-# we need to override it, so include them ourselves.
-INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
-DEFS += -DLOCALEDIR=\"$(localedir)\" -DINFODIR=\"$(infodir)\" \
-	-DINFODIR2=\"$(infodir2)\"
-LDADD = ../lib/libtxi.a $(TERMLIBS) $(LIBINTL)
+AM_CPPFLAGS = 					\
+  -I$(top_srcdir)				\
+  -I$(top_srcdir)/gnulib/lib			\
+  -I$(top_builddir)/gnulib/lib			\
+  -DLOCALEDIR=\"$(localedir)\" 			\
+  -DINFODIR=\"$(infodir)\"			\
+  -DINFODIR2=\"$(infodir2)\"
+
+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a \
+        $(TERMLIBS) $(LIBINTL)
+infokey_LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
 
 EXTRA_DIST = README pcterm.c
 
@@ -50,6 +54,8 @@ generated_sources = doc.c key.c funs.h
 
 # We need a linear ordering to prevent race condition in parallel make.
 # See the node ``(automake)Multiple Outputs'' for an explanation.
+# Make sure this matches with order in which makedoc.c creates these
+# files.
 doc.c: key.c
 key.c: funs.h
 
@@ -64,8 +70,10 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
   $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
   $(srcdir)/footnotes.c $(srcdir)/variables.c
 
-# The $(EXEEXT) should be added by Automake, but isn't. Fine.
-$(generated_sources): makedoc$(EXEEXT) $(cmd_sources)
+# Make the target only funs.h even though we create all the
+# $(generated_sources) so that parallel makes won't do the rm && makedoc
+# more than once.
+funs.h: makedoc$(EXEEXT) $(cmd_sources)
 	rm -f $(generated_sources)
 	$(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
 
diff --git a/Build/source/utils/texinfo/info/Makefile.in b/Build/source/utils/texinfo/info/Makefile.in
index 6561573b7aa..5e35306f4d2 100644
--- a/Build/source/utils/texinfo/info/Makefile.in
+++ b/Build/source/utils/texinfo/info/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am,v 1.8 2004/10/28 14:03:27 karl Exp $
+# $Id: Makefile.am,v 1.15 2008/03/28 23:39:20 karl Exp $
 # Makefile.am for texinfo/info.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -26,15 +26,11 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -52,26 +48,66 @@ noinst_PROGRAMS = makedoc$(EXEEXT)
 subdir = info
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
-	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \
-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mkstemp.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/onceonly_2_57.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
+	$(top_srcdir)/gnulib/m4/argz.m4 \
+	$(top_srcdir)/gnulib/m4/codeset.m4 \
+	$(top_srcdir)/gnulib/m4/eealloc.m4 \
+	$(top_srcdir)/gnulib/m4/environ.m4 \
+	$(top_srcdir)/gnulib/m4/error.m4 \
+	$(top_srcdir)/gnulib/m4/exitfail.m4 \
+	$(top_srcdir)/gnulib/m4/extensions.m4 \
+	$(top_srcdir)/gnulib/m4/getopt.m4 \
+	$(top_srcdir)/gnulib/m4/gettext.m4 \
+	$(top_srcdir)/gnulib/m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib/m4/glibc21.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib/m4/iconv.m4 \
+	$(top_srcdir)/gnulib/m4/include_next.m4 \
+	$(top_srcdir)/gnulib/m4/inline.m4 \
+	$(top_srcdir)/gnulib/m4/intlmacosx.m4 \
+	$(top_srcdir)/gnulib/m4/lib-ld.m4 \
+	$(top_srcdir)/gnulib/m4/lib-link.m4 \
+	$(top_srcdir)/gnulib/m4/lib-prefix.m4 \
+	$(top_srcdir)/gnulib/m4/localcharset.m4 \
+	$(top_srcdir)/gnulib/m4/longlong.m4 \
+	$(top_srcdir)/gnulib/m4/malloc.m4 \
+	$(top_srcdir)/gnulib/m4/malloca.m4 \
+	$(top_srcdir)/gnulib/m4/mbchar.m4 \
+	$(top_srcdir)/gnulib/m4/mbiter.m4 \
+	$(top_srcdir)/gnulib/m4/mbrtowc.m4 \
+	$(top_srcdir)/gnulib/m4/mbscasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbsncasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbstate_t.m4 \
+	$(top_srcdir)/gnulib/m4/mbswidth.m4 \
+	$(top_srcdir)/gnulib/m4/memchr.m4 \
+	$(top_srcdir)/gnulib/m4/memcpy.m4 \
+	$(top_srcdir)/gnulib/m4/memmove.m4 \
+	$(top_srcdir)/gnulib/m4/mkstemp.m4 \
+	$(top_srcdir)/gnulib/m4/nls.m4 \
+	$(top_srcdir)/gnulib/m4/onceonly.m4 \
+	$(top_srcdir)/gnulib/m4/po.m4 \
+	$(top_srcdir)/gnulib/m4/progtest.m4 \
+	$(top_srcdir)/gnulib/m4/setenv.m4 \
+	$(top_srcdir)/gnulib/m4/stdbool.m4 \
+	$(top_srcdir)/gnulib/m4/stdint.m4 \
+	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
+	$(top_srcdir)/gnulib/m4/strdup.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
+	$(top_srcdir)/gnulib/m4/string_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_time_h.m4 \
+	$(top_srcdir)/gnulib/m4/tempname.m4 \
+	$(top_srcdir)/gnulib/m4/unistd_h.m4 \
+	$(top_srcdir)/gnulib/m4/wchar.m4 \
+	$(top_srcdir)/gnulib/m4/wchar_t.m4 \
+	$(top_srcdir)/gnulib/m4/wctype.m4 \
+	$(top_srcdir)/gnulib/m4/wcwidth.m4 \
+	$(top_srcdir)/gnulib/m4/wint_t.m4 \
+	$(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
@@ -89,21 +125,22 @@ nodist_ginfo_OBJECTS = doc.$(OBJEXT)
 ginfo_OBJECTS = $(am_ginfo_OBJECTS) $(nodist_ginfo_OBJECTS)
 ginfo_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-ginfo_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1) \
+ginfo_DEPENDENCIES = ../lib/libtxi.a \
+	$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_infokey_OBJECTS = infokey.$(OBJEXT)
 nodist_infokey_OBJECTS = key.$(OBJEXT)
 infokey_OBJECTS = $(am_infokey_OBJECTS) $(nodist_infokey_OBJECTS)
-infokey_LDADD = $(LDADD)
-infokey_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+infokey_DEPENDENCIES = ../lib/libtxi.a \
+	$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
 am_makedoc_OBJECTS = makedoc.$(OBJEXT)
 makedoc_OBJECTS = $(am_makedoc_OBJECTS)
 makedoc_LDADD = $(LDADD)
-makedoc_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1) \
+makedoc_DEPENDENCIES = ../lib/libtxi.a \
+	$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -118,65 +155,180 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 transform = s/ginfo/info/; $(program_transform_name)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+ARGZ_H = @ARGZ_H@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DINFODIR=\"$(infodir)\" \
-	-DINFODIR2=\"$(infodir2)\"
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
+GETOPT_H = @GETOPT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_IO_H = @HAVE_IO_H@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRNDUP = @HAVE_STRNDUP@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRSEP = @HAVE_STRSEP@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNSETENV = @HAVE_UNSETENV@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
+HEVEA = @HEVEA@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@
-INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -186,20 +338,50 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
 RANLIB = @RANLIB@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDINT_H = @STDINT_H@
 STRIP = @STRIP@
+SYS_STAT_H = @SYS_STAT_H@
+SYS_TIME_H = @SYS_TIME_H@
 TERMLIBS = @TERMLIBS@
-TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@
-TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+TEX = @TEX@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VOID_UNSETENV = @VOID_UNSETENV@
+WCHAR_H = @WCHAR_H@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WCTYPE_H = @WCTYPE_H@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -211,11 +393,16 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -239,15 +426,25 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 infodir2 = $(datadir)/info
-
-# -I. for funs.h.
-# Automake puts -I.. and -I$(srcdir) into DEFS by default, but
-# we need to override it, so include them ourselves.
-INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
-LDADD = ../lib/libtxi.a $(TERMLIBS) $(LIBINTL)
+AM_CPPFLAGS = \
+  -I$(top_srcdir)				\
+  -I$(top_srcdir)/gnulib/lib			\
+  -I$(top_builddir)/gnulib/lib			\
+  -DLOCALEDIR=\"$(localedir)\" 			\
+  -DINFODIR=\"$(infodir)\"			\
+  -DINFODIR2=\"$(infodir2)\"
+
+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a \
+        $(TERMLIBS) $(LIBINTL)
+
+infokey_LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
 EXTRA_DIST = README pcterm.c
 ginfo_SOURCES = dir.c display.c display.h doc.h dribble.c dribble.h \
   echo-area.c echo-area.h \
@@ -318,7 +515,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -344,13 +541,13 @@ clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 ginfo$(EXEEXT): $(ginfo_OBJECTS) $(ginfo_DEPENDENCIES) 
 	@rm -f ginfo$(EXEEXT)
-	$(LINK) $(ginfo_LDFLAGS) $(ginfo_OBJECTS) $(ginfo_LDADD) $(LIBS)
+	$(LINK) $(ginfo_OBJECTS) $(ginfo_LDADD) $(LIBS)
 infokey$(EXEEXT): $(infokey_OBJECTS) $(infokey_DEPENDENCIES) 
 	@rm -f infokey$(EXEEXT)
-	$(LINK) $(infokey_LDFLAGS) $(infokey_OBJECTS) $(infokey_LDADD) $(LIBS)
+	$(LINK) $(infokey_OBJECTS) $(infokey_LDADD) $(LIBS)
 makedoc$(EXEEXT): $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES) 
 	@rm -f makedoc$(EXEEXT)
-	$(LINK) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS)
+	$(LINK) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -387,27 +584,26 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -419,8 +615,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -430,13 +626,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -450,22 +645,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -482,7 +676,7 @@ check: $(BUILT_SOURCES)
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-am
@@ -534,12 +728,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -559,28 +761,35 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-noinstPROGRAMS ctags distclean \
 	distclean-compile distclean-generic distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-binPROGRAMS
 
 
 # We need a linear ordering to prevent race condition in parallel make.
 # See the node ``(automake)Multiple Outputs'' for an explanation.
+# Make sure this matches with order in which makedoc.c creates these
+# files.
 doc.c: key.c
 key.c: funs.h
 
-# The $(EXEEXT) should be added by Automake, but isn't. Fine.
-$(generated_sources): makedoc$(EXEEXT) $(cmd_sources)
+# Make the target only funs.h even though we create all the
+# $(generated_sources) so that parallel makes won't do the rm && makedoc
+# more than once.
+funs.h: makedoc$(EXEEXT) $(cmd_sources)
 	rm -f $(generated_sources)
 	$(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/utils/texinfo/info/dir.c b/Build/source/utils/texinfo/info/dir.c
index 98061dfdfa6..9f32cdb6ff5 100644
--- a/Build/source/utils/texinfo/info/dir.c
+++ b/Build/source/utils/texinfo/info/dir.c
@@ -1,12 +1,12 @@
 /* dir.c -- how to build a special "dir" node from "localdir" files.
-   $Id: dir.c,v 1.3 2004/04/11 17:56:45 karl Exp $
+   $Id: dir.c,v 1.7 2007/07/01 21:20:29 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,10 +14,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-   Written by Brian Fox (bfox@ai.mit.edu). */
+  Written by Brian Fox (bfox@ai.mit.edu). */
 
 #include "info.h"
 #include "info-utils.h"
@@ -44,8 +43,8 @@ static char *dirs_to_add[] = {
 
 typedef struct
 {
-  unsigned long device;
-  unsigned long inode;
+  dev_t device;
+  ino_t inode;
 } dir_file_list_entry_type;
 
 static int
diff --git a/Build/source/utils/texinfo/info/display.c b/Build/source/utils/texinfo/info/display.c
index 1a9fd0a9ae4..58f6a17a718 100644
--- a/Build/source/utils/texinfo/info/display.c
+++ b/Build/source/utils/texinfo/info/display.c
@@ -1,12 +1,13 @@
 /* display.c -- How to display Info windows.
-   $Id: display.c,v 1.7 2004/04/11 17:56:45 karl Exp $
+   $Id: display.c,v 1.12 2007/10/19 18:43:20 karl Exp $
 
-   Copyright (C) 1993, 1997, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 2003, 2004, 2006, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -136,8 +136,13 @@ display_update_one_window (WINDOW *win)
   if (display_inhibited)
     display_was_interrupted_p = 1;
 
-  /* If the window has no height, or display is inhibited, quit now. */
-  if (!win->height || display_inhibited)
+  /* If the window has no height, or display is inhibited, quit now.
+     Strictly speaking, it should only be necessary to test if the
+     values are equal to zero, since window_new_screen_size should
+     ensure that the window height/width never becomes negative, but
+     since historically this has often been the culprit for crashes, do
+     our best to be doubly safe.  */
+  if (win->height <= 0 || win->width <= 0 || display_inhibited)
     return;
 
   /* If the window's first row doesn't appear in the_screen, then it
@@ -294,62 +299,65 @@ display_update_one_window (WINDOW *win)
              on the screen. */
           entry = display[line_index + win->first_row];
 
-          /* If the screen line is inversed, then we have to clear
-             the line from the screen first.  Why, I don't know.
-             (But don't do this if we have no visible entries, as can
-             happen if the window is shrunk very small.)  */
-          if ((entry && entry->inverse)
-	      /* Need to erase the line if it has escape sequences.  */
-	      || (raw_escapes_p && strchr (entry->text, '\033') != 0))
-            {
-              terminal_goto_xy (0, line_index + win->first_row);
-              terminal_clear_to_eol ();
-              entry->inverse = 0;
-              entry->text[0] = '\0';
-              entry->textlen = 0;
-            }
+          /* If the window is very small, entry might be NULL. */
+          if (entry) {
+              /* If the screen line is inversed, then we have to clear
+                 the line from the screen first.  Why, I don't know.
+                 (But don't do this if we have no visible entries, as can
+                 happen if the window is shrunk very small.)  */
+              if (entry->inverse
+	          /* Need to erase the line if it has escape sequences.  */
+	          || (raw_escapes_p && strchr (entry->text, '\033') != 0))
+                {
+                  terminal_goto_xy (0, line_index + win->first_row);
+                  terminal_clear_to_eol ();
+                  entry->inverse = 0;
+                  entry->text[0] = '\0';
+                  entry->textlen = 0;
+                }
 
-          /* Find the offset where these lines differ. */
-          for (i = 0; i < pl_index; i++)
-            if (printed_line[i] != entry->text[i])
-              break;
+              /* Find the offset where these lines differ. */
+              for (i = 0; i < pl_index; i++)
+                if (printed_line[i] != entry->text[i])
+                  break;
 
-          /* If the lines are not the same length, or if they differed
-             at all, we must do some redrawing. */
-          if ((i != pl_index) || (pl_index != entry->textlen))
-            {
-              /* Move to the proper point on the terminal. */
-              terminal_goto_xy (i, line_index + win->first_row);
-
-              /* If there is any text to print, print it. */
-              if (i != pl_index)
-                terminal_put_text (printed_line + i);
-
-              /* If the printed text didn't extend all the way to the edge
-                 of the window, and text was appearing between here and the
-                 edge of the window, clear from here to the end of the line. */
-              if ((pl_index < win->width + pl_ignore
-		   && pl_index < entry->textlen)
-		  || (entry->inverse))
-                terminal_clear_to_eol ();
-
-              fflush (stdout);
-
-              /* Update the display text buffer. */
-	      if (strlen (printed_line) > (unsigned int) screenwidth)
-		/* printed_line[] can include more than screenwidth
-		   characters if we are under -R and there are escape
-		   sequences in it.  However, entry->text was
-		   allocated (in display_initialize_display) for
-		   screenwidth characters only.  */
-		entry->text = xrealloc (entry->text, strlen (printed_line)+1);
-              strcpy (entry->text + i, printed_line + i);
-              entry->textlen = pl_index;
-
-              /* Lines showing node text are not in inverse.  Only modelines
-                 have that distinction. */
-              entry->inverse = 0;
-            }
+              /* If the lines are not the same length, or if they differed
+                 at all, we must do some redrawing. */
+              if ((i != pl_index) || (pl_index != entry->textlen))
+                {
+                  /* Move to the proper point on the terminal. */
+                  terminal_goto_xy (i, line_index + win->first_row);
+
+                  /* If there is any text to print, print it. */
+                  if (i != pl_index)
+                    terminal_put_text (printed_line + i);
+
+                  /* If the printed text didn't extend all the way to the edge
+                     of the window, and text was appearing between here and the
+                     edge of the window, clear from here to the end of the line. */
+                  if ((pl_index < win->width + pl_ignore
+		       && pl_index < entry->textlen)
+		      || (entry->inverse))
+                    terminal_clear_to_eol ();
+
+                  fflush (stdout);
+
+                  /* Update the display text buffer. */
+	          if (strlen (printed_line) > (unsigned int) screenwidth)
+		/*     printed_line[] can include more than screenwidth
+		       characters if we are under -R and there are escape
+		       sequences in it.  However, entry->text was
+		       allocated (in display_initialize_display) for
+		       screenwidth characters only.  */
+		entry->text     = xrealloc (entry->text, strlen (printed_line)+1);
+                  strcpy (entry->text + i, printed_line + i);
+                  entry->textlen = pl_index;
+
+                  /* Lines showing node text are not in inverse.  Only modelines
+                     have that distinction. */
+                  entry->inverse = 0;
+                }
+          }
 
           /* We have done at least one line.  Increment our screen line
              index, and check against the bottom of the window. */
diff --git a/Build/source/utils/texinfo/info/display.h b/Build/source/utils/texinfo/info/display.h
index 286db293ee2..20b7ad85fcc 100644
--- a/Build/source/utils/texinfo/info/display.h
+++ b/Build/source/utils/texinfo/info/display.h
@@ -1,15 +1,15 @@
 /* display.h -- How the display in Info is done.
-   $Id: display.h,v 1.3 2004/04/11 17:56:45 karl Exp $
+   $Id: display.h,v 1.6 2007/07/01 21:20:29 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/doc.h b/Build/source/utils/texinfo/info/doc.h
index 9315e8adc36..98d1ec627b4 100644
--- a/Build/source/utils/texinfo/info/doc.h
+++ b/Build/source/utils/texinfo/info/doc.h
@@ -1,12 +1,12 @@
 /* doc.h -- Structures associating function pointers with documentation.
-   $Id: doc.h,v 1.3 2004/04/11 17:56:45 karl Exp $
+   $Id: doc.h,v 1.7 2008/02/26 16:51:05 karl Exp $
 
-   Copyright (C) 1993, 2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -97,7 +96,7 @@ extern char *key_documentation (char key, Keymap map);
 extern char *pretty_keyname (unsigned char key);
 extern char *pretty_keyseq (char *keyseq);
 extern char *where_is (Keymap map, InfoCommand *cmd);
-extern char *replace_in_documentation (char *string, int help_is_only_window_p);
+extern char *replace_in_documentation (const char *string, int help_is_only_window_p);
 extern void dump_map_to_message_buffer (char *prefix, Keymap map);
 
 #endif /* !DOC_H */
diff --git a/Build/source/utils/texinfo/info/dribble.c b/Build/source/utils/texinfo/info/dribble.c
index d4563193661..72243ef7ffa 100644
--- a/Build/source/utils/texinfo/info/dribble.c
+++ b/Build/source/utils/texinfo/info/dribble.c
@@ -1,12 +1,12 @@
 /* dribble.c -- dribble files for Info.
-   $Id: dribble.c,v 1.3 2004/04/11 17:56:45 karl Exp $
+   $Id: dribble.c,v 1.6 2007/07/01 21:20:29 karl Exp $
 
-   Copyright (C) 1993, 1998, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1998, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/dribble.h b/Build/source/utils/texinfo/info/dribble.h
index f30f2040d8e..5f8fbfae4c5 100644
--- a/Build/source/utils/texinfo/info/dribble.h
+++ b/Build/source/utils/texinfo/info/dribble.h
@@ -3,12 +3,12 @@
 /* This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/echo-area.c b/Build/source/utils/texinfo/info/echo-area.c
index 31385c88a37..d6fa8757d9a 100644
--- a/Build/source/utils/texinfo/info/echo-area.c
+++ b/Build/source/utils/texinfo/info/echo-area.c
@@ -1,13 +1,13 @@
 /* echo-area.c -- how to read a line in the echo area.
-   $Id: echo-area.c,v 1.7 2004/12/14 00:15:36 karl Exp $
+   $Id: echo-area.c,v 1.12 2008/02/26 16:51:05 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -45,7 +44,7 @@ int echo_area_last_command_was_kill = 0;
 
 /* Variables which hold on to the current state of the input line. */
 static char input_line[1 + EA_MAX_INPUT];
-static char *input_line_prompt;
+static const char *input_line_prompt;
 static int input_line_point;
 static int input_line_beg;
 static int input_line_end;
@@ -160,7 +159,7 @@ restore_calling_window (void)
 
 /* Set up a new input line with PROMPT. */
 static void
-initialize_input_line (char *prompt)
+initialize_input_line (const char *prompt)
 {
   input_line_prompt = prompt;
   if (prompt)
@@ -201,7 +200,7 @@ echo_area_after_read (void)
    active window, so that we can restore it when we need to.  PROMPT, if
    non-null, is a prompt to print before reading the line. */
 char *
-info_read_in_echo_area (WINDOW *window, char *prompt)
+info_read_in_echo_area (WINDOW *window, const char *prompt)
 {
   char *line;
 
@@ -560,7 +559,7 @@ DECLARE_INFO_COMMAND (ea_yank, _("Yank back the contents of the last kill"))
 
   if (!kill_ring_index)
     {
-      inform_in_echo_area ((char *) _("Kill ring is empty"));
+      inform_in_echo_area (_("Kill ring is empty"));
       return;
     }
 
@@ -799,7 +798,7 @@ completions_window_p (WINDOW *window)
 /* Workhorse for completion readers.  If FORCE is non-zero, the user cannot
    exit unless the line read completes, or is empty. */
 char *
-info_read_completing_internal (WINDOW *window, char *prompt,
+info_read_completing_internal (WINDOW *window, const char *prompt,
     REFERENCE **completions, int force)
 {
   char *line;
@@ -854,7 +853,7 @@ info_read_completing_internal (WINDOW *window, char *prompt,
           /* If one of the completions matches exactly, then that is okay, so
              return the current line. */
           for (i = 0; i < completions_found_index; i++)
-            if (strcasecmp (completions_found[i]->label, line) == 0)
+            if (mbscasecmp (completions_found[i]->label, line) == 0)
               {
                 free (line);
                 line = xstrdup (completions_found[i]->label);
@@ -865,9 +864,9 @@ info_read_completing_internal (WINDOW *window, char *prompt,
           if (i == completions_found_index)
             {
               if (!completions_found_index)
-                inform_in_echo_area ((char *) _("No completions"));
+                inform_in_echo_area (_("No completions"));
               else
-                inform_in_echo_area ((char *) _("Not complete"));
+                inform_in_echo_area (_("Not complete"));
               continue;
             }
         }
@@ -894,7 +893,7 @@ info_read_completing_internal (WINDOW *window, char *prompt,
 /* Read a line in the echo area with completion over COMPLETIONS. */
 char *
 info_read_completing_in_echo_area (WINDOW *window,
-    char *prompt, REFERENCE **completions)
+    const char *prompt, REFERENCE **completions)
 {
   return (info_read_completing_internal (window, prompt, completions, 1));
 }
@@ -903,7 +902,7 @@ info_read_completing_in_echo_area (WINDOW *window,
    not requiring it. */
 char *
 info_read_maybe_completing (WINDOW *window,
-    char *prompt, REFERENCE **completions)
+    const char *prompt, REFERENCE **completions)
 {
   return (info_read_completing_internal (window, prompt, completions, 0));
 }
@@ -921,11 +920,11 @@ DECLARE_INFO_COMMAND (ea_possible_completions, _("List possible completions"))
   if (!completions_found_index)
     {
       terminal_ring_bell ();
-      inform_in_echo_area ((char *) _("No completions"));
+      inform_in_echo_area (_("No completions"));
     }
   else if ((completions_found_index == 1) && (key != '?'))
     {
-      inform_in_echo_area ((char *) _("Sole completion"));
+      inform_in_echo_area (_("Sole completion"));
     }
   else
     {
@@ -934,8 +933,8 @@ DECLARE_INFO_COMMAND (ea_possible_completions, _("List possible completions"))
 
       initialize_message_buffer ();
       printf_to_message_buffer (completions_found_index == 1
-                                ? (char *) _("One completion:\n")
-                                : (char *) _("%d completions:\n"),
+                                ? _("One completion:\n")
+                                : _("%d completions:\n"),
 				(void *) (long) completions_found_index,
 				NULL, NULL);
 
@@ -1209,7 +1208,7 @@ build_completions (void)
 
   for (i = 0; (entry = echo_area_completion_items[i]); i++)
     {
-      if (strncasecmp (request, entry->label, len) == 0)
+      if (mbsncasecmp (request, entry->label, len) == 0)
         add_pointer_to_array (entry, completions_found_index,
                               completions_found, completions_found_slots,
                               20, REFERENCE *);
@@ -1217,7 +1216,7 @@ build_completions (void)
       if (!informed_of_lengthy_job && completions_found_index > 100)
         {
           informed_of_lengthy_job = 1;
-          window_message_in_echo_area ((char *) _("Building completions..."),
+          window_message_in_echo_area (_("Building completions..."),
               NULL, NULL);
         }
     }
@@ -1292,7 +1291,7 @@ compare_references (const void *entry1, const void *entry2)
   REFERENCE **e1 = (REFERENCE **) entry1;
   REFERENCE **e2 = (REFERENCE **) entry2;
 
-  return (strcasecmp ((*e1)->label, (*e2)->label));
+  return (mbscasecmp ((*e1)->label, (*e2)->label));
 }
 
 /* Prune duplicate entries from COMPLETIONS_FOUND. */
@@ -1383,7 +1382,7 @@ echo_area_inform_of_deleted_window (WINDOW *window)
 /* Push and Pop the echo area. */
 typedef struct {
   char *line;
-  char *prompt;
+  const char *prompt;
   REFERENCE **comp_items;
   int point, beg, end;
   int must_complete;
diff --git a/Build/source/utils/texinfo/info/echo-area.h b/Build/source/utils/texinfo/info/echo-area.h
index 31784282485..da397b6d61b 100644
--- a/Build/source/utils/texinfo/info/echo-area.h
+++ b/Build/source/utils/texinfo/info/echo-area.h
@@ -1,15 +1,15 @@
 /* echo-area.h -- Functions used in reading information from the echo area.
-   $Id: echo-area.h,v 1.4 2004/08/07 22:03:08 karl Exp $
+   $Id: echo-area.h,v 1.8 2008/02/26 16:51:05 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -37,25 +36,25 @@ extern void inform_in_echo_area (const char *message);
 extern void echo_area_inform_of_deleted_window (WINDOW *window);
 extern void echo_area_prep_read (void);
 extern VFunction *ea_last_executed_command;
-extern char * info_read_completing_internal (WINDOW *window, char *prompt,
+extern char * info_read_completing_internal (WINDOW *window, const char *prompt,
     REFERENCE **completions, int force);
 
 /* Read a line of text in the echo area.  Return a malloc ()'ed string,
    or NULL if the user aborted out of this read.  WINDOW is the currently
    active window, so that we can restore it when we need to.  PROMPT, if
    non-null, is a prompt to print before reading the line. */
-extern char *info_read_in_echo_area (WINDOW *window, char *prompt);
+extern char *info_read_in_echo_area (WINDOW *window, const char *prompt);
 
 /* Read a line in the echo area with completion over COMPLETIONS.
    Takes arguments of WINDOW, PROMPT, and COMPLETIONS, a REFERENCE **. */
 char *info_read_completing_in_echo_area (WINDOW *window,
-    char *prompt, REFERENCE **completions);
+    const char *prompt, REFERENCE **completions);
 
 /* Read a line in the echo area allowing completion over COMPLETIONS, but
    not requiring it.  Takes arguments of WINDOW, PROMPT, and COMPLETIONS,
    a REFERENCE **. */
 extern char *info_read_maybe_completing (WINDOW *window,
-    char *prompt, REFERENCE **completions);
+    const char *prompt, REFERENCE **completions);
 
 extern void ea_insert (WINDOW *window, int count, unsigned char key);
 extern void ea_quoted_insert (WINDOW *window, int count, unsigned char key);
diff --git a/Build/source/utils/texinfo/info/filesys.c b/Build/source/utils/texinfo/info/filesys.c
index 81344806456..c1b6107d187 100644
--- a/Build/source/utils/texinfo/info/filesys.c
+++ b/Build/source/utils/texinfo/info/filesys.c
@@ -1,13 +1,13 @@
 /* filesys.c -- filesystem specific functions.
-   $Id: filesys.c,v 1.6 2004/07/30 17:17:40 karl Exp $
+   $Id: filesys.c,v 1.11 2008/04/19 17:03:13 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2000, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2000, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -56,6 +55,7 @@ static char *info_suffixes[] = {
 static COMPRESSION_ALIST compress_suffixes[] = {
   { ".gz", "gunzip" },
   { ".bz2", "bunzip2" },
+  { ".lzma", "unlzma" },
   { ".z", "gunzip" },
   { ".Z", "uncompress" },
   { ".Y", "unyabba" },
@@ -694,7 +694,7 @@ is_dir_name (char *filename)
       strcpy (trydir, "dir");
       strcat (trydir, info_suffixes[i]);
       
-      if (strcasecmp (filename, trydir) == 0)
+      if (mbscasecmp (filename, trydir) == 0)
         return 1;
 
       for (c = 0; compress_suffixes[c].suffix; c++)
@@ -702,7 +702,7 @@ is_dir_name (char *filename)
           char dir_compressed[50]; /* can be short */
           strcpy (dir_compressed, trydir); 
           strcat (dir_compressed, compress_suffixes[c].suffix);
-          if (strcasecmp (filename, dir_compressed) == 0)
+          if (mbscasecmp (filename, dir_compressed) == 0)
             return 1;
         }
     }  
diff --git a/Build/source/utils/texinfo/info/filesys.h b/Build/source/utils/texinfo/info/filesys.h
index 89ca5430807..611a70941b9 100644
--- a/Build/source/utils/texinfo/info/filesys.h
+++ b/Build/source/utils/texinfo/info/filesys.h
@@ -1,12 +1,13 @@
 /* filesys.h -- external declarations for filesys.c.
-   $Id: filesys.h,v 1.3 2004/04/11 17:56:45 karl Exp $
+   $Id: filesys.h,v 1.7 2007/07/01 21:20:29 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2005, 2007 Free Software
+   Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -78,7 +78,7 @@ extern int is_dir_name (char *filename);
 
 /* The default value of INFOPATH. */
 #if !defined (DEFAULT_INFOPATH)
-#  define DEFAULT_INFOPATH "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
+#  define DEFAULT_INFOPATH ".:/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info"
 #endif /* !DEFAULT_INFOPATH */
 
 #if !defined (S_ISREG) && defined (S_IFREG)
diff --git a/Build/source/utils/texinfo/info/footnotes.c b/Build/source/utils/texinfo/info/footnotes.c
index c8cd7b54a27..3e096d7779e 100644
--- a/Build/source/utils/texinfo/info/footnotes.c
+++ b/Build/source/utils/texinfo/info/footnotes.c
@@ -1,13 +1,13 @@
 /* footnotes.c -- Some functions for manipulating footnotes.
-   $Id: footnotes.c,v 1.4 2004/04/11 17:56:45 karl Exp $
+   $Id: footnotes.c,v 1.8 2008/02/26 16:51:05 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2002, 2004 Free Software
+   Copyright (C) 1993, 1997, 1998, 1999, 2002, 2004, 2007 Free Software
    Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -210,7 +209,7 @@ info_get_or_remove_footnotes (WINDOW *window)
           /* If we are hacking automatic footnotes, and there are footnotes
              but we couldn't display them, print a message to that effect. */
           if (auto_footnotes_p)
-            inform_in_echo_area ((char *) _("Footnotes could not be displayed"));
+            inform_in_echo_area (_("Footnotes could not be displayed"));
           return (FN_UNABLE);
         }
     }
@@ -257,11 +256,11 @@ DECLARE_INFO_COMMAND (info_show_footnotes,
       switch (result)
         {
         case FN_UNFOUND:
-          info_error ((char *) msg_no_foot_node, NULL, NULL);
+          info_error (msg_no_foot_node, NULL, NULL);
           break;
 
         case FN_UNABLE:
-          info_error ((char *) msg_win_too_small, NULL, NULL);
+          info_error (msg_win_too_small, NULL, NULL);
           break;
         }
     }
diff --git a/Build/source/utils/texinfo/info/footnotes.h b/Build/source/utils/texinfo/info/footnotes.h
index 7f583994261..6a8282828fb 100644
--- a/Build/source/utils/texinfo/info/footnotes.h
+++ b/Build/source/utils/texinfo/info/footnotes.h
@@ -1,12 +1,13 @@
 /* footnotes.h -- Some functions for manipulating footnotes.
-   $Id: footnotes.h,v 1.3 2004/04/11 17:56:45 karl Exp $
+   $Id: footnotes.h,v 1.6 2007/07/01 21:20:29 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/gc.c b/Build/source/utils/texinfo/info/gc.c
index 9416e3bb2e8..9fa19891bf4 100644
--- a/Build/source/utils/texinfo/info/gc.c
+++ b/Build/source/utils/texinfo/info/gc.c
@@ -1,12 +1,12 @@
 /* gc.c -- Functions to remember and garbage collect unused node contents.
-   $Id: gc.c,v 1.3 2004/04/11 17:56:45 karl Exp $
+   $Id: gc.c,v 1.6 2007/07/01 22:32:12 karl Exp $
 
-   Copyright (C) 1993, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2004, 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or (at
+   your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/gc.h b/Build/source/utils/texinfo/info/gc.h
index 67d031f9b87..a35fcac2175 100644
--- a/Build/source/utils/texinfo/info/gc.h
+++ b/Build/source/utils/texinfo/info/gc.h
@@ -1,15 +1,15 @@
 /* gc.h -- Functions for garbage collecting unused node contents.
-   $Id: gc.h,v 1.3 2004/04/11 17:56:45 karl Exp $
+   $Id: gc.h,v 1.6 2007/07/01 21:20:30 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/indices.c b/Build/source/utils/texinfo/info/indices.c
index f5b0eb57633..9c60c7b3b88 100644
--- a/Build/source/utils/texinfo/info/indices.c
+++ b/Build/source/utils/texinfo/info/indices.c
@@ -1,13 +1,13 @@
 /* indices.c -- deal with an Info file index.
-   $Id: indices.c,v 1.5 2004/04/11 17:56:45 karl Exp $
+   $Id: indices.c,v 1.10 2008/02/26 16:51:05 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -196,7 +195,7 @@ do_info_index_search (WINDOW *window, int count, char *search_string)
       (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
     {
       info_free_references (index_index);
-      window_message_in_echo_area ((char *) _("Finding index entries..."),
+      window_message_in_echo_area (_("Finding index entries..."),
           NULL, NULL);
       index_index = info_indices_of_file_buffer (fb);
     }
@@ -204,7 +203,7 @@ do_info_index_search (WINDOW *window, int count, char *search_string)
   /* If there is no index, quit now. */
   if (!index_index)
     {
-      info_error ((char *) _("No indices found."), NULL, NULL);
+      info_error (_("No indices found."), NULL, NULL);
       return;
     }
 
@@ -214,7 +213,7 @@ do_info_index_search (WINDOW *window, int count, char *search_string)
     line = xstrdup (search_string);
   else
     {
-      line = info_read_maybe_completing (window, (char *) _("Index entry: "),
+      line = info_read_maybe_completing (window, _("Index entry: "),
                                          index_index);
       window = active_window;
 
@@ -332,14 +331,14 @@ DECLARE_INFO_COMMAND (info_next_index_match,
      yet. */
   if (!index_search)
     {
-      info_error ((char *) _("No previous index search string."), NULL, NULL);
+      info_error (_("No previous index search string."), NULL, NULL);
       return;
     }
 
   /* If there is no index, that is an error. */
   if (!index_index)
     {
-      info_error ((char *) _("No index entries."), NULL, NULL);
+      info_error (_("No index entries."), NULL, NULL);
       return;
     }
 
@@ -372,7 +371,7 @@ DECLARE_INFO_COMMAND (info_next_index_match,
   /* If that failed, print an error. */
   if ((i < 0) || (!index_index[i]))
     {
-      info_error ((char *) _("No %sindex entries containing `%s'."),
+      info_error (_("No %sindex entries containing `%s'."),
                   index_offset > 0 ? (char *) _("more ") : "", index_search);
       return;
     }
@@ -419,7 +418,7 @@ DECLARE_INFO_COMMAND (info_next_index_match,
       char *format;
 
       format = replace_in_documentation
-        ((char *) _("Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"),
+        (_("Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"),
          0);
 
       window_message_in_echo_area (format, match, (char *) name);
@@ -433,19 +432,28 @@ DECLARE_INFO_COMMAND (info_next_index_match,
 
   if (!node)
     {
-      info_error ((char *) msg_cant_file_node,
+      info_error (msg_cant_file_node,
                   index_index[i]->filename, index_index[i]->nodename);
       return;
     }
 
   info_set_node_of_window (1, window, node);
 
-  /* Try to find an occurence of LABEL in this node. */
   {
-    long start, loc;
+    long loc;
+    long line = index_index[i]->line_number - 1;
 
-    start = window->line_starts[1] - window->node->contents;
-    loc = info_target_search_node (node, index_index[i]->label, start);
+    if (line >= 0 && line < window->line_count)
+      {
+	/* Jump to the line number specified in the index entry.  */
+	loc = window->line_starts[line] - window->node->contents;
+      }
+    else
+      {
+	/* Try to find an occurence of LABEL in this node. */
+	long start = window->line_starts[1] - window->node->contents;
+	loc = info_target_search_node (node, index_index[i]->label, start);
+      }
 
     if (loc != -1)
       {
@@ -538,7 +546,7 @@ apropos_in_all_indices (char *search_string, int inform)
 	  }
 
         if (this_fb && inform)
-          message_in_echo_area ((char *) _("Scanning indices of `%s'..."),
+          message_in_echo_area (_("Scanning indices of `%s'..."),
               files_name, NULL);
 
         this_index = info_indices_of_file_buffer (this_fb);
@@ -603,7 +611,7 @@ info_apropos (char *string)
   apropos_list = apropos_in_all_indices (string, 0);
 
   if (!apropos_list)
-    info_error ((char *) _(APROPOS_NONE), string, NULL);
+    info_error (_(APROPOS_NONE), string, NULL);
   else
     {
       register int i;
@@ -623,7 +631,7 @@ DECLARE_INFO_COMMAND (info_index_apropos,
 {
   char *line;
 
-  line = info_read_in_echo_area (window, (char *) _("Index apropos: "));
+  line = info_read_in_echo_area (window, _("Index apropos: "));
 
   window = active_window;
 
@@ -643,7 +651,7 @@ DECLARE_INFO_COMMAND (info_index_apropos,
       apropos_list = apropos_in_all_indices (line, 1);
 
       if (!apropos_list)
-        info_error ((char *) _(APROPOS_NONE), line, NULL);
+        info_error (_(APROPOS_NONE), line, NULL);
       else
         {
           register int i;
@@ -651,7 +659,7 @@ DECLARE_INFO_COMMAND (info_index_apropos,
 
           initialize_message_buffer ();
           printf_to_message_buffer
-            ((char *) _("\n* Menu: Nodes whose indices contain `%s':\n"),
+            (_("\n* Menu: Nodes whose indices contain `%s':\n"),
              line, NULL, NULL);
           line_buffer = (char *)xmalloc (500);
 
diff --git a/Build/source/utils/texinfo/info/indices.h b/Build/source/utils/texinfo/info/indices.h
index 1ccd6763616..712fa88bc8e 100644
--- a/Build/source/utils/texinfo/info/indices.h
+++ b/Build/source/utils/texinfo/info/indices.h
@@ -1,15 +1,15 @@
 /* indices.h -- Functions defined in indices.c.
-   $Id: indices.h,v 1.3 2004/04/11 17:56:45 karl Exp $
+   $Id: indices.h,v 1.6 2007/07/01 21:20:30 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/info-utils.c b/Build/source/utils/texinfo/info/info-utils.c
index c23bac571ae..11cb4427a8a 100644
--- a/Build/source/utils/texinfo/info/info-utils.c
+++ b/Build/source/utils/texinfo/info/info-utils.c
@@ -1,12 +1,12 @@
 /* info-utils.c -- miscellanous.
-   $Id: info-utils.c,v 1.4 2004/04/11 17:56:45 karl Exp $
+   $Id: info-utils.c,v 1.9 2007/12/03 01:38:42 karl Exp $
 
-   Copyright (C) 1993, 1998, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1998, 2003, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -250,7 +249,7 @@ info_references_internal (char *label, SEARCH_BINDING *binding)
   tmp_search.end = binding->end;
   tmp_search.flags = S_FoldCase | S_SkipDest;
 
-  searching_for_menu_items = (strcasecmp (label, INFO_MENU_ENTRY_LABEL) == 0);
+  searching_for_menu_items = (mbscasecmp (label, INFO_MENU_ENTRY_LABEL) == 0);
 
   while ((position = search_forward (label, &tmp_search)) != -1)
     {
@@ -290,7 +289,8 @@ info_references_internal (char *label, SEARCH_BINDING *binding)
       strncpy (entry->label, refdef, offset - 1);
       entry->label[offset - 1] = '\0';
       canonicalize_whitespace (entry->label);
-
+      entry->line_number = 0;
+      
       refdef += offset;
       entry->start = start;
       entry->end = refdef - binding->buffer;
@@ -396,6 +396,7 @@ info_copy_reference (REFERENCE *src)
   dest->nodename = src->nodename ? xstrdup (src->nodename) : NULL;
   dest->start = src->start;
   dest->end = src->end;
+  dest->line_number = 0;
   
   return dest;
 }
diff --git a/Build/source/utils/texinfo/info/info-utils.h b/Build/source/utils/texinfo/info/info-utils.h
index 6517b152069..34d8dc5b113 100644
--- a/Build/source/utils/texinfo/info/info-utils.h
+++ b/Build/source/utils/texinfo/info/info-utils.h
@@ -1,13 +1,13 @@
 /* info-utils.h -- Exported functions and variables from info-utils.c.
-   $Id: info-utils.h,v 1.4 2004/04/11 17:56:45 karl Exp $   
+   $Id: info-utils.h,v 1.7 2007/07/01 21:20:30 karl Exp $   
 
-   Copyright (C) 1993, 1996, 1998, 2002, 2003, 2004 Free Software
+   Copyright (C) 1993, 1996, 1998, 2002, 2003, 2004, 2007 Free Software
    Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/info.c b/Build/source/utils/texinfo/info/info.c
index 79dd0240c0a..38414257d93 100644
--- a/Build/source/utils/texinfo/info/info.c
+++ b/Build/source/utils/texinfo/info/info.c
@@ -1,13 +1,13 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.11 2004/04/11 17:56:45 karl Exp $
+   $Id: info.c,v 1.30 2008/03/20 18:37:58 karl Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004 Free Software Foundation, Inc.
+   2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,10 +15,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-   Written by Brian Fox (bfox@ai.mit.edu). */
+   Originally written by Brian Fox (bfox@ai.mit.edu). */
 
 #include "info.h"
 #include "indices.h"
@@ -28,7 +27,7 @@
 #  include "man.h"
 #endif /* HANDLE_MAN_PAGES */
 
-static char *program_name = "info";
+char *program_name = "info";
 
 /* Non-zero means search all indices for APROPOS_SEARCH_STRING. */
 static int apropos_p = 0;
@@ -95,12 +94,11 @@ int speech_friendly = 0;
 /* Structure describing the options that Info accepts.  We pass this structure
    to getopt_long ().  If you add or otherwise change this structure, you must
    also change the string which follows it. */
-#define APROPOS_OPTION 1
 #define DRIBBLE_OPTION 2
 #define RESTORE_OPTION 3
 #define IDXSRCH_OPTION 4
 static struct option long_options[] = {
-  { "apropos", 1, 0, APROPOS_OPTION },
+  { "apropos", 1, 0, 'k' },
   { "directory", 1, 0, 'd' },
   { "dribble", 1, 0, DRIBBLE_OPTION },
   { "file", 1, 0, 'f' },
@@ -126,9 +124,9 @@ static struct option long_options[] = {
 
 /* String describing the shorthand versions of the long options found above. */
 #ifdef __MSDOS__
-static char *short_options = "d:n:f:ho:ORswb";
+static char *short_options = "k:d:n:f:ho:ORswb";
 #else
-static char *short_options = "d:n:f:ho:ORws";
+static char *short_options = "k:d:n:f:ho:ORws";
 #endif
 
 /* When non-zero, the Info window system has been initialized. */
@@ -146,7 +144,7 @@ static void init_messages (void);
 /* **************************************************************** */
 
 int
-main (int argc, char **argv)
+main (int argc, char *argv[])
 {
   int getopt_long_index;        /* Index returned by getopt_long (). */
   NODE *initial_node;           /* First node loaded by Info. */
@@ -154,7 +152,7 @@ main (int argc, char **argv)
 #ifdef HAVE_SETLOCALE
   /* Set locale via LC_ALL.  */
   setlocale (LC_ALL, "");
-#endif
+#endif /* HAVE_SETLOCALE */
 
 #ifdef ENABLE_NLS
   /* Set the text message domain.  */
@@ -247,7 +245,7 @@ main (int argc, char **argv)
 #endif /* __MSDOS__ */
 
           /* User has specified a string to search all indices for. */
-        case APROPOS_OPTION:
+        case 'k':
           apropos_p = 1;
           maybe_free (apropos_search_string);
           apropos_search_string = xstrdup (optarg);
@@ -289,12 +287,13 @@ main (int argc, char **argv)
   /* If the user specified --version, then show the version and exit. */
   if (print_version_p)
     {
-      printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
+      printf ("info (GNU %s) %s\n", PACKAGE, VERSION);
       puts ("");
-      puts ("Copyright (C) 2004 Free Software Foundation, Inc.");
-      printf (_("There is NO warranty.  You may redistribute this software\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.\n"));
+      printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
+This is free software: you are free to change and redistribute it.\n\
+There is NO WARRANTY, to the extent permitted by law.\n"),
+	      "2008");
       xexit (0);
     }
 
@@ -366,7 +365,7 @@ For more information about these matters, see the files named COPYING.\n"));
       if (info_recent_file_error)
         info_error (info_recent_file_error, NULL, NULL);
       else
-        info_error ((char *) msg_cant_find_node,
+        info_error (msg_cant_find_node,
                     user_nodenames ? user_nodenames[0] : "Top", NULL);
       xexit (1);
     }
@@ -397,8 +396,15 @@ For more information about these matters, see the files named COPYING.\n"));
   {
     const char *errstr;
     char *errarg1, *errarg2;
+    NODE *new_initial_node;
+
+   /* If they say info -O info, we want to show them the invocation node
+      for standalone info; there's nothing useful in info.texi.  */
+   if (goto_invocation_p && argv[optind]
+       && mbscasecmp (argv[optind], "info") == 0)
+     argv[optind] = "info-stnd";
 
-    NODE *new_initial_node = info_follow_menus (initial_node, argv + optind,
+    new_initial_node = info_follow_menus (initial_node, argv + optind,
         &errstr, &errarg1, &errarg2);
 
     if (new_initial_node && new_initial_node != initial_node)
@@ -425,13 +431,13 @@ For more information about these matters, see the files named COPYING.\n"));
           dump_node_to_file (initial_node, user_output_filename,
                              dump_subnodes);
         else
-          info_error ((char *) errstr, errarg1, errarg2);
+          info_error (errstr, errarg1, errarg2);
       }
     else
       {
 
         if (errstr)
-          begin_info_session_with_error (initial_node, (char *) errstr,
+          begin_info_session_with_error (initial_node, errstr,
               errarg1, errarg2);
         /* If the user specified `--index-search=STRING' or
            --show-options, start the info session in the node
@@ -548,14 +554,19 @@ int info_error_rings_bell_p = 1;
    then the message is printed in the echo area.  Otherwise, a message is
    output to stderr. */
 void
-info_error (char *format, void *arg1, void *arg2)
+info_error (const char *format, void *arg1, void *arg2)
 {
   info_error_was_printed = 1;
 
   if (!info_windows_initialized_p || display_inhibited)
     {
       fprintf (stderr, "%s: ", program_name);
-      fprintf (stderr, format, arg1, arg2);
+      if (arg1)
+        fprintf (stderr, format, arg1, arg2);
+      else
+        /* If we're passed a string, just print it.  Otherwise a % in a
+           filename gets treated as a format specifier.  */
+        fputs (format, stderr);
       fprintf (stderr, "\n");
       fflush (stderr);
     }
@@ -569,9 +580,7 @@ info_error (char *format, void *arg1, void *arg2)
         }
       else
         {
-          NODE *temp;
-
-          temp = build_message_node (format, arg1, arg2);
+          NODE *temp = build_message_node (format, arg1, arg2);
           if (info_error_rings_bell_p)
             terminal_ring_bell ();
           inform_in_echo_area (temp->contents);
@@ -586,51 +595,57 @@ info_error (char *format, void *arg1, void *arg2)
 static void
 info_short_help (void)
 {
-#ifdef __MSDOS__
-  static const char speech_friendly_string[] = N_("\
-  -b, --speech-friendly        be friendly to speech synthesizers.\n");
-#else
-  static const char speech_friendly_string[] = "";
-#endif
-
-
   printf (_("\
 Usage: %s [OPTION]... [MENU-ITEM...]\n\
 \n\
-Read documentation in Info format.\n\
-\n\
+Read documentation in Info format.\n"), program_name);
+  puts ("");
+
+  puts (_("\
 Options:\n\
-      --apropos=STRING         look up STRING in all indices of all manuals.\n\
+  -k, --apropos=STRING         look up STRING in all indices of all manuals.\n\
   -d, --directory=DIR          add DIR to INFOPATH.\n\
       --dribble=FILENAME       remember user keystrokes in FILENAME.\n\
-  -f, --file=FILENAME          specify Info file to visit.\n\
+  -f, --file=FILENAME          specify Info file to visit."));
+
+  puts (_("\
   -h, --help                   display this help and exit.\n\
       --index-search=STRING    go to node pointed by index entry STRING.\n\
   -n, --node=NODENAME          specify nodes in first visited Info file.\n\
-  -o, --output=FILENAME        output selected nodes to FILENAME.\n\
+  -o, --output=FILENAME        output selected nodes to FILENAME."));
+
+  puts (_("\
   -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n\
       --no-raw-escapes         output escapes as literal text.\n\
       --restore=FILENAME       read initial keystrokes from FILENAME.\n\
-  -O, --show-options, --usage  go to command-line options node.\n%s\
+  -O, --show-options, --usage  go to command-line options node."));
+
+#ifdef __MSDOS__
+  puts (_("\
+  -b, --speech-friendly        be friendly to speech synthesizers."));
+#endif
+
+  puts (_("\
       --subnodes               recursively output menu items.\n\
-  -w, --where, --location      print physical location of Info file.\n\
       --vi-keys                use vi-like and less-like key bindings.\n\
       --version                display version information and exit.\n\
-\n\
+  -w, --where, --location      print physical location of Info file."));
+
+  puts (_("\n\
 The first non-option argument, if present, is the menu entry to start from;\n\
 it is searched for in all `dir' files along INFOPATH.\n\
 If it is not present, info merges all `dir' files and shows the result.\n\
 Any remaining arguments are treated as the names of menu\n\
-items relative to the initial node visited.\n\
-\n\
+items relative to the initial node visited."));
+
+  puts (_("\n\
 Examples:\n\
   info                       show top-level dir menu\n\
   info emacs                 start at emacs node from top-level dir\n\
   info emacs buffers         start at buffers node within emacs manual\n\
   info --show-options emacs  start at node with emacs' command line options\n\
-  info -f ./foo.info         show file ./foo.info, not searching dir\n\
-"),
-  program_name, speech_friendly_string);
+  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n\
+  info -f ./foo.info         show file ./foo.info, not searching dir"));
 
   puts (_("\n\
 Email bug reports to bug-texinfo@gnu.org,\n\
diff --git a/Build/source/utils/texinfo/info/info.h b/Build/source/utils/texinfo/info/info.h
index 7ff8abe9b19..135e0336dcf 100644
--- a/Build/source/utils/texinfo/info/info.h
+++ b/Build/source/utils/texinfo/info/info.h
@@ -1,13 +1,13 @@
 /* info.h -- Header file which includes all of the other headers.
-   $Id: info.h,v 1.4 2004/04/11 17:56:45 karl Exp $
+   $Id: info.h,v 1.8 2008/02/26 16:51:05 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -126,7 +125,7 @@ extern int raw_escapes_p;
 /* Print FORMAT with ARG1 and ARG2.  If the window system was initialized,
    then the message is printed in the echo area.  Otherwise, a message is
    output to stderr. */
-extern void info_error (char *format, void *arg1, void *arg2);
+extern void info_error (const char *format, void *arg1, void *arg2);
 
 extern void add_file_directory_to_path (char *filename);
 
@@ -155,6 +154,6 @@ extern void set_variable_to_value (char *name, char *value);
 #endif /* INFOKEY */
 
 /* Found in m-x.c.  */
-extern char *read_function_name (char *prompt, WINDOW *window);
+extern char *read_function_name (const char *prompt, WINDOW *window);
 
 #endif /* !INFO_H */
diff --git a/Build/source/utils/texinfo/info/infodoc.c b/Build/source/utils/texinfo/info/infodoc.c
index eeea147a967..31a82222430 100644
--- a/Build/source/utils/texinfo/info/infodoc.c
+++ b/Build/source/utils/texinfo/info/infodoc.c
@@ -1,13 +1,13 @@
 /* infodoc.c -- functions which build documentation nodes.
-   $Id: infodoc.c,v 1.8 2004/04/11 17:56:45 karl Exp $
+   $Id: infodoc.c,v 1.25 2008/03/08 01:55:39 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
+   2007, 2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -31,10 +30,10 @@
 static char *info_help_nodename = "*Info Help*";
 
 /* A node containing printed key bindings and their documentation. */
-static NODE *internal_info_help_node = (NODE *)NULL;
+static NODE *internal_info_help_node = NULL;
 
 /* A pointer to the contents of the help node. */
-static char *internal_info_help_node_contents = (char *)NULL;
+static char *internal_info_help_node_contents = NULL;
 
 /* The (more or less) static text which appears in the internal info
    help node.  The actual key bindings are inserted.  Keep the
@@ -43,49 +42,44 @@ static char *internal_info_help_node_contents = (char *)NULL;
 #if defined(INFOKEY)
 
 static char *info_internal_help_text[] = {
-  N_("Basic Commands in Info Windows\n\
-******************************\n"),
+  N_("Basic Info command keys\n"),
   "\n",
-  N_("\\%-10[quit-help]  Quit this help.\n"),
+  N_("\\%-10[quit-help]  Close this help window.\n"),
   N_("\\%-10[quit]  Quit Info altogether.\n"),
   N_("\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"),
   "\n",
-  N_("Selecting other nodes:\n\
-----------------------\n"),
-  N_("\\%-10[next-node]  Move to the \"next\" node of this node.\n"),
-  N_("\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"),
-  N_("\\%-10[up-node]  Move \"up\" from this node.\n"),
-  N_("\\%-10[menu-item]  Pick menu item specified by name.\n\
-              Picking a menu item causes another node to be selected.\n"),
-  N_("\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"),
-  N_("\\%-10[history-node]  Move to the last node seen in this window.\n"),
-  N_("\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"),
-  N_("\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this node.\n"),
-  N_("\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"),
-  N_("\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-node] (DIR)'.\n"),
-  N_("\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"),
-  "\n",
-  N_("Moving within a node:\n\
----------------------\n"),
+  N_("\\%-10[prev-line]  Move up one line.\n"),
+  N_("\\%-10[next-line]  Move down one line.\n"),
+  N_("\\%-10[scroll-backward]  Scroll backward one screenful.\n"),
+  N_("\\%-10[scroll-forward]  Scroll forward one screenful.\n"),
   N_("\\%-10[beginning-of-node]  Go to the beginning of this node.\n"),
   N_("\\%-10[end-of-node]  Go to the end of this node.\n"),
-  N_("\\%-10[next-line]  Scroll forward 1 line.\n"),
-  N_("\\%-10[prev-line]  Scroll backward 1 line.\n"),
-  N_("\\%-10[scroll-forward]  Scroll forward a page.\n"),
-  N_("\\%-10[scroll-backward]  Scroll backward a page.\n"),
   "\n",
-  N_("Other commands:\n\
----------------\n"),
-  N_("\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"),
-  N_("\\%-10[last-menu-item]  Pick last item in node's menu.\n"),
-  N_("\\%-10[index-search]  Search for a specified string in the index entries of this Info\n\
-              file, and select the node referenced by the first entry found.\n"),
-  N_("\\%-10[goto-node]  Move to node specified by name.\n\
-              You may include a filename as well, as in (FILENAME)NODENAME.\n"),
-  N_("\\%-10[search]  Search forward for a specified string\n\
-              and select the node in which the next occurrence is found.\n"),
-  N_("\\%-10[search-backward]  Search backward for a specified string\n\
-              and select the node in which the previous occurrence is found.\n"),
+  N_("\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"),
+  N_("\\%-10[select-reference-this-line]  Follow the hypertext link under the cursor.\n"),
+  N_("\\%-10[history-node]  Go back to the last node seen in this window.\n"),
+  "\n",
+  N_("\\%-10[global-prev-node]  Go to the previous node in the document.\n"),
+  N_("\\%-10[global-next-node]  Go to the next node in the document.\n"),
+  N_("\\%-10[prev-node]  Go to the previous node on this level.\n"),
+  N_("\\%-10[next-node]  Go to the next node on this level.\n"),
+  N_("\\%-10[up-node]  Go up one level.\n"),
+  N_("\\%-10[top-node]  Go to the top node of this document.\n"),
+  N_("\\%-10[dir-node]  Go to the main `directory' node.\n"),
+  "\n",
+  N_("1...9       Pick the first...ninth item in this node's menu.\n"),
+  N_("\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"),
+  N_("\\%-10[menu-item]  Pick a menu item specified by name.\n"),
+  N_("\\%-10[xref-item]  Follow a cross reference specified by name.\n"),
+  N_("\\%-10[goto-node]  Go to a node specified by name.\n"),
+  "\n",
+  N_("\\%-10[search]  Search forward for a specified string.\n"),
+  N_("\\%-10[search-previous]  Search for previous occurrence.\n"),
+  N_("\\%-10[search-next]  Search for next occurrence.\n"),
+  N_("\\%-10[index-search]  Search for a specified string in the index, and\n\
+              select the node referenced by the first entry found.\n"),
+  N_("\\%-10[abort-key]  Cancel the current operation.\n"),
+  "\n",
   NULL
 };
 
@@ -104,8 +98,8 @@ static char *info_internal_help_text[] = {
   N_("  %-10s  Move to the `next' node of this node.\n"),
   N_("  %-10s  Move to the `previous' node of this node.\n"),
   N_("  %-10s  Move `up' from this node.\n"),
-  N_("  %-10s  Pick menu item specified by name.\n"),
-  N_("              Picking a menu item causes another node to be selected.\n"),
+  N_("  %-10s  Pick menu item specified by name.\n\
+              Picking a menu item causes another node to be selected.\n"),
   N_("  %-10s  Follow a cross reference.  Reads name of reference.\n"),
   N_("  %-10s  Move to the last node seen in this window.\n"),
   N_("  %-10s  Skip to next hypertext link within this node.\n"),
@@ -124,16 +118,18 @@ static char *info_internal_help_text[] = {
   "\n",
   N_("Other commands:\n\
 ---------------\n"),
-  N_("  %-10s  Pick first ... ninth item in node's menu.\n"),
+  N_("  %-10s  Pick first...ninth item in node's menu.\n"),
   N_("  %-10s  Pick last item in node's menu.\n"),
-  N_("  %-10s  Search for a specified string in the index entries of this Info\n"),
-  N_("              file, and select the node referenced by the first entry found.\n"),
-  N_("  %-10s  Move to node specified by name.\n"),
-  N_("              You may include a filename as well, as in (FILENAME)NODENAME.\n"),
-  N_("  %-10s  Search forward for a specified string,\n"),
-  N_("              and select the node in which the next occurrence is found.\n"),
-  N_("  %-10s  Search backward for a specified string\n"),
-  N_("              and select the node in which the next occurrence is found.\n"),
+  /* The next four strings are each a unity, so they each need to be
+     kept as one string for the translators.  */
+  N_("  %-10s  Search for a specified string in the index entries of this Info\n\
+              file, and select the node referenced by the first entry found.\n"),
+  N_("  %-10s  Move to node specified by name.\n\
+              You may include a filename as well, as in (FILENAME)NODENAME.\n"),
+  N_("  %-10s  Search forward for a specified string,\n\
+              and select the node in which the next occurrence is found.\n"),
+  N_("  %-10s  Search backward for a specified string,\n\
+              and select the node in which the next occurrence is found.\n"),
   NULL
 };
 
@@ -293,7 +289,7 @@ create_internal_info_help_node (int help_is_only_window_p)
         {
 #ifdef INFOKEY
           printf_to_message_buffer (replace_in_documentation
-              ((char *) _(info_internal_help_text[i]), help_is_only_window_p),
+              (_(info_internal_help_text[i]), help_is_only_window_p),
               NULL, NULL, NULL);
 #else
           /* Don't translate blank lines, gettext outputs the po file
@@ -312,16 +308,16 @@ create_internal_info_help_node (int help_is_only_window_p)
 #endif /* !INFOKEY */
         }
 
-      printf_to_message_buffer ("---------------------\n\n", NULL, NULL, NULL);
-      printf_to_message_buffer ((char *) _("The current search path is:\n"),
+      printf_to_message_buffer ("---------------------\n", NULL, NULL, NULL);
+      printf_to_message_buffer (_("The current search path is:\n"),
           NULL, NULL, NULL);
-      printf_to_message_buffer ("  %s\n", infopath, NULL, NULL);
+      printf_to_message_buffer ("%s\n", infopath, NULL, NULL);
       printf_to_message_buffer ("---------------------\n\n", NULL, NULL, NULL);
-      printf_to_message_buffer ((char *) _("Commands available in Info windows:\n\n"),
+      printf_to_message_buffer (_("Commands available in Info windows:\n\n"),
           NULL, NULL, NULL);
       dump_map_to_message_buffer ("", info_keymap);
       printf_to_message_buffer ("---------------------\n\n", NULL, NULL, NULL);
-      printf_to_message_buffer ((char *) _("Commands available in the echo area:\n\n"),
+      printf_to_message_buffer (_("Commands available in the echo area:\n\n"),
           NULL, NULL, NULL);
       dump_map_to_message_buffer ("", echo_area_keymap);
 
@@ -344,11 +340,11 @@ create_internal_info_help_node (int help_is_only_window_p)
                       NULL, NULL, NULL);
                   if (exec_keys && exec_keys[0])
                       printf_to_message_buffer
-                        ((char *) _("The following commands can only be invoked via %s:\n\n"),
+                        (_("The following commands can only be invoked via %s:\n\n"),
                          exec_keys, NULL, NULL);
                   else
                       printf_to_message_buffer
-                        ((char *) _("The following commands cannot be invoked at all:\n\n"),
+                        (_("The following commands cannot be invoked at all:\n\n"),
                          NULL, NULL, NULL);
                   printed_one_mx = 1;
                 }
@@ -358,7 +354,7 @@ create_internal_info_help_node (int help_is_only_window_p)
                  exec_keys,
                  function_doc_array[i].func_name,
                  replace_in_documentation (strlen (function_doc_array[i].doc)
-                   ? (char *) _(function_doc_array[i].doc) : "", 0)
+                   ? _(function_doc_array[i].doc) : "", 0)
                 );
 
             }
@@ -370,10 +366,6 @@ create_internal_info_help_node (int help_is_only_window_p)
       maybe_free (exec_keys);
 #endif /* NAMED_FUNCTIONS */
 
-      printf_to_message_buffer
-        ("%s", replace_in_documentation
-         ((char *) _("--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"), 0),
-         NULL, NULL);
       node = message_buffer_to_node ();
       internal_info_help_node_contents = node->contents;
     }
@@ -494,7 +486,7 @@ DECLARE_INFO_COMMAND (info_get_help_window, _("Display help message"))
     }
   else
     {
-      info_error ((char *) msg_cant_make_help, NULL, NULL);
+      info_error (msg_cant_make_help, NULL, NULL);
     }
 }
 
@@ -513,7 +505,7 @@ DECLARE_INFO_COMMAND (info_get_info_help_node, _("Visit Info node `(info)Help'")
     for (win = windows; win; win = win->next)
       {
         if (win->node && win->node->filename &&
-            (strcasecmp
+            (mbscasecmp
              (filename_non_directory (win->node->filename), "info") == 0) &&
             ((strcmp (win->node->nodename, "Help") == 0) ||
              (strcmp (win->node->nodename, "Help-Small-Screen") == 0)))
@@ -538,7 +530,7 @@ DECLARE_INFO_COMMAND (info_get_info_help_node, _("Visit Info node `(info)Help'")
       if (info_recent_file_error)
         info_error (info_recent_file_error, NULL, NULL);
       else
-        info_error ((char *) msg_cant_file_node, "Info", nodename);
+        info_error (msg_cant_file_node, "Info", nodename);
     }
   else
     {
@@ -586,7 +578,7 @@ function_documentation (InfoCommand *cmd)
 
 #endif /* !INFOKEY */
 
-  return replace_in_documentation ((strlen (doc) == 0) ? doc : (char *) _(doc), 0);
+  return replace_in_documentation ((strlen (doc) == 0) ? doc : _(doc), 0);
 }
 
 #if defined (NAMED_FUNCTIONS)
@@ -650,7 +642,7 @@ DECLARE_INFO_COMMAND (describe_key, _("Print documentation for KEY"))
 
   for (;;)
     {
-      message_in_echo_area ((char *) _("Describe key: %s"),
+      message_in_echo_area (_("Describe key: %s"),
           pretty_keyseq (keys), NULL);
       keystroke = info_get_input_char ();
       unmessage_in_echo_area ();
@@ -677,7 +669,7 @@ DECLARE_INFO_COMMAND (describe_key, _("Print documentation for KEY"))
 
       if (map[keystroke].function == (InfoCommand *)NULL)
         {
-          message_in_echo_area ((char *) _("%s is undefined."),
+          message_in_echo_area (_("%s is undefined."),
               pretty_keyseq (keys), NULL);
           return;
         }
@@ -706,7 +698,7 @@ DECLARE_INFO_COMMAND (describe_key, _("Print documentation for KEY"))
 
               if (map[lowerkey].function == (InfoCommand *)NULL)
                 {
-                  message_in_echo_area ((char *) _("%s is undefined."),
+                  message_in_echo_area (_("%s is undefined."),
                                         pretty_keyseq (keys), NULL);
                   return;
                 }
@@ -887,7 +879,7 @@ strrpbrk (const char *s, const char *f)
 
 /* Replace the names of functions with the key that invokes them. */
 char *
-replace_in_documentation (char *string, int help_is_only_window_p)
+replace_in_documentation (const char *string, int help_is_only_window_p)
 {
   unsigned reslen = strlen (string);
   register int i, start, next;
@@ -970,7 +962,7 @@ replace_in_documentation (char *string, int help_is_only_window_p)
 
             /* If we have only one window (because the window size was too
                small to split it), we have to quit help by going back one
-               noew in the history list, not deleting the window.  */
+               node in the history list, not deleting the window.  */
               if (strcmp (rep_name, "quit-help") == 0)
                 fun_name = help_is_only_window_p ? "history-node"
                                                  : "delete-window";
@@ -1154,7 +1146,7 @@ DECLARE_INFO_COMMAND (info_where_is,
 {
   char *command_name;
 
-  command_name = read_function_name ((char *) _("Where is command: "), window);
+  command_name = read_function_name (_("Where is command: "), window);
 
   if (!command_name)
     {
@@ -1176,23 +1168,23 @@ DECLARE_INFO_COMMAND (info_where_is,
 
           if (!location || !location[0])
             {
-              info_error ((char *) _("`%s' is not on any keys"),
+              info_error (_("`%s' is not on any keys"),
                   command_name, NULL);
             }
           else
             {
               if (strstr (location, function_name (command)))
                 window_message_in_echo_area
-                  ((char *) _("%s can only be invoked via %s."),
+                  (_("%s can only be invoked via %s."),
                    command_name, location);
               else
                 window_message_in_echo_area
-                  ((char *) _("%s can be invoked via %s."),
+                  (_("%s can be invoked via %s."),
                    command_name, location);
             }
         }
       else
-        info_error ((char *) _("There is no function named `%s'"),
+        info_error (_("There is no function named `%s'"),
             command_name, NULL);
     }
 
diff --git a/Build/source/utils/texinfo/info/infokey.c b/Build/source/utils/texinfo/info/infokey.c
index 51f23aab0c8..4f49e74f78c 100644
--- a/Build/source/utils/texinfo/info/infokey.c
+++ b/Build/source/utils/texinfo/info/infokey.c
@@ -1,12 +1,13 @@
 /* infokey.c -- compile ~/.infokey to ~/.info.
-   $Id: infokey.c,v 1.9 2004/12/14 00:15:36 karl Exp $
+   $Id: infokey.c,v 1.17 2008/02/26 16:51:05 karl Exp $
 
-   Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Andrew Bettison <andrewb@zip.com.au>. */
 
@@ -25,7 +25,7 @@
 #include "key.h"
 #include "getopt.h"
 
-static char *program_name = "infokey";
+char *program_name = "infokey";
 
 /* Non-zero means print version info only. */
 static int print_version_p = 0;
@@ -142,11 +142,11 @@ main (int argc, char **argv)
     {
       printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
       puts ("");
-      printf (_ ("Copyright (C) %s Free Software Foundation, Inc.\n\
-There is NO warranty.  You may redistribute this software\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.\n"),
-	      "2003");
+      printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
+This is free software: you are free to change and redistribute it.\n\
+There is NO WARRANTY, to the extent permitted by law.\n"),
+	      "2008");
       xexit (0);
     }
 
@@ -638,7 +638,7 @@ compile (FILE *fp, const char *filename, struct sect *sections)
 	      else
 		{
 		  syntax_error (filename, lnum,
-                      (char *) _("NUL character (^%c) not permitted"),
+                      _("NUL character (^%c) not permitted"),
                       (void *) (long) c, NULL, NULL, NULL);
 		  error = 1;
 		}
@@ -662,7 +662,7 @@ compile (FILE *fp, const char *filename, struct sect *sections)
 	      rescan = 1;
 	      if (alen == 0)
 		{
-		  syntax_error (filename, lnum, (char *) _("missing action name"),
+		  syntax_error (filename, lnum, _("missing action name"),
 				(void *) (long) c, NULL, NULL, NULL);
 		  error = 1;
 		}
diff --git a/Build/source/utils/texinfo/info/infokey.h b/Build/source/utils/texinfo/info/infokey.h
index d51211d0c3a..783d92106d1 100644
--- a/Build/source/utils/texinfo/info/infokey.h
+++ b/Build/source/utils/texinfo/info/infokey.h
@@ -1,12 +1,12 @@
 /* infokey.h -- Custom keystroke definition support.
-   $Id: infokey.h,v 1.2 2004/04/11 17:56:45 karl Exp $
+   $Id: infokey.h,v 1.5 2007/07/01 21:20:30 karl Exp $
 
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Andrew Bettison <andrewb@zip.com.au>.
 
diff --git a/Build/source/utils/texinfo/info/infomap.c b/Build/source/utils/texinfo/info/infomap.c
index c7dc2f4aea9..7ee423924ed 100644
--- a/Build/source/utils/texinfo/info/infomap.c
+++ b/Build/source/utils/texinfo/info/infomap.c
@@ -1,13 +1,13 @@
 /* infomap.c -- keymaps for Info.
-   $Id: infomap.c,v 1.10 2004/07/30 20:43:40 karl Exp $
+   $Id: infomap.c,v 1.20 2008/02/29 22:20:53 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -77,13 +76,13 @@ find_function_keyseq (Keymap map, int c, Keymap rootmap)
       const unsigned char *p;
       Keymap m = rootmap;
       if (k->map != rootmap)
-	continue;
+        continue;
       for (p = (unsigned char *) k->keyseq; *p && m[*p].type == ISKMAP; p++)
-	m = (Keymap)m[*p].function;
+        m = (Keymap)m[*p].function;
       if (*p != c || p[1])
-	continue;
+        continue;
       if (m[*p].type != ISFUNC)
-	abort ();
+        abort ();
       break;
     }
   return k;
@@ -147,20 +146,20 @@ keymap_copy_keymap (Keymap map, Keymap rootmap, Keymap newroot)
     {
       keymap[i].type = map[i].type;
       switch (map[i].type)
-	{
-	case ISFUNC:
-	  keymap[i].function = map[i].function;
+        {
+        case ISFUNC:
+          keymap[i].function = map[i].function;
 #if defined(INFOKEY)
-	  ks = find_function_keyseq (map, i, rootmap);
-	  if (ks)
-	    add_function_keyseq(map[i].function, ks->keyseq, newroot);
+          ks = find_function_keyseq (map, i, rootmap);
+          if (ks)
+            add_function_keyseq(map[i].function, ks->keyseq, newroot);
 #endif /* INFOKEY */
-	  break;
-	case ISKMAP:
-	  keymap[i].function = (InfoCommand *)keymap_copy_keymap
+          break;
+        case ISKMAP:
+          keymap[i].function = (InfoCommand *)keymap_copy_keymap
             ((Keymap)map[i].function, rootmap, NULL);
-	  break;
-	}
+          break;
+        }
     }
   return (keymap);
 }
@@ -185,9 +184,9 @@ keymap_discard_keymap (Keymap map, Keymap rootmap)
         {
         case ISFUNC:
 #if defined(INFOKEY)
-	  ks = find_function_keyseq(map, i, rootmap);
-	  if (ks)
-	    remove_function_keyseq (map[i].function, ks->keyseq, rootmap);
+          ks = find_function_keyseq(map, i, rootmap);
+          if (ks)
+            remove_function_keyseq (map[i].function, ks->keyseq, rootmap);
 #endif /* INFOKEY */
           break;
 
@@ -220,14 +219,14 @@ keymap_bind_keyseq (Keymap map,
         {
         case ISFUNC:
 #if defined(INFOKEY)
-	  ks = find_function_keyseq(m, c, map);
-	  if (ks)
-	    remove_function_keyseq (m[c].function, ks->keyseq, map);
+          ks = find_function_keyseq(m, c, map);
+          if (ks)
+            remove_function_keyseq (m[c].function, ks->keyseq, map);
 #else /* !INFOKEY */
           if (!(m[c].function == NULL || (
                 m != map &&
                 m[c].function == InfoCmd(info_do_lowercase_version))
-	      ))
+              ))
             return 0;
 #endif /* !INFOKEY */
 
@@ -246,8 +245,8 @@ keymap_bind_keyseq (Keymap map,
 
         case ISKMAP:
 #if defined(INFOKEY)
-	  if (*s == '\0')
-	    keymap_discard_keymap ((Keymap)m[c].function, map);
+          if (*s == '\0')
+            keymap_discard_keymap ((Keymap)m[c].function, map);
 #else /* !INFOKEY */
           if (*s == '\0')
             return 0;
@@ -261,7 +260,7 @@ keymap_bind_keyseq (Keymap map,
       else
         {
 #if defined(INFOKEY)
-	  add_function_keyseq (keyentry->function, keyseq, map);
+          add_function_keyseq (keyentry->function, keyseq, map);
 #endif /* INFOKEY */
           m[c] = *keyentry;
         }
@@ -270,572 +269,12 @@ keymap_bind_keyseq (Keymap map,
   return 1;
 }
 
+
 /* Initialize the standard info keymaps. */
 
 Keymap info_keymap = NULL;
 Keymap echo_area_keymap = NULL;
 
-#if !defined(INFOKEY)
-
-static void
-initialize_emacs_like_keymaps ()
-{
-  int i;
-  Keymap map;
-
-  if (!info_keymap)
-    {
-      info_keymap = keymap_make_keymap ();
-      echo_area_keymap = keymap_make_keymap ();
-    }
-
-  info_keymap[ESC].type = ISKMAP;
-  info_keymap[ESC].function = (InfoCommand *)keymap_make_keymap ();
-  info_keymap[Control ('x')].type = ISKMAP;
-  info_keymap[Control ('x')].function = (InfoCommand *)keymap_make_keymap ();
-
-  /* Bind the echo area insert routines.  Let's make all characters
-     insertable by default, regardless of which character set we might
-     be using.  */
-  for (i = 0; i < 256; i++)
-    echo_area_keymap[i].function = ea_insert;
-
-  echo_area_keymap[ESC].type = ISKMAP;
-  echo_area_keymap[ESC].function = (InfoCommand *) keymap_make_keymap ();
-  echo_area_keymap[Control ('x')].type = ISKMAP;
-  echo_area_keymap[Control ('x')].function
-    = (InfoCommand *) keymap_make_keymap ();
-
-  /* Bind numeric arg functions for both echo area and info window maps. */
-  for (i = '0'; i < '9' + 1; i++)
-    {
-      ((Keymap) info_keymap[ESC].function)[i].function
-        = ((Keymap) echo_area_keymap[ESC].function)[i].function
-        = info_add_digit_to_numeric_arg;
-    }
-  ((Keymap) info_keymap[ESC].function)['-'].function =
-    ((Keymap) echo_area_keymap[ESC].function)['-'].function =
-      info_add_digit_to_numeric_arg;
-
-  info_keymap['-'].function = info_add_digit_to_numeric_arg;
-
-  /* Bind the echo area routines. */
-  map = echo_area_keymap;
-
-  map[Control ('a')].function = ea_beg_of_line;
-  map[Control ('b')].function = ea_backward;
-  map[Control ('d')].function = ea_delete;
-  map[Control ('e')].function = ea_end_of_line;
-  map[Control ('f')].function = ea_forward;
-  map[Control ('g')].function = ea_abort;
-  map[Control ('h')].function = ea_rubout;
-  map[Control ('k')].function = ea_kill_line;
-  map[Control ('l')].function = info_redraw_display;
-  map[Control ('q')].function = ea_quoted_insert;
-  map[Control ('t')].function = ea_transpose_chars;
-  map[Control ('u')].function = info_universal_argument;
-  map[Control ('y')].function = ea_yank;
-
-  map[LFD].function = ea_newline;
-  map[RET].function = ea_newline;
-  map[SPC].function = ea_complete;
-  map[TAB].function = ea_complete;
-  map['?'].function = ea_possible_completions;
-#ifdef __MSDOS__
-  /* PC users will lynch me if I don't give them their usual DEL effect...  */
-  map[DEL].function = ea_delete;
-#else
-  map[DEL].function = ea_rubout;
-#endif
-
-  /* Bind the echo area ESC keymap. */
-  map = (Keymap)echo_area_keymap[ESC].function;
-
-  map[Control ('g')].function = ea_abort;
-  map[Control ('v')].function = ea_scroll_completions_window;
-  map['b'].function = ea_backward_word;
-  map['d'].function = ea_kill_word;
-  map['f'].function = ea_forward_word;
-#if defined (NAMED_FUNCTIONS)
-  /* map['x'].function = info_execute_command; */
-#endif /* NAMED_FUNCTIONS */
-  map['y'].function = ea_yank_pop;
-  map['?'].function = ea_possible_completions;
-  map[TAB].function = ea_tab_insert;
-  map[DEL].function = ea_backward_kill_word;
-
-  /* Bind the echo area Control-x keymap. */
-  map = (Keymap)echo_area_keymap[Control ('x')].function;
-
-  map['o'].function = info_next_window;
-  map[DEL].function = ea_backward_kill_line;
-
-  /* Arrow key bindings for echo area keymaps.  It seems that some
-     terminals do not match their termcap entries, so it's best to just
-     define everything with both of the usual prefixes.  */
-  map = echo_area_keymap;
-  keymap_bind_keyseq (map, term_ku, &map[Control ('p')]); /* up */
-  keymap_bind_keyseq (map, "\033OA", &map[Control ('p')]);
-  keymap_bind_keyseq (map, "\033[A", &map[Control ('p')]);
-  keymap_bind_keyseq (map, term_kd, &map[Control ('n')]); /* down */
-  keymap_bind_keyseq (map, "\033OB", &map[Control ('n')]);
-  keymap_bind_keyseq (map, "\033[B", &map[Control ('n')]);
-  keymap_bind_keyseq (map, term_kr, &map[Control ('f')]); /* right */
-  keymap_bind_keyseq (map, "\033OC", &map[Control ('f')]);
-  keymap_bind_keyseq (map, "\033[C", &map[Control ('f')]);
-  keymap_bind_keyseq (map, term_kl, &map[Control ('b')]); /* left */
-  keymap_bind_keyseq (map, "\033OD", &map[Control ('b')]);
-  keymap_bind_keyseq (map, "\033[D", &map[Control ('b')]);
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-  keymap_bind_keyseq (map, term_kh, &map[Control ('a')]); /* home */
-  keymap_bind_keyseq (map, term_ke, &map[Control ('e')]); /* end */
-
-  map = (Keymap)echo_area_keymap[ESC].function;
-  keymap_bind_keyseq (map, term_kl, &map['b']); /* left */
-  keymap_bind_keyseq (map, "\033OA", &map['b']);
-  keymap_bind_keyseq (map, "\033[A", &map['b']);
-  keymap_bind_keyseq (map, term_kr, &map['f']); /* right */
-  keymap_bind_keyseq (map, "\033OB", &map['f']);
-  keymap_bind_keyseq (map, "\033[B", &map['f']);
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  map = (Keymap)echo_area_keymap[Control ('x')].function;
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  /* Bind commands for Info window keymaps. */
-  map = info_keymap;
-  map[TAB].function = info_move_to_next_xref;
-  map[LFD].function = info_select_reference_this_line;
-  map[RET].function = info_select_reference_this_line;
-  map[SPC].function = info_scroll_forward;
-  map[Control ('a')].function = info_beginning_of_line;
-  map[Control ('b')].function = info_backward_char;
-  map[Control ('e')].function = info_end_of_line;
-  map[Control ('f')].function = info_forward_char;
-  map[Control ('g')].function = info_abort_key;
-  map[Control ('h')].function = info_get_help_window;
-  map[Control ('l')].function = info_redraw_display;
-  map[Control ('n')].function = info_next_line;
-  map[Control ('p')].function = info_prev_line;
-  map[Control ('r')].function = isearch_backward;
-  map[Control ('s')].function = isearch_forward;
-  map[Control ('u')].function = info_universal_argument;
-  map[Control ('v')].function = info_scroll_forward_page_only;
-  map[','].function = info_next_index_match;
-  map['/'].function = info_search;
-
-  for (i = '1'; i < '9' + 1; i++)
-    map[i].function = info_menu_digit;
-  map['0'].function = info_last_menu_item;
-
-  map['<'].function = info_first_node;
-  map['>'].function = info_last_node;
-  map['?'].function = info_get_help_window;
-  map['['].function = info_global_prev_node;
-  map[']'].function = info_global_next_node;
-
-  map['b'].function = info_beginning_of_node;
-  map['d'].function = info_dir_node;
-  map['e'].function = info_end_of_node;
-  map['f'].function = info_xref_item;
-  map['g'].function = info_goto_node;
-  map['G'].function = info_menu_sequence;
-  map['h'].function = info_get_info_help_node;
-  map['i'].function = info_index_search;
-  map['I'].function = info_goto_invocation_node;
-  map['l'].function = info_history_node;
-  map['m'].function = info_menu_item;
-  map['n'].function = info_next_node;
-  map['O'].function = info_goto_invocation_node;
-  map['p'].function = info_prev_node;
-  map['q'].function = info_quit;
-  map['r'].function = info_xref_item;
-  map['s'].function = info_search;
-  map['S'].function = info_search_case_sensitively;
-  map['t'].function = info_top_node;
-  map['u'].function = info_up_node;
-  map[DEL].function = info_scroll_backward;
-
-  /* Bind members in the ESC map for Info windows. */
-  map = (Keymap)info_keymap[ESC].function;
-  map[Control ('f')].function = info_show_footnotes;
-  map[Control ('g')].function = info_abort_key;
-  map[TAB].function = info_move_to_prev_xref;
-  map[Control ('v')].function = info_scroll_other_window;
-  map['<'].function = info_beginning_of_node;
-  map['>'].function = info_end_of_node;
-  map['b'].function = info_backward_word;
-  map['f'].function = info_forward_word;
-  map['r'].function = info_move_to_window_line;
-  map['v'].function = info_scroll_backward_page_only;
-#if defined (NAMED_FUNCTIONS)
-  map['x'].function = info_execute_command;
-#endif /* NAMED_FUNCTIONS */
-  map[DEL].function = info_scroll_other_window_backward;
-
-  /* Bind members in the Control-X map for Info windows. */
-  map = (Keymap)info_keymap[Control ('x')].function;
-
-  map[Control ('b')].function = list_visited_nodes;
-  map[Control ('c')].function = info_quit;
-  map[Control ('f')].function = info_view_file;
-  map[Control ('g')].function = info_abort_key;
-  map[Control ('v')].function = info_view_file;
-  map['0'].function = info_delete_window;
-  map['1'].function = info_keep_one_window;
-  map['2'].function = info_split_window;
-  map['^'].function = info_grow_window;
-  map['b'].function = select_visited_node;
-  map['k'].function = info_kill_node;
-  map['n'].function = info_search_next;
-  map['N'].function = info_search_previous;
-  map['o'].function = info_next_window;
-  map['t'].function = info_tile_windows;
-  map['w'].function = info_toggle_wrap;
-
-  /* Arrow key bindings for Info windows keymap. */
-  map = info_keymap;
-  keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
-  keymap_bind_keyseq (map, term_ku, &map[Control ('p')]); /* up */
-  keymap_bind_keyseq (map, "\033OA", &map[Control ('p')]);
-  keymap_bind_keyseq (map, "\033[A", &map[Control ('p')]);
-  keymap_bind_keyseq (map, term_kd, &map[Control ('n')]); /* down */
-  keymap_bind_keyseq (map, "\033OB", &map[Control ('n')]);
-  keymap_bind_keyseq (map, "\033[B", &map[Control ('n')]);
-  keymap_bind_keyseq (map, term_kr, &map[Control ('f')]); /* right */
-  keymap_bind_keyseq (map, "\033OC", &map[Control ('f')]);
-  keymap_bind_keyseq (map, "\033[C", &map[Control ('f')]);
-  keymap_bind_keyseq (map, term_kl, &map[Control ('b')]); /* left */
-  keymap_bind_keyseq (map, "\033OD", &map[Control ('b')]);
-  keymap_bind_keyseq (map, "\033[D", &map[Control ('b')]);
-  keymap_bind_keyseq (map, term_kh, &map['b']);	/* home */
-  keymap_bind_keyseq (map, term_ke, &map['e']);	/* end */
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  map = (Keymap)info_keymap[ESC].function;
-  keymap_bind_keyseq (map, term_kl, &map['b']); /* left */
-  keymap_bind_keyseq (map, "\033OA", &map['b']);
-  keymap_bind_keyseq (map, "\033[A", &map['b']);
-  keymap_bind_keyseq (map, term_kr, &map['f']); /* right */
-  keymap_bind_keyseq (map, "\033OB", &map['f']);
-  keymap_bind_keyseq (map, "\033[B", &map['f']);
-  keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
-  keymap_bind_keyseq (map, term_kP, &map[DEL]); /* pageup */
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  /* The alternative to this definition of a `main map' key in the
-     `ESC map' section, is something like:
-    keymap_bind_keyseq (map, term_kP, &((KeyMap)map[ESC].function).map['v']);
-  */
-  keymap_bind_keyseq (info_keymap/*sic*/, term_kP, &map['v']); /* pageup */
-}
-
-static void
-initialize_vi_like_keymaps ()
-{
-  int i;
-  Keymap map;
-
-  if (!info_keymap)
-    {
-      info_keymap = keymap_make_keymap ();
-      echo_area_keymap = keymap_make_keymap ();
-    }
-
-  info_keymap[ESC].type = ISKMAP;
-  info_keymap[ESC].function = (InfoCommand *)keymap_make_keymap ();
-  info_keymap[Control ('x')].type = ISKMAP;
-  info_keymap[Control ('x')].function = (InfoCommand *)keymap_make_keymap ();
-
-  /* Bind the echo area insert routines. */
-  for (i = 0; i < 256; i++)
-    echo_area_keymap[i].function = ea_insert;
-
-  echo_area_keymap[ESC].type = ISKMAP;
-  echo_area_keymap[ESC].function = (InfoCommand *)keymap_make_keymap ();
-  echo_area_keymap[Control ('x')].type = ISKMAP;
-  echo_area_keymap[Control ('x')].function =
-    (InfoCommand *)keymap_make_keymap ();
-
-  /* Bind numeric arg functions for both echo area and info window maps. */
-  for (i = '0'; i < '9' + 1; i++)
-    {
-      info_keymap[i].function =
-        ((Keymap) echo_area_keymap[ESC].function)[i].function =
-	info_add_digit_to_numeric_arg;
-    }
-  info_keymap['-'].function =
-    ((Keymap) echo_area_keymap[ESC].function)['-'].function =
-      info_add_digit_to_numeric_arg;
-
-  /* Bind the echo area routines. */
-  map = echo_area_keymap;
-
-  map[Control ('a')].function = ea_beg_of_line;
-  map[Control ('b')].function = ea_backward;
-  map[Control ('d')].function = ea_delete;
-  map[Control ('e')].function = ea_end_of_line;
-  map[Control ('f')].function = ea_forward;
-  map[Control ('g')].function = ea_abort;
-  map[Control ('h')].function = ea_rubout;
-  map[Control ('k')].function = ea_kill_line;
-  map[Control ('l')].function = info_redraw_display;
-  map[Control ('q')].function = ea_quoted_insert;
-  map[Control ('t')].function = ea_transpose_chars;
-  map[Control ('u')].function = ea_abort;
-  map[Control ('v')].function = ea_quoted_insert;
-  map[Control ('y')].function = ea_yank;
-
-  map[LFD].function = ea_newline;
-  map[RET].function = ea_newline;
-  map[SPC].function = ea_complete;
-  map[TAB].function = ea_complete;
-  map['?'].function = ea_possible_completions;
-#ifdef __MSDOS__
-  /* PC users will lynch me if I don't give them their usual DEL effect...  */
-  map[DEL].function = ea_delete;
-#else
-  map[DEL].function = ea_rubout;
-#endif
-
-  /* Bind the echo area ESC keymap. */
-  map = (Keymap)echo_area_keymap[ESC].function;
-
-  map[Control ('g')].function = ea_abort;
-  map[Control ('h')].function = ea_backward_kill_word;
-  map[Control ('v')].function = ea_scroll_completions_window;
-  map['0'].function = ea_beg_of_line;
-  map['$'].function = ea_end_of_line;
-  map['b'].function = ea_backward_word;
-  map['d'].function = ea_kill_word;
-  map['f'].function = ea_forward_word;
-  map['h'].function = ea_backward;
-  map['l'].function = ea_forward;
-  map['w'].function = ea_forward_word;
-  map['x'].function = ea_delete;
-  map['X'].function = ea_kill_word;
-  map['y'].function = ea_yank_pop;
-  map['?'].function = ea_possible_completions;
-  map[TAB].function = ea_tab_insert;
-  map[DEL].function = ea_kill_word;
-
-  /* Bind the echo area Control-x keymap. */
-  map = (Keymap)echo_area_keymap[Control ('x')].function;
-
-  map['o'].function = info_next_window;
-  map[DEL].function = ea_backward_kill_line;
-
-  /* Arrow key bindings for echo area keymaps.  It seems that some
-     terminals do not match their termcap entries, so it's best to just
-     define everything with both of the usual prefixes.  */
-  map = echo_area_keymap;
-  keymap_bind_keyseq (map, term_ku, &map[Control ('p')]); /* up */
-  keymap_bind_keyseq (map, "\033OA", &map[Control ('p')]);
-  keymap_bind_keyseq (map, "\033[A", &map[Control ('p')]);
-  keymap_bind_keyseq (map, term_kd, &map[Control ('n')]); /* down */
-  keymap_bind_keyseq (map, "\033OB", &map[Control ('n')]);
-  keymap_bind_keyseq (map, "\033[B", &map[Control ('n')]);
-  keymap_bind_keyseq (map, term_kr, &map[Control ('f')]); /* right */
-  keymap_bind_keyseq (map, "\033OC", &map[Control ('f')]);
-  keymap_bind_keyseq (map, "\033[C", &map[Control ('f')]);
-  keymap_bind_keyseq (map, term_kl, &map[Control ('b')]); /* left */
-  keymap_bind_keyseq (map, "\033OD", &map[Control ('b')]);
-  keymap_bind_keyseq (map, "\033[D", &map[Control ('b')]);
-  keymap_bind_keyseq (map, term_kh, &map[Control ('a')]); /* home */
-  keymap_bind_keyseq (map, term_ke, &map[Control ('e')]); /* end */
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  map = (Keymap)echo_area_keymap[ESC].function;
-  keymap_bind_keyseq (map, term_kl, &map['b']); /* left */
-  keymap_bind_keyseq (map, "\033OA", &map['b']);
-  keymap_bind_keyseq (map, "\033[A", &map['b']);
-  keymap_bind_keyseq (map, term_kr, &map['f']); /* right */
-  keymap_bind_keyseq (map, "\033OB", &map['f']);
-  keymap_bind_keyseq (map, "\033[B", &map['f']);
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  map = (Keymap)echo_area_keymap[Control ('x')].function;
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);
-
-  /* Bind commands for Info window keymaps. */
-  map = info_keymap;
-  map[TAB].function = info_move_to_next_xref;
-  map[LFD].function = info_down_line;
-  map[RET].function = info_down_line;
-  map[SPC].function = info_scroll_forward;
-  map[Control ('a')].function = info_beginning_of_line;
-  map[Control ('b')].function = info_scroll_backward_page_only;
-  map[Control ('d')].function = info_scroll_half_screen_down;
-  map[Control ('e')].function = info_down_line;
-  map[Control ('f')].function = info_scroll_forward_page_only;
-  map[Control ('g')].function = info_abort_key;
-  map[Control ('k')].function = info_up_line;
-  map[Control ('l')].function = info_redraw_display;
-  map[Control ('n')].function = info_down_line;
-  map[Control ('p')].function = info_up_line;
-  map[Control ('r')].function = info_redraw_display;
-  map[Control ('s')].function = isearch_forward;
-  map[Control ('u')].function = info_scroll_half_screen_up;
-  map[Control ('v')].function = info_scroll_forward_page_only;
-  map[Control ('y')].function = info_up_line;
-  map[','].function = info_next_index_match;
-  map['/'].function = info_search;
-
-  for (i = '1'; i < '9' + 1; i++)
-    ((Keymap) info_keymap[ESC].function)[i].function = info_menu_digit;
-  ((Keymap) info_keymap[ESC].function)['0'].function = info_last_menu_item;
-
-  map['<'].function = info_first_node;
-  map['>'].function = info_last_node;
-  map['?'].function = info_search_backward;
-  map['['].function = info_global_prev_node;
-  map[']'].function = info_global_next_node;
-  map['\''].function = info_history_node;
-
-  map['b'].function = info_scroll_backward;
-  map['d'].function = info_scroll_half_screen_down;
-  map['e'].function = info_down_line;
-  map['E'].function = info_view_file;
-  map['f'].function = info_scroll_forward_page_only;
-  map['F'].function = info_scroll_forward_page_only;
-  map['g'].function = info_first_node;
-  map['G'].function = info_last_node;
-  map['h'].function = info_get_help_window;
-  map['H'].function = info_get_help_window;
-  map['i'].function = info_index_search;
-  map['I'].function = info_goto_invocation_node;
-  map['j'].function = info_next_line;
-  map['k'].function = info_prev_line;
-  map['l'].function = info_history_node;
-  map['m'].function = info_menu_item;
-  map['n'].function = info_search_next;
-  map['N'].function = info_search_previous;
-  map['O'].function = info_goto_invocation_node;
-  map['p'].function = info_prev_node;
-  map['q'].function = info_quit;
-  map['Q'].function = info_quit;
-  map['r'].function = info_redraw_display;
-  map['R'].function = info_redraw_display;
-  map['s'].function = info_search;
-  map['S'].function = info_search_case_sensitively;
-  map['t'].function = info_top_node;
-  map['u'].function = info_scroll_half_screen_up;
-  map['w'].function = info_scroll_backward_page_only_set_window;
-  map['y'].function = info_up_line;
-  map['z'].function = info_scroll_forward_page_only_set_window;
-  map['Z'].function = NULL;	/* unbind, so it works to bind "ZZ" below */
-  map[DEL].function = info_scroll_backward;
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);
-  keymap_bind_keyseq (map, ":q", &map['q']);
-  keymap_bind_keyseq (map, ":Q", &map['q']);
-  keymap_bind_keyseq (map, "ZZ", &map['q']);
-
-  /* Bind members in the ESC map for Info windows. */
-  map = (Keymap)info_keymap[ESC].function;
-  map[Control ('f')].function = info_show_footnotes;
-  map[Control ('g')].function = info_abort_key;
-  map[TAB].function = info_move_to_prev_xref;
-  map[SPC].function = info_scroll_forward_page_only;
-  map[Control ('v')].function = info_scroll_other_window;
-  map['<'].function = info_beginning_of_node;
-  map['>'].function = info_end_of_node;
-  map['/'].function = info_search;
-  map['?'].function = info_search_backward;
-  map['b'].function = info_beginning_of_node;
-  map['d'].function = info_dir_node;
-  map['e'].function = info_end_of_node;
-  map['f'].function = info_xref_item;
-  map['g'].function = info_select_reference_this_line;
-  map['h'].function = info_get_info_help_node;
-  map['m'].function = info_menu_item;
-  map['n'].function = info_search;
-  map['N'].function = info_search_backward;
-  map['r'].function = isearch_backward;
-  map['s'].function = isearch_forward;
-  map['t'].function = info_top_node;
-  map['v'].function = info_scroll_backward_page_only;
-#if defined (NAMED_FUNCTIONS)
-  map['x'].function = info_execute_command;
-#endif /* NAMED_FUNCTIONS */
-  map[DEL].function = info_scroll_other_window_backward;
-
-  /* Bind members in the Control-X map for Info windows. */
-  map = (Keymap)info_keymap[Control ('x')].function;
-
-  map[Control ('b')].function = list_visited_nodes;
-  map[Control ('c')].function = info_quit;
-  map[Control ('f')].function = info_view_file;
-  map[Control ('g')].function = info_abort_key;
-  map[Control ('v')].function = info_view_file;
-  map[LFD].function = info_select_reference_this_line;
-  map[RET].function = info_select_reference_this_line;
-  map['0'].function = info_delete_window;
-  map['1'].function = info_keep_one_window;
-  map['2'].function = info_split_window;
-  map['^'].function = info_grow_window;
-  map['b'].function = select_visited_node;
-  map['g'].function = info_goto_node;
-  map['i'].function = info_index_search;
-  map['I'].function = info_goto_invocation_node;
-  map['k'].function = info_kill_node;
-  map['n'].function = info_next_node;
-  map['o'].function = info_next_window;
-  map['O'].function = info_goto_invocation_node;
-  map['p'].function = info_prev_node;
-  map['r'].function = info_xref_item;
-  map['t'].function = info_tile_windows;
-  map['u'].function = info_up_node;
-  map['w'].function = info_toggle_wrap;
-  map[','].function = info_next_index_match;
-  keymap_bind_keyseq (info_keymap, ":e", &map[Control ('v')]);
-
-  /* Arrow key bindings for Info windows keymap. */
-  map = info_keymap;
-  keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
-  keymap_bind_keyseq (map, term_ku, &map[Control ('p')]); /* up */
-  keymap_bind_keyseq (map, "\033OA", &map[Control ('p')]);
-  keymap_bind_keyseq (map, "\033[A", &map[Control ('p')]);
-  keymap_bind_keyseq (map, term_kd, &map[Control ('n')]); /* down */
-  keymap_bind_keyseq (map, "\033OB", &map[Control ('n')]);
-  keymap_bind_keyseq (map, "\033[B", &map[Control ('n')]);
-  keymap_bind_keyseq (map, term_kr, &map[Control ('f')]); /* right */
-  keymap_bind_keyseq (map, "\033OC", &map[Control ('f')]);
-  keymap_bind_keyseq (map, "\033[C", &map[Control ('f')]);
-  keymap_bind_keyseq (map, term_kl, &map[Control ('b')]); /* left */
-  keymap_bind_keyseq (map, "\033OD", &map[Control ('b')]);
-  keymap_bind_keyseq (map, "\033[D", &map[Control ('b')]);
-  keymap_bind_keyseq (map, term_kh, &map['b']);	/* home */
-  keymap_bind_keyseq (map, term_ke, &map['e']);	/* end */
-
-  map = (Keymap)info_keymap[ESC].function;
-  keymap_bind_keyseq (map, term_kl, &map['b']); /* left */
-  keymap_bind_keyseq (map, "\033OA", &map['b']);
-  keymap_bind_keyseq (map, "\033[A", &map['b']);
-  keymap_bind_keyseq (map, term_kr, &map['f']); /* right */
-  keymap_bind_keyseq (map, "\033OB", &map['f']);
-  keymap_bind_keyseq (map, "\033[B", &map['f']);
-  keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
-  keymap_bind_keyseq (map, term_kP, &map[DEL]); /* pageup */
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  /* The alternative to this definition of a `main map' key in the
-     `ESC map' section, is something like:
-    keymap_bind_keyseq (map, term_kP, &((KeyMap)map[ESC].function).map['v']);
-  */
-  keymap_bind_keyseq (info_keymap/*sic*/, term_kP, &map['v']); /* pageup */
-}
-
-void
-initialize_info_keymaps ()
-{
-  if (vi_keys_p)
-    initialize_vi_like_keymaps ();
-  else
-    initialize_emacs_like_keymaps ();
-}
-
-#else /* defined(INFOKEY) */
-
 /* Make sure that we don't have too many command codes defined. */
 
 #if A_NCOMMANDS > A_MAX_COMMAND + 1
@@ -844,572 +283,588 @@ initialize_info_keymaps ()
 
 /* Initialize the keymaps from the .info keymap file. */
 
-#define NUL	'\0'
+#define NUL     '\0'
 
 static unsigned char default_emacs_like_info_keys[] =
 {
-	0,	/* suppress-default-keybindings flag */
-	TAB, NUL,			A_info_move_to_next_xref,
-	LFD, NUL,			A_info_select_reference_this_line,
-	RET, NUL,			A_info_select_reference_this_line,
-	SPC, NUL,			A_info_scroll_forward,
-	CONTROL('a'), NUL,		A_info_beginning_of_line,
-	CONTROL('b'), NUL,		A_info_backward_char,
-	CONTROL('e'), NUL,		A_info_end_of_line,
-	CONTROL('f'), NUL,		A_info_forward_char,
-	CONTROL('g'), NUL,		A_info_abort_key,
-	CONTROL('h'), NUL,		A_info_get_help_window,
-	CONTROL('l'), NUL,		A_info_redraw_display,
-	CONTROL('n'), NUL,		A_info_next_line,
-	CONTROL('p'), NUL,		A_info_prev_line,
-	CONTROL('r'), NUL,		A_isearch_backward,
-	CONTROL('s'), NUL,		A_isearch_forward,
-	CONTROL('u'), NUL,		A_info_universal_argument,
-	CONTROL('v'), NUL,		A_info_scroll_forward_page_only,
-	',', NUL,			A_info_next_index_match,
-	'/', NUL,			A_info_search,
-	'0', NUL,			A_info_last_menu_item,
-	'1', NUL,			A_info_menu_digit,
-	'2', NUL,			A_info_menu_digit,
-	'3', NUL,			A_info_menu_digit,
-	'4', NUL,			A_info_menu_digit,
-	'5', NUL,			A_info_menu_digit,
-	'6', NUL,			A_info_menu_digit,
-	'7', NUL,			A_info_menu_digit,
-	'8', NUL,			A_info_menu_digit,
-	'9', NUL,			A_info_menu_digit,
-	'<', NUL,			A_info_first_node,
-	'>', NUL,			A_info_last_node,
-	'?', NUL,			A_info_get_help_window,
-	'[', NUL,			A_info_global_prev_node,
-	']', NUL,			A_info_global_next_node,
-	'b', NUL,			A_info_beginning_of_node,
-	'd', NUL,			A_info_dir_node,
-	'e', NUL,			A_info_end_of_node,
-	'f', NUL,			A_info_xref_item,
-	'g', NUL,			A_info_goto_node,
-	'G', NUL,			A_info_menu_sequence,
-	'h', NUL,			A_info_get_info_help_node,
-	'i', NUL,			A_info_index_search,
-	'l', NUL,			A_info_history_node,
-	'm', NUL,			A_info_menu_item,
-	'n', NUL,			A_info_next_node,
-	'O', NUL,			A_info_goto_invocation_node,
-	'p', NUL,			A_info_prev_node,
-	'q', NUL,			A_info_quit,
-	'r', NUL,			A_info_xref_item,
-	's', NUL,			A_info_search,
-	'S', NUL,			A_info_search_case_sensitively,
-	't', NUL,			A_info_top_node,
-	'u', NUL,			A_info_up_node,
-	DEL, NUL,			A_info_scroll_backward,
-	ESC, '0', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '1', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '2', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '3', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '4', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '5', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '6', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '7', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '8', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '9', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '-', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, CONTROL('f'), NUL,		A_info_show_footnotes,
-	ESC, CONTROL('g'), NUL,		A_info_abort_key,
-	ESC, TAB, NUL,			A_info_move_to_prev_xref,
-	ESC, CONTROL('v'), NUL,		A_info_scroll_other_window,
-	ESC, '<', NUL,			A_info_beginning_of_node,
-	ESC, '>', NUL,			A_info_end_of_node,
-	ESC, 'b', NUL,			A_info_backward_word,
-	ESC, 'f', NUL,			A_info_forward_word,
-	ESC, 'r', NUL,			A_info_move_to_window_line,
-	ESC, 'v', NUL,			A_info_scroll_backward_page_only,
-	Meta('0'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('1'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('2'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('3'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('4'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('5'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('6'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('7'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('8'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('9'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('-'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta(CONTROL('f')), NUL,	A_info_show_footnotes,
-	Meta(CONTROL('g')), NUL,	A_info_abort_key,
-	Meta(TAB), NUL,			A_info_move_to_prev_xref,
-	Meta(CONTROL('v')), NUL,	A_info_scroll_other_window,
-	Meta('<'), NUL,			A_info_beginning_of_node,
-	Meta('>'), NUL,			A_info_end_of_node,
-	Meta('b'), NUL,			A_info_backward_word,
-	Meta('f'), NUL,			A_info_forward_word,
-	Meta('r'), NUL,			A_info_move_to_window_line,
-	Meta('v'), NUL,			A_info_scroll_backward_page_only,
+        0,      /* suppress-default-keybindings flag */
+        TAB, NUL,                       A_info_move_to_next_xref,
+        LFD, NUL,                       A_info_select_reference_this_line,
+        RET, NUL,                       A_info_select_reference_this_line,
+        CONTROL('a'), NUL,              A_info_beginning_of_line,
+        CONTROL('b'), NUL,              A_info_backward_char,
+        CONTROL('e'), NUL,              A_info_end_of_line,
+        CONTROL('f'), NUL,              A_info_forward_char,
+        CONTROL('h'), NUL,              A_info_get_help_window,
+        CONTROL('l'), NUL,              A_info_redraw_display,
+        CONTROL('n'), NUL,              A_info_next_line,
+        CONTROL('p'), NUL,              A_info_prev_line,
+        CONTROL('r'), NUL,              A_isearch_backward,
+        CONTROL('s'), NUL,              A_isearch_forward,
+        CONTROL('u'), NUL,              A_info_universal_argument,
+        CONTROL('v'), NUL,              A_info_scroll_forward_page_only,
+        ',', NUL,                       A_info_next_index_match,
+        '/', NUL,                       A_info_search,
+        '0', NUL,                       A_info_last_menu_item,
+        '1', NUL,                       A_info_menu_digit,
+        '2', NUL,                       A_info_menu_digit,
+        '3', NUL,                       A_info_menu_digit,
+        '4', NUL,                       A_info_menu_digit,
+        '5', NUL,                       A_info_menu_digit,
+        '6', NUL,                       A_info_menu_digit,
+        '7', NUL,                       A_info_menu_digit,
+        '8', NUL,                       A_info_menu_digit,
+        '9', NUL,                       A_info_menu_digit,
+        '<', NUL,                       A_info_first_node,
+        '>', NUL,                       A_info_last_node,
+        '?', NUL,                       A_info_get_help_window,
+        '[', NUL,                       A_info_global_prev_node,
+        ']', NUL,                       A_info_global_next_node,
+        'b', NUL,                       A_info_beginning_of_node,
+        'd', NUL,                       A_info_dir_node,
+        'e', NUL,                       A_info_end_of_node,
+        'f', NUL,                       A_info_xref_item,
+        'g', NUL,                       A_info_goto_node,
+        'G', NUL,                       A_info_menu_sequence,
+        'h', NUL,                       A_info_get_help_window,
+        'H', NUL,                       A_info_get_info_help_node,
+        'i', NUL,                       A_info_index_search,
+        'l', NUL,                       A_info_history_node,
+        'm', NUL,                       A_info_menu_item,
+        'n', NUL,                       A_info_next_node,
+        'O', NUL,                       A_info_goto_invocation_node,
+        'p', NUL,                       A_info_prev_node,
+        'r', NUL,                       A_info_xref_item,
+        'R', NUL,                       A_info_toggle_regexp,
+        's', NUL,                       A_info_search,
+        'S', NUL,                       A_info_search_case_sensitively,
+        't', NUL,                       A_info_top_node,
+        'u', NUL,                       A_info_up_node,
+        ESC, '0', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '1', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '2', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '3', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '4', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '5', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '6', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '7', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '8', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '9', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '-', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, CONTROL('f'), NUL,         A_info_show_footnotes,
+        ESC, CONTROL('g'), NUL,         A_info_abort_key,
+        ESC, TAB, NUL,                  A_info_move_to_prev_xref,
+        ESC, CONTROL('v'), NUL,         A_info_scroll_other_window,
+        ESC, '<', NUL,                  A_info_beginning_of_node,
+        ESC, '>', NUL,                  A_info_end_of_node,
+        ESC, 'b', NUL,                  A_info_backward_word,
+        ESC, 'f', NUL,                  A_info_forward_word,
+        ESC, 'r', NUL,                  A_info_move_to_window_line,
+        ESC, 'v', NUL,                  A_info_scroll_backward_page_only,
+        Meta('0'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('1'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('2'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('3'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('4'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('5'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('6'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('7'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('8'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('9'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('-'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta(CONTROL('f')), NUL,        A_info_show_footnotes,
+        Meta(CONTROL('g')), NUL,        A_info_abort_key,
+        Meta(TAB), NUL,                 A_info_move_to_prev_xref,
+        Meta(CONTROL('v')), NUL,        A_info_scroll_other_window,
+        Meta('<'), NUL,                 A_info_beginning_of_node,
+        Meta('>'), NUL,                 A_info_end_of_node,
+        Meta('b'), NUL,                 A_info_backward_word,
+        Meta('f'), NUL,                 A_info_forward_word,
+        Meta('r'), NUL,                 A_info_move_to_window_line,
+        Meta('v'), NUL,                 A_info_scroll_backward_page_only,
 #if defined (NAMED_FUNCTIONS)
-	ESC, 'x', NUL,			A_info_execute_command,
-	Meta('x'), NUL,			A_info_execute_command,
+        ESC, 'x', NUL,                  A_info_execute_command,
+        Meta('x'), NUL,                 A_info_execute_command,
 #endif /* NAMED_FUNCTIONS */
 
-	CONTROL('x'), CONTROL('b'), NUL,	A_list_visited_nodes,
-	CONTROL('x'), CONTROL('c'), NUL,	A_info_quit,
-	CONTROL('x'), CONTROL('f'), NUL,	A_info_view_file,
-	CONTROL('x'), CONTROL('g'), NUL,	A_info_abort_key,
-	CONTROL('x'), CONTROL('v'), NUL,	A_info_view_file,
-	CONTROL('x'), '0', NUL,		A_info_delete_window,
-	CONTROL('x'), '1', NUL,		A_info_keep_one_window,
-	CONTROL('x'), '2', NUL,		A_info_split_window,
-	CONTROL('x'), '^', NUL,		A_info_grow_window,
-	CONTROL('x'), 'b', NUL,		A_select_visited_node,
-	CONTROL('x'), 'k', NUL,		A_info_kill_node,
-	CONTROL('x'), 'n', NUL,		A_info_search_next,
-	CONTROL('x'), 'N', NUL,		A_info_search_previous,
-	CONTROL('x'), 'o', NUL,		A_info_next_window,
-	CONTROL('x'), 't', NUL,		A_info_tile_windows,
-	CONTROL('x'), 'w', NUL,		A_info_toggle_wrap,
-
-/*	Arrow key bindings for info keymaps.  It seems that some
-	terminals do not match their termcap entries, so it's best to just
-	define everything with both of the usual prefixes.  */
-
-	SK_ESCAPE, SK_PAGE_UP, NUL,		A_info_scroll_backward_page_only,
-	SK_ESCAPE, SK_PAGE_DOWN, NUL,		A_info_scroll_forward_page_only,
-	SK_ESCAPE, SK_UP_ARROW, NUL,		A_info_prev_line,
-	'\033', 'O', 'A', NUL,			A_info_prev_line,
-	'\033', '[', 'A', NUL,			A_info_prev_line,
-	SK_ESCAPE, SK_DOWN_ARROW, NUL,		A_info_next_line,
-	'\033', 'O', 'B', NUL,			A_info_next_line,
-	'\033', '[', 'B', NUL,			A_info_next_line,
-	SK_ESCAPE, SK_RIGHT_ARROW, NUL,		A_info_forward_char,
-	'\033', 'O', 'C', NUL,			A_info_forward_char,
-	'\033', '[', 'C', NUL,			A_info_forward_char,
-	SK_ESCAPE, SK_LEFT_ARROW, NUL,		A_info_backward_char,
-	'\033', 'O', 'D', NUL,			A_info_backward_char,
-	'\033', '[', 'D', NUL,			A_info_backward_char,
-	SK_ESCAPE, SK_HOME, NUL,		A_info_beginning_of_node,
-	SK_ESCAPE, SK_END, NUL,			A_info_end_of_node,
-	SK_ESCAPE, SK_DELETE, NUL,		A_info_scroll_backward,
-
-	ESC, SK_ESCAPE, SK_PAGE_UP, NUL,	A_info_scroll_other_window_backward,
-	ESC, SK_ESCAPE, SK_PAGE_DOWN, NUL,	A_info_scroll_other_window,
-	ESC, SK_ESCAPE, SK_UP_ARROW, NUL,	A_info_prev_line,
-	ESC, '\033', 'O', 'A', NUL,		A_info_prev_line,
-	ESC, '\033', '[', 'A', NUL,		A_info_prev_line,
-	ESC, SK_ESCAPE, SK_DOWN_ARROW, NUL,	A_info_next_line,
-	ESC, '\033', 'O', 'B', NUL,		A_info_next_line,
-	ESC, '\033', '[', 'B', NUL,		A_info_next_line,
-	ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,	A_info_forward_word,
-	ESC, '\033', 'O', 'C', NUL,		A_info_forward_word,
-	ESC, '\033', '[', 'C', NUL,		A_info_forward_word,
-	ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,	A_info_backward_word,
-	ESC, '\033', 'O', 'D', NUL,		A_info_backward_word,
-	ESC, '\033', '[', 'D', NUL,		A_info_backward_word,
+        CONTROL('x'), CONTROL('b'), NUL,        A_list_visited_nodes,
+        CONTROL('x'), CONTROL('c'), NUL,        A_info_quit,
+        CONTROL('x'), CONTROL('f'), NUL,        A_info_view_file,
+        CONTROL('x'), CONTROL('g'), NUL,        A_info_abort_key,
+        CONTROL('x'), CONTROL('v'), NUL,        A_info_view_file,
+        CONTROL('x'), '0', NUL,         A_info_delete_window,
+        CONTROL('x'), '1', NUL,         A_info_keep_one_window,
+        CONTROL('x'), '2', NUL,         A_info_split_window,
+        CONTROL('x'), '^', NUL,         A_info_grow_window,
+        CONTROL('x'), 'b', NUL,         A_select_visited_node,
+        CONTROL('x'), 'k', NUL,         A_info_kill_node,
+        CONTROL('x'), 'n', NUL,         A_info_search_next,
+        CONTROL('x'), 'N', NUL,         A_info_search_previous,
+        CONTROL('x'), 'o', NUL,         A_info_next_window,
+        CONTROL('x'), 't', NUL,         A_info_tile_windows,
+        CONTROL('x'), 'w', NUL,         A_info_toggle_wrap,
+
+/*      Arrow key bindings for info keymaps.  It seems that some
+        terminals do not match their termcap entries, so it's best to just
+        define everything with both of the usual prefixes.  */
+
+        SK_ESCAPE, SK_PAGE_UP, NUL,             A_info_scroll_backward,
+        SK_ESCAPE, SK_PAGE_DOWN, NUL,           A_info_scroll_forward,
+        '\033', 'O', 'A', NUL,                  A_info_prev_line,
+        '\033', '[', 'A', NUL,                  A_info_prev_line,
+        '\033', 'O', 'B', NUL,                  A_info_next_line,
+        '\033', '[', 'B', NUL,                  A_info_next_line,
+        SK_ESCAPE, SK_RIGHT_ARROW, NUL,         A_info_forward_char,
+        '\033', 'O', 'C', NUL,                  A_info_forward_char,
+        '\033', '[', 'C', NUL,                  A_info_forward_char,
+        SK_ESCAPE, SK_LEFT_ARROW, NUL,          A_info_backward_char,
+        '\033', 'O', 'D', NUL,                  A_info_backward_char,
+        '\033', '[', 'D', NUL,                  A_info_backward_char,
+        SK_ESCAPE, SK_HOME, NUL,                A_info_beginning_of_node,
+        SK_ESCAPE, SK_END, NUL,                 A_info_end_of_node,
+        SK_ESCAPE, SK_DELETE, NUL,              A_info_scroll_backward,
+
+        ESC, SK_ESCAPE, SK_PAGE_UP, NUL,        A_info_scroll_other_window_backward,
+        ESC, SK_ESCAPE, SK_PAGE_DOWN, NUL,      A_info_scroll_other_window,
+        ESC, SK_ESCAPE, SK_UP_ARROW, NUL,       A_info_prev_line,
+        ESC, '\033', 'O', 'A', NUL,             A_info_prev_line,
+        ESC, '\033', '[', 'A', NUL,             A_info_prev_line,
+        ESC, SK_ESCAPE, SK_DOWN_ARROW, NUL,     A_info_next_line,
+        ESC, '\033', 'O', 'B', NUL,             A_info_next_line,
+        ESC, '\033', '[', 'B', NUL,             A_info_next_line,
+        ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,    A_info_forward_word,
+        ESC, '\033', 'O', 'C', NUL,             A_info_forward_word,
+        ESC, '\033', '[', 'C', NUL,             A_info_forward_word,
+        ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,     A_info_backward_word,
+        ESC, '\033', 'O', 'D', NUL,             A_info_backward_word,
+        ESC, '\033', '[', 'D', NUL,             A_info_backward_word,
+
+        /* We want help to report q, not C-x C-c, etc.  */
+        'q', NUL,                       A_info_quit,
+        'x', NUL,                       A_info_delete_window,
+        SPC, NUL,                       A_info_scroll_forward,
+        DEL, NUL,                       A_info_scroll_backward,
+        '{', NUL,                       A_info_search_previous,
+        '}', NUL,                       A_info_search_next,
+        CONTROL('g'), NUL,              A_info_abort_key,
+        SK_ESCAPE, SK_UP_ARROW, NUL,    A_info_prev_line,
+        SK_ESCAPE, SK_DOWN_ARROW, NUL,  A_info_next_line,
 };
 
+
 static unsigned char default_emacs_like_ea_keys[] =
 {
-	0,	/* suppress-default-keybindings flag */
-	ESC, '0', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '1', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '2', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '3', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '4', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '5', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '6', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '7', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '8', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '9', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '-', NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('0'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('1'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('2'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('3'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('4'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('5'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('6'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('7'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('8'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('9'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('-'), NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, CONTROL('g'), NUL,		A_ea_abort,
-	ESC, CONTROL('v'), NUL,		A_ea_scroll_completions_window,
-	ESC, 'b', NUL,			A_ea_backward_word,
-	ESC, 'd', NUL,			A_ea_kill_word,
-	ESC, 'f', NUL,			A_ea_forward_word,
-	ESC, 'y', NUL,			A_ea_yank_pop,
-	ESC, '?', NUL,			A_ea_possible_completions,
-	ESC, TAB, NUL,			A_ea_tab_insert,
-	ESC, DEL, NUL,			A_ea_backward_kill_word,
-	Meta(CONTROL('g')), NUL,	A_ea_abort,
-	Meta(CONTROL('v')), NUL,	A_ea_scroll_completions_window,
-	Meta('b'), NUL,			A_ea_backward_word,
-	Meta('d'), NUL,			A_ea_kill_word,
-	Meta('f'), NUL,			A_ea_forward_word,
-	Meta('y'), NUL,			A_ea_yank_pop,
-	Meta('?'), NUL,			A_ea_possible_completions,
-	Meta(TAB), NUL,			A_ea_tab_insert,
-	Meta(DEL), NUL,			A_ea_backward_kill_word,
-	CONTROL('a'), NUL,		A_ea_beg_of_line,
-	CONTROL('b'), NUL,		A_ea_backward,
-	CONTROL('d'), NUL,		A_ea_delete,
-	CONTROL('e'), NUL,		A_ea_end_of_line,
-	CONTROL('f'), NUL,		A_ea_forward,
-	CONTROL('g'), NUL,		A_ea_abort,
-	CONTROL('h'), NUL,		A_ea_rubout,
-/*	CONTROL('k') */
-	SK_ESCAPE, SK_LITERAL, NUL,	A_ea_kill_line,
-	CONTROL('l'), NUL,		A_info_redraw_display,
-	CONTROL('q'), NUL,		A_ea_quoted_insert,
-	CONTROL('t'), NUL,		A_ea_transpose_chars,
-	CONTROL('u'), NUL,		A_info_universal_argument,
-	CONTROL('y'), NUL,		A_ea_yank,
-	LFD, NUL,			A_ea_newline,
-	RET, NUL,			A_ea_newline,
-	SPC, NUL,			A_ea_complete,
-	TAB, NUL,			A_ea_complete,
-	'?', NUL,			A_ea_possible_completions,
+        0,      /* suppress-default-keybindings flag */
+        ESC, '0', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '1', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '2', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '3', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '4', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '5', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '6', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '7', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '8', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '9', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '-', NUL,                  A_info_add_digit_to_numeric_arg,
+        Meta('0'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('1'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('2'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('3'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('4'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('5'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('6'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('7'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('8'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('9'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('-'), NUL,                 A_info_add_digit_to_numeric_arg,
+        ESC, CONTROL('g'), NUL,         A_ea_abort,
+        ESC, CONTROL('v'), NUL,         A_ea_scroll_completions_window,
+        ESC, 'b', NUL,                  A_ea_backward_word,
+        ESC, 'd', NUL,                  A_ea_kill_word,
+        ESC, 'f', NUL,                  A_ea_forward_word,
+        ESC, 'y', NUL,                  A_ea_yank_pop,
+        ESC, '?', NUL,                  A_ea_possible_completions,
+        ESC, TAB, NUL,                  A_ea_tab_insert,
+        ESC, DEL, NUL,                  A_ea_backward_kill_word,
+        Meta(CONTROL('g')), NUL,        A_ea_abort,
+        Meta(CONTROL('v')), NUL,        A_ea_scroll_completions_window,
+        Meta('b'), NUL,                 A_ea_backward_word,
+        Meta('d'), NUL,                 A_ea_kill_word,
+        Meta('f'), NUL,                 A_ea_forward_word,
+        Meta('y'), NUL,                 A_ea_yank_pop,
+        Meta('?'), NUL,                 A_ea_possible_completions,
+        Meta(TAB), NUL,                 A_ea_tab_insert,
+        Meta(DEL), NUL,                 A_ea_backward_kill_word,
+        CONTROL('a'), NUL,              A_ea_beg_of_line,
+        CONTROL('b'), NUL,              A_ea_backward,
+        CONTROL('d'), NUL,              A_ea_delete,
+        CONTROL('e'), NUL,              A_ea_end_of_line,
+        CONTROL('f'), NUL,              A_ea_forward,
+        CONTROL('g'), NUL,              A_ea_abort,
+        CONTROL('h'), NUL,              A_ea_rubout,
+/*      CONTROL('k') */
+        SK_ESCAPE, SK_LITERAL, NUL,     A_ea_kill_line,
+        CONTROL('l'), NUL,              A_info_redraw_display,
+        CONTROL('q'), NUL,              A_ea_quoted_insert,
+        CONTROL('t'), NUL,              A_ea_transpose_chars,
+        CONTROL('u'), NUL,              A_info_universal_argument,
+        CONTROL('y'), NUL,              A_ea_yank,
+        LFD, NUL,                       A_ea_newline,
+        RET, NUL,                       A_ea_newline,
+        SPC, NUL,                       A_ea_complete,
+        TAB, NUL,                       A_ea_complete,
+        '?', NUL,                       A_ea_possible_completions,
 #ifdef __MSDOS__
         /* PC users will lynch me if I don't give them their usual DEL
-	   effect...  */
-	DEL, NUL,			A_ea_delete,
+           effect...  */
+        DEL, NUL,                       A_ea_delete,
 #else
-	DEL, NUL,			A_ea_rubout,
+        DEL, NUL,                       A_ea_rubout,
 #endif
 #if defined (NAMED_FUNCTIONS)
-  /* 	ESC, 'x', NUL,			A_info_execute_command, */
-  /* 	Meta('x'), NUL,			A_info_execute_command, */
+  /*    ESC, 'x', NUL,                  A_info_execute_command, */
+  /*    Meta('x'), NUL,                 A_info_execute_command, */
 #endif /* NAMED_FUNCTIONS */
-	CONTROL('x'), 'o', NUL,		A_info_next_window,
-  	CONTROL('x'), DEL, NUL,		A_ea_backward_kill_line,
-
-/*	Arrow key bindings for echo area keymaps.  It seems that some
-	terminals do not match their termcap entries, so it's best to just
-	define everything with both of the usual prefixes.  */
-
-	SK_ESCAPE, SK_RIGHT_ARROW, NUL,		A_ea_forward,
-	'\033', 'O', 'C', NUL,			A_ea_forward,
-	'\033', '[', 'C', NUL,			A_ea_forward,
-	SK_ESCAPE, SK_LEFT_ARROW, NUL,		A_ea_backward,
-	'\033', 'O', 'D', NUL,			A_ea_backward,
-	'\033', '[', 'D', NUL,			A_ea_backward,
-	ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,	A_ea_forward_word,
-	ESC, '\033', 'O', 'C', NUL,		A_ea_forward_word,
-	ESC, '\033', '[', 'C', NUL,		A_ea_forward_word,
-	ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,	A_ea_backward_word,
-	ESC, '\033', 'O', 'D', NUL,		A_ea_backward_word,
-	ESC, '\033', '[', 'D', NUL,		A_ea_backward_word,
+        CONTROL('x'), 'o', NUL,         A_info_next_window,
+        CONTROL('x'), DEL, NUL,         A_ea_backward_kill_line,
+
+/*      Arrow key bindings for echo area keymaps.  It seems that some
+        terminals do not match their termcap entries, so it's best to just
+        define everything with both of the usual prefixes.  */
+
+        SK_ESCAPE, SK_RIGHT_ARROW, NUL,         A_ea_forward,
+        '\033', 'O', 'C', NUL,                  A_ea_forward,
+        '\033', '[', 'C', NUL,                  A_ea_forward,
+        SK_ESCAPE, SK_LEFT_ARROW, NUL,          A_ea_backward,
+        '\033', 'O', 'D', NUL,                  A_ea_backward,
+        '\033', '[', 'D', NUL,                  A_ea_backward,
+        ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,    A_ea_forward_word,
+        ESC, '\033', 'O', 'C', NUL,             A_ea_forward_word,
+        ESC, '\033', '[', 'C', NUL,             A_ea_forward_word,
+        ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,     A_ea_backward_word,
+        ESC, '\033', 'O', 'D', NUL,             A_ea_backward_word,
+        ESC, '\033', '[', 'D', NUL,             A_ea_backward_word,
 #ifdef __MSDOS__
-	SK_ESCAPE, SK_DELETE, NUL,		A_ea_delete,
+        SK_ESCAPE, SK_DELETE, NUL,              A_ea_delete,
 #else
-	SK_ESCAPE, SK_DELETE, NUL,		A_ea_rubout,
+        SK_ESCAPE, SK_DELETE, NUL,              A_ea_rubout,
 #endif
-	SK_ESCAPE, SK_HOME, NUL,		A_ea_beg_of_line,
-	SK_ESCAPE, SK_END, NUL,			A_ea_end_of_line,
-	ESC, SK_ESCAPE, SK_DELETE, NUL,		A_ea_backward_kill_word,
-	CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
+        SK_ESCAPE, SK_HOME, NUL,                A_ea_beg_of_line,
+        SK_ESCAPE, SK_END, NUL,                 A_ea_end_of_line,
+        ESC, SK_ESCAPE, SK_DELETE, NUL,         A_ea_backward_kill_word,
+        CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
 };
 
+
 static unsigned char default_vi_like_info_keys[] =
 {
-	0,	/* suppress-default-keybindings flag */
-	'0', NUL,			A_info_add_digit_to_numeric_arg,
-	'1', NUL,			A_info_add_digit_to_numeric_arg,
-	'2', NUL,			A_info_add_digit_to_numeric_arg,
-	'3', NUL,			A_info_add_digit_to_numeric_arg,
-	'4', NUL,			A_info_add_digit_to_numeric_arg,
-	'5', NUL,			A_info_add_digit_to_numeric_arg,
-	'6', NUL,			A_info_add_digit_to_numeric_arg,
-	'7', NUL,			A_info_add_digit_to_numeric_arg,
-	'8', NUL,			A_info_add_digit_to_numeric_arg,
-	'9', NUL,			A_info_add_digit_to_numeric_arg,
-	'-', NUL,			A_info_add_digit_to_numeric_arg,
-	TAB, NUL,			A_info_move_to_next_xref,
-	LFD, NUL,			A_info_down_line,
-	RET, NUL,			A_info_down_line,
-	SPC, NUL,			A_info_scroll_forward,
-	CONTROL('a'), NUL,		A_info_beginning_of_line,
-	CONTROL('b'), NUL,		A_info_scroll_backward_page_only,
-	CONTROL('d'), NUL,		A_info_scroll_half_screen_down,
-	CONTROL('e'), NUL,		A_info_down_line,
-	CONTROL('f'), NUL,		A_info_scroll_forward_page_only,
-	CONTROL('g'), NUL,		A_info_abort_key,
-	CONTROL('k'), NUL,		A_info_up_line,
-	CONTROL('l'), NUL,		A_info_redraw_display,
-	CONTROL('n'), NUL,		A_info_down_line,
-	CONTROL('p'), NUL,		A_info_up_line,
-	CONTROL('r'), NUL,		A_info_redraw_display,
-	CONTROL('s'), NUL,		A_isearch_forward,
-	CONTROL('u'), NUL,		A_info_scroll_half_screen_up,
-	CONTROL('v'), NUL,		A_info_scroll_forward_page_only,
-	CONTROL('y'), NUL,		A_info_up_line,
-	',', NUL,			A_info_next_index_match,
-	'/', NUL,			A_info_search,
-	ESC, '0', NUL,			A_info_last_menu_item,
-	ESC, '1', NUL,			A_info_menu_digit,
-	ESC, '2', NUL,			A_info_menu_digit,
-	ESC, '3', NUL,			A_info_menu_digit,
-	ESC, '4', NUL,			A_info_menu_digit,
-	ESC, '5', NUL,			A_info_menu_digit,
-	ESC, '6', NUL,			A_info_menu_digit,
-	ESC, '7', NUL,			A_info_menu_digit,
-	ESC, '8', NUL,			A_info_menu_digit,
-	ESC, '9', NUL,			A_info_menu_digit,
-	Meta('0'), NUL,			A_info_last_menu_item,
-	Meta('1'), NUL,			A_info_menu_digit,
-	Meta('2'), NUL,			A_info_menu_digit,
-	Meta('3'), NUL,			A_info_menu_digit,
-	Meta('4'), NUL,			A_info_menu_digit,
-	Meta('5'), NUL,			A_info_menu_digit,
-	Meta('6'), NUL,			A_info_menu_digit,
-	Meta('7'), NUL,			A_info_menu_digit,
-	Meta('8'), NUL,			A_info_menu_digit,
-	Meta('9'), NUL,			A_info_menu_digit,
-	'<', NUL,			A_info_first_node,
-	'>', NUL,			A_info_last_node,
-	'?', NUL,			A_info_search_backward,
-	'[', NUL,			A_info_global_prev_node,
-	']', NUL,			A_info_global_next_node,
-	'\'', NUL,			A_info_history_node,
-	'b', NUL,			A_info_scroll_backward,
-	'd', NUL,			A_info_scroll_half_screen_down,
-	'e', NUL,			A_info_down_line,
-	'E', NUL,			A_info_view_file,
-	':', 'e', NUL,			A_info_view_file,
-	'f', NUL,			A_info_scroll_forward_page_only,
-	'F', NUL,			A_info_scroll_forward_page_only,
-	'g', NUL,			A_info_first_node,
-	'G', NUL,			A_info_last_node,
-	'h', NUL,			A_info_get_help_window,
-	'H', NUL,			A_info_get_help_window,
-	'i', NUL,			A_info_index_search,
-	'I', NUL,			A_info_goto_invocation_node,
-	'j', NUL,			A_info_next_line,
-	'k', NUL,			A_info_prev_line,
-	'l', NUL,			A_info_history_node,
-	'm', NUL,			A_info_menu_item,
-	'n', NUL,			A_info_search_next,
-	'N', NUL,			A_info_search_previous,
-	'O', NUL,			A_info_goto_invocation_node,
-	'p', NUL,			A_info_prev_node,
-	'q', NUL,			A_info_quit,
-	'Q', NUL,			A_info_quit,
-	':', 'q', NUL,			A_info_quit,
-	':', 'Q', NUL,			A_info_quit,
-	'Z', 'Z', NUL,			A_info_quit,
-	'r', NUL,			A_info_redraw_display,
-	'R', NUL,			A_info_redraw_display,
-	's', NUL,			A_info_search,
-	'S', NUL,			A_info_search_case_sensitively,
-	't', NUL,			A_info_top_node,
-	'u', NUL,			A_info_scroll_half_screen_up,
-	'w', NUL,			A_info_scroll_backward_page_only_set_window,
-	'y', NUL,			A_info_up_line,
-	'z', NUL,			A_info_scroll_forward_page_only_set_window,
-	DEL, NUL,			A_info_scroll_backward,
-	ESC, CONTROL('f'), NUL,		A_info_show_footnotes,
-	ESC, CONTROL('g'), NUL,		A_info_abort_key,
-	ESC, TAB, NUL,			A_info_move_to_prev_xref,
-	ESC, SPC, NUL,			A_info_scroll_forward_page_only,
-	ESC, CONTROL('v'), NUL,		A_info_scroll_other_window,
-	ESC, '<', NUL,			A_info_beginning_of_node,
-	ESC, '>', NUL,			A_info_end_of_node,
-	ESC, '/', NUL,			A_info_search,
-	ESC, '?', NUL,			A_info_search_backward,
-	ESC, 'b', NUL,			A_info_beginning_of_node,
-	ESC, 'd', NUL,			A_info_dir_node,
-	ESC, 'e', NUL,			A_info_end_of_node,
-	ESC, 'f', NUL,			A_info_xref_item,
-	ESC, 'g', NUL,			A_info_select_reference_this_line,
-	ESC, 'h', NUL,			A_info_get_info_help_node,
-	ESC, 'm', NUL,			A_info_menu_item,
-	ESC, 'n', NUL,			A_info_search,
-	ESC, 'N', NUL,			A_info_search_backward,
-	ESC, 'r', NUL,			A_isearch_backward,
-	ESC, 's', NUL,			A_isearch_forward,
-	ESC, 't', NUL,			A_info_top_node,
-	ESC, 'v', NUL,			A_info_scroll_backward_page_only,
+        0,      /* suppress-default-keybindings flag */
+        '0', NUL,                       A_info_add_digit_to_numeric_arg,
+        '1', NUL,                       A_info_add_digit_to_numeric_arg,
+        '2', NUL,                       A_info_add_digit_to_numeric_arg,
+        '3', NUL,                       A_info_add_digit_to_numeric_arg,
+        '4', NUL,                       A_info_add_digit_to_numeric_arg,
+        '5', NUL,                       A_info_add_digit_to_numeric_arg,
+        '6', NUL,                       A_info_add_digit_to_numeric_arg,
+        '7', NUL,                       A_info_add_digit_to_numeric_arg,
+        '8', NUL,                       A_info_add_digit_to_numeric_arg,
+        '9', NUL,                       A_info_add_digit_to_numeric_arg,
+        '-', NUL,                       A_info_add_digit_to_numeric_arg,
+        TAB, NUL,                       A_info_move_to_next_xref,
+        LFD, NUL,                       A_info_down_line,
+        RET, NUL,                       A_info_down_line,
+        CONTROL('a'), NUL,              A_info_beginning_of_line,
+        CONTROL('b'), NUL,              A_info_scroll_backward_page_only,
+        CONTROL('d'), NUL,              A_info_scroll_half_screen_down,
+        CONTROL('e'), NUL,              A_info_down_line,
+        CONTROL('f'), NUL,              A_info_scroll_forward_page_only,
+        CONTROL('k'), NUL,              A_info_up_line,
+        CONTROL('l'), NUL,              A_info_redraw_display,
+        CONTROL('n'), NUL,              A_info_down_line,
+        CONTROL('p'), NUL,              A_info_up_line,
+        CONTROL('r'), NUL,              A_info_redraw_display,
+        CONTROL('s'), NUL,              A_isearch_forward,
+        CONTROL('u'), NUL,              A_info_scroll_half_screen_up,
+        CONTROL('v'), NUL,              A_info_scroll_forward_page_only,
+        CONTROL('y'), NUL,              A_info_up_line,
+        ',', NUL,                       A_info_next_index_match,
+        '/', NUL,                       A_info_search,
+        ESC, '0', NUL,                  A_info_last_menu_item,
+        ESC, '1', NUL,                  A_info_menu_digit,
+        ESC, '2', NUL,                  A_info_menu_digit,
+        ESC, '3', NUL,                  A_info_menu_digit,
+        ESC, '4', NUL,                  A_info_menu_digit,
+        ESC, '5', NUL,                  A_info_menu_digit,
+        ESC, '6', NUL,                  A_info_menu_digit,
+        ESC, '7', NUL,                  A_info_menu_digit,
+        ESC, '8', NUL,                  A_info_menu_digit,
+        ESC, '9', NUL,                  A_info_menu_digit,
+        Meta('0'), NUL,                 A_info_last_menu_item,
+        Meta('1'), NUL,                 A_info_menu_digit,
+        Meta('2'), NUL,                 A_info_menu_digit,
+        Meta('3'), NUL,                 A_info_menu_digit,
+        Meta('4'), NUL,                 A_info_menu_digit,
+        Meta('5'), NUL,                 A_info_menu_digit,
+        Meta('6'), NUL,                 A_info_menu_digit,
+        Meta('7'), NUL,                 A_info_menu_digit,
+        Meta('8'), NUL,                 A_info_menu_digit,
+        Meta('9'), NUL,                 A_info_menu_digit,
+        '<', NUL,                       A_info_first_node,
+        '>', NUL,                       A_info_last_node,
+        '?', NUL,                       A_info_search_backward,
+        '[', NUL,                       A_info_global_prev_node,
+        ']', NUL,                       A_info_global_next_node,
+        '\'', NUL,                      A_info_history_node,
+        'b', NUL,                       A_info_scroll_backward,
+        'd', NUL,                       A_info_scroll_half_screen_down,
+        'e', NUL,                       A_info_down_line,
+        'E', NUL,                       A_info_view_file,
+        ':', 'e', NUL,                  A_info_view_file,
+        'f', NUL,                       A_info_scroll_forward_page_only,
+        'F', NUL,                       A_info_scroll_forward_page_only,
+        'g', NUL,                       A_info_first_node,
+        'G', NUL,                       A_info_last_node,
+        'h', NUL,                       A_info_get_help_window,
+        'H', NUL,                       A_info_get_help_window,
+        'i', NUL,                       A_info_index_search,
+        'I', NUL,                       A_info_goto_invocation_node,
+        'j', NUL,                       A_info_next_line,
+        'k', NUL,                       A_info_prev_line,
+        'l', NUL,                       A_info_history_node,
+        'm', NUL,                       A_info_menu_item,
+        'n', NUL,                       A_info_search_next,
+        'N', NUL,                       A_info_search_previous,
+        'O', NUL,                       A_info_goto_invocation_node,
+        'p', NUL,                       A_info_prev_node,
+        'Q', NUL,                       A_info_quit,
+        ':', 'q', NUL,                  A_info_quit,
+        ':', 'Q', NUL,                  A_info_quit,
+        'Z', 'Z', NUL,                  A_info_quit,
+        'r', NUL,                       A_info_redraw_display,
+        'R', NUL,                       A_info_toggle_regexp,
+        's', NUL,                       A_info_search,
+        'S', NUL,                       A_info_search_case_sensitively,
+        't', NUL,                       A_info_top_node,
+        'u', NUL,                       A_info_scroll_half_screen_up,
+        'w', NUL,                       A_info_scroll_backward_page_only_set_window,
+        'y', NUL,                       A_info_up_line,
+        'z', NUL,                       A_info_scroll_forward_page_only_set_window,
+        ESC, CONTROL('f'), NUL,         A_info_show_footnotes,
+        ESC, CONTROL('g'), NUL,         A_info_abort_key,
+        ESC, TAB, NUL,                  A_info_move_to_prev_xref,
+        ESC, SPC, NUL,                  A_info_scroll_forward_page_only,
+        ESC, CONTROL('v'), NUL,         A_info_scroll_other_window,
+        ESC, '<', NUL,                  A_info_beginning_of_node,
+        ESC, '>', NUL,                  A_info_end_of_node,
+        ESC, '/', NUL,                  A_info_search,
+        ESC, '?', NUL,                  A_info_search_backward,
+        ESC, 'b', NUL,                  A_info_beginning_of_node,
+        ESC, 'd', NUL,                  A_info_dir_node,
+        ESC, 'e', NUL,                  A_info_end_of_node,
+        ESC, 'f', NUL,                  A_info_xref_item,
+        ESC, 'g', NUL,                  A_info_select_reference_this_line,
+        ESC, 'h', NUL,                  A_info_get_info_help_node,
+        ESC, 'm', NUL,                  A_info_menu_item,
+        ESC, 'n', NUL,                  A_info_search,
+        ESC, 'N', NUL,                  A_info_search_backward,
+        ESC, 'r', NUL,                  A_isearch_backward,
+        ESC, 's', NUL,                  A_isearch_forward,
+        ESC, 't', NUL,                  A_info_top_node,
+        ESC, 'v', NUL,                  A_info_scroll_backward_page_only,
 #if defined (NAMED_FUNCTIONS)
-	ESC, 'x', NUL,			A_info_execute_command,
-	Meta('x'), NUL,			A_info_execute_command,
+        ESC, 'x', NUL,                  A_info_execute_command,
+        Meta('x'), NUL,                 A_info_execute_command,
 #endif /* NAMED_FUNCTIONS */
-	ESC, DEL, NUL,			A_info_scroll_other_window_backward,
-	CONTROL('x'), CONTROL('b'), NUL,	A_list_visited_nodes,
-	CONTROL('x'), CONTROL('c'), NUL,	A_info_quit,
-	CONTROL('x'), CONTROL('f'), NUL,	A_info_view_file,
-	CONTROL('x'), CONTROL('g'), NUL,	A_info_abort_key,
-	CONTROL('x'), CONTROL('v'), NUL,	A_info_view_file,
-	CONTROL('x'), LFD, NUL,		A_info_select_reference_this_line,
-	CONTROL('x'), RET, NUL,		A_info_select_reference_this_line,
-	CONTROL('x'), '0', NUL,		A_info_delete_window,
-	CONTROL('x'), '1', NUL,		A_info_keep_one_window,
-	CONTROL('x'), '2', NUL,		A_info_split_window,
-	CONTROL('x'), '^', NUL,		A_info_grow_window,
-	CONTROL('x'), 'b', NUL,		A_select_visited_node,
-	CONTROL('x'), 'g', NUL,		A_info_goto_node,
-	CONTROL('x'), 'i', NUL,		A_info_index_search,
-	CONTROL('x'), 'I', NUL,		A_info_goto_invocation_node,
-	CONTROL('x'), 'k', NUL,		A_info_kill_node,
-	CONTROL('x'), 'n', NUL,		A_info_next_node,
-	CONTROL('x'), 'o', NUL,		A_info_next_window,
-	CONTROL('x'), 'O', NUL,		A_info_goto_invocation_node,
-	CONTROL('x'), 'p', NUL,		A_info_prev_node,
-	CONTROL('x'), 'r', NUL,		A_info_xref_item,
-	CONTROL('x'), 't', NUL,		A_info_tile_windows,
-	CONTROL('x'), 'u', NUL,		A_info_up_node,
-	CONTROL('x'), 'w', NUL,		A_info_toggle_wrap,
-	CONTROL('x'), ',', NUL,		A_info_next_index_match,
-
-/*	Arrow key bindings for info keymaps.  It seems that some
-	terminals do not match their termcap entries, so it's best to just
-	define everything with both of the usual prefixes.  */
-
-	SK_ESCAPE, SK_PAGE_UP, NUL,		A_info_scroll_backward_page_only,
-	SK_ESCAPE, SK_PAGE_DOWN, NUL,		A_info_scroll_forward_page_only,
-	SK_ESCAPE, SK_UP_ARROW, NUL,		A_info_up_line,
-	'\033', 'O', 'A', NUL,			A_info_up_line,
-	'\033', '[', 'A', NUL,			A_info_up_line,
-	SK_ESCAPE, SK_DOWN_ARROW, NUL,		A_info_down_line,
-	'\033', 'O', 'B', NUL,			A_info_down_line,
-	'\033', '[', 'B', NUL,			A_info_down_line,
-	SK_ESCAPE, SK_RIGHT_ARROW, NUL,		A_info_scroll_forward_page_only,
-	'\033', 'O', 'C', NUL,			A_info_scroll_forward_page_only,
-	'\033', '[', 'C', NUL,			A_info_scroll_forward_page_only,
-	SK_ESCAPE, SK_LEFT_ARROW, NUL,		A_info_scroll_backward_page_only,
-	'\033', 'O', 'D', NUL,			A_info_scroll_backward_page_only,
-	'\033', '[', 'D', NUL,			A_info_scroll_backward_page_only,
-	SK_ESCAPE, SK_HOME, NUL,		A_info_beginning_of_node,
-	SK_ESCAPE, SK_END, NUL,			A_info_end_of_node,
-	ESC, SK_ESCAPE, SK_PAGE_DOWN, NUL,	A_info_scroll_other_window,
-	ESC, SK_ESCAPE, SK_PAGE_UP, NUL,	A_info_scroll_other_window_backward,
-	ESC, SK_ESCAPE, SK_DELETE, NUL,		A_info_scroll_other_window_backward,
-	ESC, SK_ESCAPE, SK_UP_ARROW, NUL,	A_info_prev_node,
-	ESC, '\033', 'O', 'A', NUL,		A_info_prev_node,
-	ESC, '\033', '[', 'A', NUL,		A_info_prev_node,
-	ESC, SK_ESCAPE, SK_DOWN_ARROW, NUL,	A_info_next_node,
-	ESC, '\033', 'O', 'B', NUL,		A_info_next_node,
-	ESC, '\033', '[', 'B', NUL,		A_info_next_node,
-	ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,	A_info_xref_item,
-	ESC, '\033', 'O', 'C', NUL,		A_info_xref_item,
-	ESC, '\033', '[', 'C', NUL,		A_info_xref_item,
-	ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,	A_info_beginning_of_node,
-	ESC, '\033', 'O', 'D', NUL,		A_info_beginning_of_node,
-	ESC, '\033', '[', 'D', NUL,		A_info_beginning_of_node,
-	CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
+        ESC, DEL, NUL,                  A_info_scroll_other_window_backward,
+        CONTROL('x'), CONTROL('b'), NUL,        A_list_visited_nodes,
+        CONTROL('x'), CONTROL('c'), NUL,        A_info_quit,
+        CONTROL('x'), CONTROL('f'), NUL,        A_info_view_file,
+        CONTROL('x'), CONTROL('g'), NUL,        A_info_abort_key,
+        CONTROL('x'), CONTROL('v'), NUL,        A_info_view_file,
+        CONTROL('x'), LFD, NUL,         A_info_select_reference_this_line,
+        CONTROL('x'), RET, NUL,         A_info_select_reference_this_line,
+        CONTROL('x'), '0', NUL,         A_info_delete_window,
+        CONTROL('x'), '1', NUL,         A_info_keep_one_window,
+        CONTROL('x'), '2', NUL,         A_info_split_window,
+        CONTROL('x'), '^', NUL,         A_info_grow_window,
+        CONTROL('x'), 'b', NUL,         A_select_visited_node,
+        CONTROL('x'), 'g', NUL,         A_info_goto_node,
+        CONTROL('x'), 'i', NUL,         A_info_index_search,
+        CONTROL('x'), 'I', NUL,         A_info_goto_invocation_node,
+        CONTROL('x'), 'k', NUL,         A_info_kill_node,
+        CONTROL('x'), 'n', NUL,         A_info_next_node,
+        CONTROL('x'), 'o', NUL,         A_info_next_window,
+        CONTROL('x'), 'O', NUL,         A_info_goto_invocation_node,
+        CONTROL('x'), 'p', NUL,         A_info_prev_node,
+        CONTROL('x'), 'r', NUL,         A_info_xref_item,
+        CONTROL('x'), 't', NUL,         A_info_tile_windows,
+        CONTROL('x'), 'u', NUL,         A_info_up_node,
+        CONTROL('x'), 'w', NUL,         A_info_toggle_wrap,
+        CONTROL('x'), ',', NUL,         A_info_next_index_match,
+
+/*      Arrow key bindings for info keymaps.  It seems that some
+        terminals do not match their termcap entries, so it's best to just
+        define everything with both of the usual prefixes.  */
+
+        SK_ESCAPE, SK_PAGE_UP, NUL,             A_info_scroll_backward,
+        SK_ESCAPE, SK_PAGE_DOWN, NUL,           A_info_scroll_forward,
+        '\033', 'O', 'A', NUL,                  A_info_up_line,
+        '\033', '[', 'A', NUL,                  A_info_up_line,
+        '\033', 'O', 'B', NUL,                  A_info_down_line,
+        '\033', '[', 'B', NUL,                  A_info_down_line,
+        SK_ESCAPE, SK_RIGHT_ARROW, NUL,         A_info_scroll_forward_page_only,
+        '\033', 'O', 'C', NUL,                  A_info_scroll_forward_page_only,
+        '\033', '[', 'C', NUL,                  A_info_scroll_forward_page_only,
+        SK_ESCAPE, SK_LEFT_ARROW, NUL,          A_info_scroll_backward_page_only,
+        '\033', 'O', 'D', NUL,                  A_info_scroll_backward_page_only,
+        '\033', '[', 'D', NUL,                  A_info_scroll_backward_page_only,
+        SK_ESCAPE, SK_HOME, NUL,                A_info_beginning_of_node,
+        SK_ESCAPE, SK_END, NUL,                 A_info_end_of_node,
+        ESC, SK_ESCAPE, SK_PAGE_DOWN, NUL,      A_info_scroll_other_window,
+        ESC, SK_ESCAPE, SK_PAGE_UP, NUL,        A_info_scroll_other_window_backward,
+        ESC, SK_ESCAPE, SK_DELETE, NUL,         A_info_scroll_other_window_backward,
+        ESC, SK_ESCAPE, SK_UP_ARROW, NUL,       A_info_prev_node,
+        ESC, '\033', 'O', 'A', NUL,             A_info_prev_node,
+        ESC, '\033', '[', 'A', NUL,             A_info_prev_node,
+        ESC, SK_ESCAPE, SK_DOWN_ARROW, NUL,     A_info_next_node,
+        ESC, '\033', 'O', 'B', NUL,             A_info_next_node,
+        ESC, '\033', '[', 'B', NUL,             A_info_next_node,
+        ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,    A_info_xref_item,
+        ESC, '\033', 'O', 'C', NUL,             A_info_xref_item,
+        ESC, '\033', '[', 'C', NUL,             A_info_xref_item,
+        ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,     A_info_beginning_of_node,
+        ESC, '\033', 'O', 'D', NUL,             A_info_beginning_of_node,
+        ESC, '\033', '[', 'D', NUL,             A_info_beginning_of_node,
+        CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
+
+        /* We want help to report q, not C-x C-c, etc.  */
+        'q', NUL,                       A_info_quit,
+        'x', NUL,                       A_info_delete_window,
+        SPC, NUL,                       A_info_scroll_forward,
+        DEL, NUL,                       A_info_scroll_backward,
+        '{', NUL,                       A_info_search_previous,
+        '}', NUL,                       A_info_search_next,
+        CONTROL('g'), NUL,              A_info_abort_key,
+        SK_ESCAPE, SK_UP_ARROW, NUL,    A_info_up_line,
+        SK_ESCAPE, SK_DOWN_ARROW, NUL,  A_info_down_line,
 };
 
+
 static unsigned char default_vi_like_ea_keys[] =
 {
-	0,	/* suppress-default-keybindings flag */
-	ESC, '1', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '2', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '3', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '4', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '5', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '6', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '7', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '8', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '9', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '-', NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('1'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('2'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('3'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('4'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('5'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('6'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('7'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('8'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('9'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('-'), NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, CONTROL('g'), NUL,		A_ea_abort,
-	ESC, CONTROL('h'), NUL,		A_ea_backward_kill_word,
-	ESC, CONTROL('v'), NUL,		A_ea_scroll_completions_window,
-	ESC, '0', NUL,			A_ea_beg_of_line,
-	ESC, '$', NUL,			A_ea_end_of_line,
-	ESC, 'b', NUL,			A_ea_backward_word,
-	ESC, 'd', NUL,			A_ea_kill_word,
-	ESC, 'f', NUL,			A_ea_forward_word,
-	ESC, 'h', NUL,			A_ea_forward,
-	ESC, 'l', NUL,			A_ea_backward,
-	ESC, 'w', NUL,			A_ea_forward_word,
-	ESC, 'x', NUL,			A_ea_delete,
-	ESC, 'X', NUL,			A_ea_kill_word,
-	ESC, 'y', NUL,			A_ea_yank_pop,
-	ESC, '?', NUL,			A_ea_possible_completions,
-	ESC, TAB, NUL,			A_ea_tab_insert,
-	ESC, DEL, NUL,			A_ea_kill_word,
-	Meta(CONTROL('g')), NUL,	A_ea_abort,
-	Meta(CONTROL('h')), NUL,	A_ea_backward_kill_word,
-	Meta(CONTROL('v')), NUL,	A_ea_scroll_completions_window,
-	Meta('0'), NUL,			A_ea_beg_of_line,
-	Meta('$'), NUL,			A_ea_end_of_line,
-	Meta('b'), NUL,			A_ea_backward_word,
-	Meta('d'), NUL,			A_ea_kill_word,
-	Meta('f'), NUL,			A_ea_forward_word,
-	Meta('h'), NUL,			A_ea_forward,
-	Meta('l'), NUL,			A_ea_backward,
-	Meta('w'), NUL,			A_ea_forward_word,
-	Meta('x'), NUL,			A_ea_delete,
-	Meta('X'), NUL,			A_ea_kill_word,
-	Meta('y'), NUL,			A_ea_yank_pop,
-	Meta('?'), NUL,			A_ea_possible_completions,
-	Meta(TAB), NUL,			A_ea_tab_insert,
-	Meta(DEL), NUL,			A_ea_kill_word,
-	CONTROL('a'), NUL,		A_ea_beg_of_line,
-	CONTROL('b'), NUL,		A_ea_backward,
-	CONTROL('d'), NUL,		A_ea_delete,
-	CONTROL('e'), NUL,		A_ea_end_of_line,
-	CONTROL('f'), NUL,		A_ea_forward,
-	CONTROL('g'), NUL,		A_ea_abort,
-	CONTROL('h'), NUL,		A_ea_rubout,
-/*	CONTROL('k') */
-	SK_ESCAPE, SK_LITERAL, NUL,	A_ea_kill_line,
-	CONTROL('l'), NUL,		A_info_redraw_display,
-	CONTROL('q'), NUL,		A_ea_quoted_insert,
-	CONTROL('t'), NUL,		A_ea_transpose_chars,
-	CONTROL('u'), NUL,		A_ea_abort,
-	CONTROL('v'), NUL,		A_ea_quoted_insert,
-	CONTROL('y'), NUL,		A_ea_yank,
-	LFD, NUL,			A_ea_newline,
-	RET, NUL,			A_ea_newline,
-	SPC, NUL,			A_ea_complete,
-	TAB, NUL,			A_ea_complete,
-	'?', NUL,			A_ea_possible_completions,
+        0,      /* suppress-default-keybindings flag */
+        ESC, '1', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '2', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '3', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '4', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '5', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '6', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '7', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '8', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '9', NUL,                  A_info_add_digit_to_numeric_arg,
+        ESC, '-', NUL,                  A_info_add_digit_to_numeric_arg,
+        Meta('1'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('2'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('3'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('4'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('5'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('6'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('7'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('8'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('9'), NUL,                 A_info_add_digit_to_numeric_arg,
+        Meta('-'), NUL,                 A_info_add_digit_to_numeric_arg,
+        ESC, CONTROL('g'), NUL,         A_ea_abort,
+        ESC, CONTROL('h'), NUL,         A_ea_backward_kill_word,
+        ESC, CONTROL('v'), NUL,         A_ea_scroll_completions_window,
+        ESC, '0', NUL,                  A_ea_beg_of_line,
+        ESC, '$', NUL,                  A_ea_end_of_line,
+        ESC, 'b', NUL,                  A_ea_backward_word,
+        ESC, 'd', NUL,                  A_ea_kill_word,
+        ESC, 'f', NUL,                  A_ea_forward_word,
+        ESC, 'h', NUL,                  A_ea_forward,
+        ESC, 'l', NUL,                  A_ea_backward,
+        ESC, 'w', NUL,                  A_ea_forward_word,
+        ESC, 'x', NUL,                  A_ea_delete,
+        ESC, 'X', NUL,                  A_ea_kill_word,
+        ESC, 'y', NUL,                  A_ea_yank_pop,
+        ESC, '?', NUL,                  A_ea_possible_completions,
+        ESC, TAB, NUL,                  A_ea_tab_insert,
+        ESC, DEL, NUL,                  A_ea_kill_word,
+        Meta(CONTROL('g')), NUL,        A_ea_abort,
+        Meta(CONTROL('h')), NUL,        A_ea_backward_kill_word,
+        Meta(CONTROL('v')), NUL,        A_ea_scroll_completions_window,
+        Meta('0'), NUL,                 A_ea_beg_of_line,
+        Meta('$'), NUL,                 A_ea_end_of_line,
+        Meta('b'), NUL,                 A_ea_backward_word,
+        Meta('d'), NUL,                 A_ea_kill_word,
+        Meta('f'), NUL,                 A_ea_forward_word,
+        Meta('h'), NUL,                 A_ea_forward,
+        Meta('l'), NUL,                 A_ea_backward,
+        Meta('w'), NUL,                 A_ea_forward_word,
+        Meta('x'), NUL,                 A_ea_delete,
+        Meta('X'), NUL,                 A_ea_kill_word,
+        Meta('y'), NUL,                 A_ea_yank_pop,
+        Meta('?'), NUL,                 A_ea_possible_completions,
+        Meta(TAB), NUL,                 A_ea_tab_insert,
+        Meta(DEL), NUL,                 A_ea_kill_word,
+        CONTROL('a'), NUL,              A_ea_beg_of_line,
+        CONTROL('b'), NUL,              A_ea_backward,
+        CONTROL('d'), NUL,              A_ea_delete,
+        CONTROL('e'), NUL,              A_ea_end_of_line,
+        CONTROL('f'), NUL,              A_ea_forward,
+        CONTROL('g'), NUL,              A_ea_abort,
+        CONTROL('h'), NUL,              A_ea_rubout,
+/*      CONTROL('k') */
+        SK_ESCAPE, SK_LITERAL, NUL,     A_ea_kill_line,
+        CONTROL('l'), NUL,              A_info_redraw_display,
+        CONTROL('q'), NUL,              A_ea_quoted_insert,
+        CONTROL('t'), NUL,              A_ea_transpose_chars,
+        CONTROL('u'), NUL,              A_ea_abort,
+        CONTROL('v'), NUL,              A_ea_quoted_insert,
+        CONTROL('y'), NUL,              A_ea_yank,
+        LFD, NUL,                       A_ea_newline,
+        RET, NUL,                       A_ea_newline,
+        SPC, NUL,                       A_ea_complete,
+        TAB, NUL,                       A_ea_complete,
+        '?', NUL,                       A_ea_possible_completions,
 #ifdef __MSDOS__
         /* PC users will lynch me if I don't give them their usual DEL
-	   effect...  */
-	DEL, NUL,			A_ea_delete,
+           effect...  */
+        DEL, NUL,                       A_ea_delete,
 #else
-	DEL, NUL,			A_ea_rubout,
+        DEL, NUL,                       A_ea_rubout,
 #endif
-	CONTROL('x'), 'o', NUL,		A_info_next_window,
-  	CONTROL('x'), DEL, NUL,		A_ea_backward_kill_line,
+        CONTROL('x'), 'o', NUL,         A_info_next_window,
+        CONTROL('x'), DEL, NUL,         A_ea_backward_kill_line,
 
   /* Arrow key bindings for echo area keymaps.  It seems that some
      terminals do not match their termcap entries, so it's best to just
      define everything with both of the usual prefixes.  */
 
-	SK_ESCAPE, SK_RIGHT_ARROW, NUL,		A_ea_forward,
-	'\033', 'O', 'C', NUL,			A_ea_forward,
-	'\033', '[', 'C', NUL,			A_ea_forward,
-	SK_ESCAPE, SK_LEFT_ARROW, NUL,		A_ea_backward,
-	'\033', 'O', 'D', NUL,			A_ea_backward,
-	'\033', '[', 'D', NUL,			A_ea_backward,
-	SK_ESCAPE, SK_HOME, NUL,		A_ea_beg_of_line,
-	SK_ESCAPE, SK_END, NUL,			A_ea_end_of_line,
+        SK_ESCAPE, SK_RIGHT_ARROW, NUL,         A_ea_forward,
+        '\033', 'O', 'C', NUL,                  A_ea_forward,
+        '\033', '[', 'C', NUL,                  A_ea_forward,
+        SK_ESCAPE, SK_LEFT_ARROW, NUL,          A_ea_backward,
+        '\033', 'O', 'D', NUL,                  A_ea_backward,
+        '\033', '[', 'D', NUL,                  A_ea_backward,
+        SK_ESCAPE, SK_HOME, NUL,                A_ea_beg_of_line,
+        SK_ESCAPE, SK_END, NUL,                 A_ea_end_of_line,
 #ifdef __MSDOS__
-	SK_ESCAPE, SK_DELETE, NUL,		A_ea_delete,
+        SK_ESCAPE, SK_DELETE, NUL,              A_ea_delete,
 #else
-	SK_DELETE, SK_DELETE, NUL,		A_ea_rubout,
+        SK_DELETE, SK_DELETE, NUL,              A_ea_rubout,
 #endif
-	ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,	A_ea_forward_word,
-	ESC, '\033', 'O', 'C', NUL,		A_ea_forward_word,
-	ESC, '\033', '[', 'C', NUL,		A_ea_forward_word,
-	ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,	A_ea_backward_word,
-	ESC, '\033', 'O', 'D', NUL,		A_ea_backward_word,
-	ESC, '\033', '[', 'D', NUL,		A_ea_backward_word,
-	ESC, SK_ESCAPE, SK_DELETE, NUL,		A_ea_kill_word,
-	CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
+        ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,    A_ea_forward_word,
+        ESC, '\033', 'O', 'C', NUL,             A_ea_forward_word,
+        ESC, '\033', '[', 'C', NUL,             A_ea_forward_word,
+        ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,     A_ea_backward_word,
+        ESC, '\033', 'O', 'D', NUL,             A_ea_backward_word,
+        ESC, '\033', '[', 'D', NUL,             A_ea_backward_word,
+        ESC, SK_ESCAPE, SK_DELETE, NUL,         A_ea_kill_word,
+        CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
 };
 
+
 static unsigned char *user_info_keys;
 static unsigned int user_info_keys_len;
 static unsigned char *user_ea_keys;
@@ -1421,172 +876,172 @@ static unsigned int user_vars_len;
  * Return the size of a file, or 0 if the size can't be determined.
  */
 static unsigned long
-filesize(int f)
+filesize (int f)
 {
-	long pos = lseek(f, 0L, SEEK_CUR);
-	long sz = -1L;
-	if (pos != -1L)
-	{
-		sz = lseek(f, 0L, SEEK_END);
-		lseek(f, pos, SEEK_SET);
-	}
-	return sz == -1L ? 0L : sz;
+        long pos = lseek(f, 0L, SEEK_CUR);
+        long sz = -1L;
+        if (pos != -1L)
+        {
+                sz = lseek(f, 0L, SEEK_END);
+                lseek(f, pos, SEEK_SET);
+        }
+        return sz == -1L ? 0L : sz;
 }
 
 /* Get an integer from a infokey file.
    Integers are stored as two bytes, low order first, in radix INFOKEY_RADIX.
  */
 static int
-getint(unsigned char **sp)
+getint (unsigned char **sp)
 {
-	int n;
+        int n;
 
-	if ( !((*sp)[0] < INFOKEY_RADIX && (*sp)[1] < INFOKEY_RADIX) )
-		return -1;
-	n = (*sp)[0] + (*sp)[1] * INFOKEY_RADIX;
-	*sp += 2;
-	return n;
+        if ( !((*sp)[0] < INFOKEY_RADIX && (*sp)[1] < INFOKEY_RADIX) )
+                return -1;
+        n = (*sp)[0] + (*sp)[1] * INFOKEY_RADIX;
+        *sp += 2;
+        return n;
 }
 
 
 /* Fetch the contents of the standard infokey file "$HOME/.info".  Return
    true if ok, false if not.  */
 static int
-fetch_user_maps(void)
+fetch_user_maps (void)
 {
-	char *filename = NULL;
-	char *homedir;
-	int f;
-	unsigned char *buf;
-	unsigned long len;
-	long nread;
-	unsigned char *p;
-	int n;
-
-	/* Find and open file. */
-	if ((filename = getenv("INFOKEY")) != NULL)
-		filename = xstrdup(filename);
-	else if ((homedir = getenv("HOME")) != NULL)
-	{
-		filename = xmalloc(strlen(homedir) + 2 + strlen(INFOKEY_FILE));
-		strcpy(filename, homedir);
-		strcat(filename, "/");
-		strcat(filename, INFOKEY_FILE);
-	}
+        char *filename = NULL;
+        char *homedir;
+        int f;
+        unsigned char *buf;
+        unsigned long len;
+        long nread;
+        unsigned char *p;
+        int n;
+
+        /* Find and open file. */
+        if ((filename = getenv("INFOKEY")) != NULL)
+                filename = xstrdup(filename);
+        else if ((homedir = getenv("HOME")) != NULL)
+        {
+                filename = xmalloc(strlen(homedir) + 2 + strlen(INFOKEY_FILE));
+                strcpy(filename, homedir);
+                strcat(filename, "/");
+                strcat(filename, INFOKEY_FILE);
+        }
 #ifdef __MSDOS__
-	/* Poor baby, she doesn't have a HOME...  */
-	else
-		filename = xstrdup(INFOKEY_FILE); /* try current directory */
+        /* Poor baby, she doesn't have a HOME...  */
+        else
+                filename = xstrdup(INFOKEY_FILE); /* try current directory */
 #endif
-	if (filename == NULL || (f = open(filename, O_RDONLY)) == (-1))
-	{
-		if (filename && errno != ENOENT)
-		{
-			info_error(filesys_error_string(filename, errno),
+        if (filename == NULL || (f = open(filename, O_RDONLY)) == (-1))
+        {
+                if (filename && errno != ENOENT)
+                {
+                        info_error(filesys_error_string(filename, errno),
                             NULL, NULL);
-			free(filename);
-		}
-		return 0;
-	}
-	SET_BINARY (f);
-
-	/* Ensure that the file is a reasonable size. */
-	len = filesize(f);
-	if (len < INFOKEY_NMAGIC + 2 || len > 100 * 1024)
-	{
-		/* Bad file (a valid file must have at least 9 chars, and
-		   more than 100 KB is a problem). */
-		if (len < INFOKEY_NMAGIC + 2)
-			info_error((char *) _("Ignoring invalid infokey file `%s' - too small"),
-				   filename, NULL);
-		else
-			info_error((char *) _("Ignoring invalid infokey file `%s' - too big"),
-				   filename, NULL);
-		close(f);
-		free(filename);
-		return 0;
-	}
-
-	/* Read the file into a buffer. */
-	buf = (unsigned char *)xmalloc((int)len);
-	nread = read(f, buf, (unsigned int) len);
-	close(f);
-	if ((unsigned int) nread != len)
-	{
-		info_error((char *) _("Error reading infokey file `%s' - short read"),
+                        free(filename);
+                }
+                return 0;
+        }
+        SET_BINARY (f);
+
+        /* Ensure that the file is a reasonable size. */
+        len = filesize(f);
+        if (len < INFOKEY_NMAGIC + 2 || len > 100 * 1024)
+        {
+                /* Bad file (a valid file must have at least 9 chars, and
+                   more than 100 KB is a problem). */
+                if (len < INFOKEY_NMAGIC + 2)
+                        info_error(_("Ignoring invalid infokey file `%s' - too small"),
+                                   filename, NULL);
+                else
+                        info_error(_("Ignoring invalid infokey file `%s' - too big"),
+                                   filename, NULL);
+                close(f);
+                free(filename);
+                return 0;
+        }
+
+        /* Read the file into a buffer. */
+        buf = (unsigned char *)xmalloc((int)len);
+        nread = read(f, buf, (unsigned int) len);
+        close(f);
+        if ((unsigned int) nread != len)
+        {
+                info_error(_("Error reading infokey file `%s' - short read"),
                     filename, NULL);
-		free(buf);
-		free(filename);
-		return 0;
-	}
-
-	/* Check the header, trailer, and version of the file to increase
-	   our confidence that the contents are valid.  */
-	if (	buf[0] != INFOKEY_MAGIC_S0
-		|| buf[1] != INFOKEY_MAGIC_S1
-		|| buf[2] != INFOKEY_MAGIC_S2
-		|| buf[3] != INFOKEY_MAGIC_S3
-		|| buf[len - 4] != INFOKEY_MAGIC_E0
-		|| buf[len - 3] != INFOKEY_MAGIC_E1
-		|| buf[len - 2] != INFOKEY_MAGIC_E2
-		|| buf[len - 1] != INFOKEY_MAGIC_E3
-	)
-	{
-		info_error((char *) _("Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"),
+                free(buf);
+                free(filename);
+                return 0;
+        }
+
+        /* Check the header, trailer, and version of the file to increase
+           our confidence that the contents are valid.  */
+        if (    buf[0] != INFOKEY_MAGIC_S0
+                || buf[1] != INFOKEY_MAGIC_S1
+                || buf[2] != INFOKEY_MAGIC_S2
+                || buf[3] != INFOKEY_MAGIC_S3
+                || buf[len - 4] != INFOKEY_MAGIC_E0
+                || buf[len - 3] != INFOKEY_MAGIC_E1
+                || buf[len - 2] != INFOKEY_MAGIC_E2
+                || buf[len - 1] != INFOKEY_MAGIC_E3
+        )
+        {
+                info_error(_("Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"),
                     filename, NULL);
-		free(filename);
-		return 0;
-	}
-	if (len < INFOKEY_NMAGIC + strlen(VERSION) + 1
+                free(filename);
+                return 0;
+        }
+        if (len < INFOKEY_NMAGIC + strlen(VERSION) + 1
             || strcmp(VERSION, (char *) (buf + 4)) != 0)
-	{
-		info_error
-                  ((char *) _("Your infokey file `%s' is out of date -- run infokey to update it"),
+        {
+                info_error
+                  (_("Your infokey file `%s' is out of date -- run infokey to update it"),
                     filename, NULL);
-		free(filename);
-		return 0;
-	}
+                free(filename);
+                return 0;
+        }
 
-	/* Extract the pieces.  */
-	for (p = buf + 4 + strlen(VERSION) + 1;
+        /* Extract the pieces.  */
+        for (p = buf + 4 + strlen(VERSION) + 1;
              (unsigned int) (p - buf) < len - 4;
              p += n)
-	{
-		int s = *p++;
+        {
+                int s = *p++;
 
-		n = getint(&p);
-		if (n < 0 || (unsigned int) n > len - 4 - (p - buf))
-		{
-			info_error((char *) _("Invalid infokey file `%s' (bad section length) -- run infokey to update it"),
+                n = getint(&p);
+                if (n < 0 || (unsigned int) n > len - 4 - (p - buf))
+                {
+                        info_error(_("Invalid infokey file `%s' (bad section length) -- run infokey to update it"),
                             filename, NULL);
-			free(filename);
-			return 0;
-		}
-
-		switch (s)
-		{
-		case INFOKEY_SECTION_INFO:
-			user_info_keys = p;
-			user_info_keys_len = n;
-			break;
-		case INFOKEY_SECTION_EA:
-			user_ea_keys = p;
-			user_ea_keys_len = n;
-			break;
-		case INFOKEY_SECTION_VAR:
-			user_vars = p;
-			user_vars_len = n;
-			break;
-		default:
-			info_error((char *) _("Invalid infokey file `%s' (bad section code) -- run infokey to update it"),
+                        free(filename);
+                        return 0;
+                }
+
+                switch (s)
+                {
+                case INFOKEY_SECTION_INFO:
+                        user_info_keys = p;
+                        user_info_keys_len = n;
+                        break;
+                case INFOKEY_SECTION_EA:
+                        user_ea_keys = p;
+                        user_ea_keys_len = n;
+                        break;
+                case INFOKEY_SECTION_VAR:
+                        user_vars = p;
+                        user_vars_len = n;
+                        break;
+                default:
+                        info_error(_("Invalid infokey file `%s' (bad section code) -- run infokey to update it"),
                             filename, NULL);
-			free(filename);
-			return 0;
-		}
-	}
+                        free(filename);
+                        return 0;
+                }
+        }
 
-	free(filename);
-	return 1;
+        free(filename);
+        return 1;
 }
 
 /* Decode special key sequences from the infokey file.  Return zero
@@ -1597,55 +1052,55 @@ static int
 decode_keys(unsigned char *src, unsigned int slen,
     unsigned char *dst, unsigned int dlen)
 {
-	unsigned char *s = src;
-	unsigned char *d = dst;
+        unsigned char *s = src;
+        unsigned char *d = dst;
 
 #define To_dst(c) do { \
   if ((unsigned int) (d - dst) < dlen) *d++ = (c); \
 } while (0)
 
-	while ((unsigned int) (s - src) < slen)
-	{
-		unsigned char c = ISMETA(*s) ? UNMETA(*s) : *s;
-
-		if (c == SK_ESCAPE)
-		{
-			char *t;
-			static char lit[] = { SK_ESCAPE, NUL };
-
-			switch ((unsigned int) (s + 1 - src) < slen ? s[1] : '\0')
-			{
-			case SK_RIGHT_ARROW:	t = term_kr; break;
-			case SK_LEFT_ARROW:	t = term_kl; break;
-			case SK_UP_ARROW:	t = term_ku; break;
-			case SK_DOWN_ARROW:	t = term_kd; break;
-			case SK_PAGE_UP:	t = term_kP; break;
-			case SK_PAGE_DOWN:	t = term_kN; break;
-			case SK_HOME:		t = term_kh; break;
-			case SK_END:		t = term_ke; break;
-			case SK_DELETE:		t = term_kx; break;
-			case SK_INSERT:		t = term_ki; break;
-			case SK_LITERAL:
-			default:		t = lit; break;
-			}
-			if (t == NULL)
-				return 0;
-			while (*t)
-				To_dst(ISMETA(*s) ? Meta(*t++) : *t++);
-			s += 2;
-		}
-		else
-		{
-			if (ISMETA(*s))
-				To_dst(Meta(*s++));
-			else
-				To_dst(*s++);
-		}
-	}
-
-	To_dst('\0');
-
-	return 1;
+        while ((unsigned int) (s - src) < slen)
+        {
+                unsigned char c = ISMETA(*s) ? UNMETA(*s) : *s;
+
+                if (c == SK_ESCAPE)
+                {
+                        char *t;
+                        static char lit[] = { SK_ESCAPE, NUL };
+
+                        switch ((unsigned int) (s + 1 - src) < slen ? s[1] : '\0')
+                        {
+                        case SK_RIGHT_ARROW:    t = term_kr; break;
+                        case SK_LEFT_ARROW:     t = term_kl; break;
+                        case SK_UP_ARROW:       t = term_ku; break;
+                        case SK_DOWN_ARROW:     t = term_kd; break;
+                        case SK_PAGE_UP:        t = term_kP; break;
+                        case SK_PAGE_DOWN:      t = term_kN; break;
+                        case SK_HOME:           t = term_kh; break;
+                        case SK_END:            t = term_ke; break;
+                        case SK_DELETE:         t = term_kx; break;
+                        case SK_INSERT:         t = term_ki; break;
+                        case SK_LITERAL:
+                        default:                t = lit; break;
+                        }
+                        if (t == NULL)
+                                return 0;
+                        while (*t)
+                                To_dst(ISMETA(*s) ? Meta(*t++) : *t++);
+                        s += 2;
+                }
+                else
+                {
+                        if (ISMETA(*s))
+                                To_dst(Meta(*s++));
+                        else
+                                To_dst(*s++);
+                }
+        }
+
+        To_dst('\0');
+
+        return 1;
 
 #undef To_dst
 
@@ -1656,66 +1111,66 @@ decode_keys(unsigned char *src, unsigned int slen,
 static int
 section_to_keymaps(Keymap map, unsigned char *table, unsigned int len)
 {
-	int stop;
-	unsigned char *p;
-	unsigned char *seq = NULL;
-	unsigned int seqlen = 0;
-	enum { getseq, gotseq, getaction } state = getseq;
-
-	stop = len > 0 ? table[0] : 0;
-
-	for (p = table + 1; (unsigned int) (p - table) < len; p++)
-	{
-		switch (state)
-		{
-		case getseq:
-			if (*p)
-			{
-				seq = p;
-				state = gotseq;
-			}
-			break;
-
-		case gotseq:
-			if (!*p)
-			{
-				seqlen = p - seq;
-				state = getaction;
-			}
-			break;
-
-		case getaction:
-			{
-				unsigned int action = *p;
-				unsigned char keyseq[256];
-				KEYMAP_ENTRY ke;
-
-				state = getseq;
-				/* If decode_keys returns zero, it
-				   means that seq includes keys which
-				   the terminal doesn't support, like
-				   PageDown.  In that case, don't bind
-				   the key sequence.  */
-				if (decode_keys(seq, seqlen, keyseq,
-						sizeof keyseq))
-				{
-					keyseq[sizeof keyseq - 1] = '\0';
-					ke.type = ISFUNC;
-					ke.function =
-					  action < A_NCOMMANDS
-					  ? &function_doc_array[action]
-					  : NULL;
-					keymap_bind_keyseq(map,
+        int stop;
+        unsigned char *p;
+        unsigned char *seq = NULL;
+        unsigned int seqlen = 0;
+        enum { getseq, gotseq, getaction } state = getseq;
+
+        stop = len > 0 ? table[0] : 0;
+
+        for (p = table + 1; (unsigned int) (p - table) < len; p++)
+        {
+                switch (state)
+                {
+                case getseq:
+                        if (*p)
+                        {
+                                seq = p;
+                                state = gotseq;
+                        }
+                        break;
+
+                case gotseq:
+                        if (!*p)
+                        {
+                                seqlen = p - seq;
+                                state = getaction;
+                        }
+                        break;
+
+                case getaction:
+                        {
+                                unsigned int action = *p;
+                                unsigned char keyseq[256];
+                                KEYMAP_ENTRY ke;
+
+                                state = getseq;
+                                /* If decode_keys returns zero, it
+                                   means that seq includes keys which
+                                   the terminal doesn't support, like
+                                   PageDown.  In that case, don't bind
+                                   the key sequence.  */
+                                if (decode_keys(seq, seqlen, keyseq,
+                                                sizeof keyseq))
+                                {
+                                        keyseq[sizeof keyseq - 1] = '\0';
+                                        ke.type = ISFUNC;
+                                        ke.function =
+                                          action < A_NCOMMANDS
+                                          ? &function_doc_array[action]
+                                          : NULL;
+                                        keymap_bind_keyseq(map,
                                             (const char *) keyseq, &ke);
-				}
-			}
-			break;
-		}
-	}
-	if (state != getseq)
-		info_error((char *) _("Bad data in infokey file -- some key bindings ignored"),
+                                }
+                        }
+                        break;
+                }
+        }
+        if (state != getseq)
+                info_error(_("Bad data in infokey file -- some key bindings ignored"),
                     NULL, NULL);
-	return !stop;
+        return !stop;
 }
 
 /* Convert an infokey file section to variable settings.
@@ -1723,47 +1178,47 @@ section_to_keymaps(Keymap map, unsigned char *table, unsigned int len)
 static void
 section_to_vars(unsigned char *table, unsigned int len)
 {
-	enum { getvar, gotvar, getval, gotval } state = getvar;
-	unsigned char *var = NULL;
-	unsigned char *val = NULL;
-	unsigned char *p;
-
-	for (p = table; (unsigned int) (p - table) < len; p++)
-	  {
-	    switch (state)
-	      {
-	      case getvar:
-		if (*p)
-		  {
-		    var = p;
-		    state = gotvar;
-		  }
-		break;
-
-	      case gotvar:
-		if (!*p)
-		  state = getval;
-		break;
-
-	      case getval:
-		if (*p)
-		  {
-		    val = p;
-		    state = gotval;
-		  }
-		break;
-
-	      case gotval:
-		if (!*p)
-		  {
-		    set_variable_to_value((char *) var, (char *) val);
-		    state = getvar;
-		  }
-		break;
-	      }
-	  }
+        enum { getvar, gotvar, getval, gotval } state = getvar;
+        unsigned char *var = NULL;
+        unsigned char *val = NULL;
+        unsigned char *p;
+
+        for (p = table; (unsigned int) (p - table) < len; p++)
+          {
+            switch (state)
+              {
+              case getvar:
+                if (*p)
+                  {
+                    var = p;
+                    state = gotvar;
+                  }
+                break;
+
+              case gotvar:
+                if (!*p)
+                  state = getval;
+                break;
+
+              case getval:
+                if (*p)
+                  {
+                    val = p;
+                    state = gotval;
+                  }
+                break;
+
+              case gotval:
+                if (!*p)
+                  {
+                    set_variable_to_value((char *) var, (char *) val);
+                    state = getvar;
+                  }
+                break;
+              }
+          }
       if (state != getvar)
-	info_error((char *) _("Bad data in infokey file -- some var settings ignored"),
+        info_error(_("Bad data in infokey file -- some var settings ignored"),
             NULL, NULL);
 }
 
@@ -1789,9 +1244,9 @@ initialize_info_keymaps (void)
   if (fetch_user_maps())
     {
       if (user_info_keys_len && user_info_keys[0])
-	suppress_info_default_bindings = 1;
+        suppress_info_default_bindings = 1;
       if (user_ea_keys_len && user_ea_keys[0])
-	suppress_ea_default_bindings = 1;
+        suppress_ea_default_bindings = 1;
     }
 
   /* Apply the default bindings, unless the user says to suppress
@@ -1799,20 +1254,20 @@ initialize_info_keymaps (void)
   if (vi_keys_p)
     {
       if (!suppress_info_default_bindings)
-	section_to_keymaps(info_keymap, default_vi_like_info_keys,
-			   sizeof(default_vi_like_info_keys));
+        section_to_keymaps(info_keymap, default_vi_like_info_keys,
+                           sizeof(default_vi_like_info_keys));
       if (!suppress_ea_default_bindings)
-	  section_to_keymaps(echo_area_keymap, default_vi_like_ea_keys,
-			     sizeof(default_vi_like_ea_keys));
+          section_to_keymaps(echo_area_keymap, default_vi_like_ea_keys,
+                             sizeof(default_vi_like_ea_keys));
     }
   else
     {
       if (!suppress_info_default_bindings)
-	section_to_keymaps(info_keymap, default_emacs_like_info_keys,
-			   sizeof(default_emacs_like_info_keys));
+        section_to_keymaps(info_keymap, default_emacs_like_info_keys,
+                           sizeof(default_emacs_like_info_keys));
       if (!suppress_ea_default_bindings)
-	  section_to_keymaps(echo_area_keymap, default_emacs_like_ea_keys,
-			     sizeof(default_emacs_like_ea_keys));
+          section_to_keymaps(echo_area_keymap, default_emacs_like_ea_keys,
+                             sizeof(default_emacs_like_ea_keys));
     }
 
   /* If the user specified custom bindings, apply them on top of the
@@ -1827,5 +1282,4 @@ initialize_info_keymaps (void)
     section_to_vars(user_vars, user_vars_len);
 }
 
-#endif /* defined(INFOKEY) */
 /* vim: set sw=2 cino={1s>2sn-s^-se-s: */
diff --git a/Build/source/utils/texinfo/info/infomap.h b/Build/source/utils/texinfo/info/infomap.h
index 31e4d8275f0..1e670693d22 100644
--- a/Build/source/utils/texinfo/info/infomap.h
+++ b/Build/source/utils/texinfo/info/infomap.h
@@ -1,12 +1,12 @@
 /* infomap.h -- description of a keymap in Info and related functions.
-   $Id: infomap.h,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: infomap.h,v 1.6 2007/07/01 21:20:30 karl Exp $
 
-   Copyright (C) 1993, 2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/key.h b/Build/source/utils/texinfo/info/key.h
index 35d2762211f..e8409da00e7 100644
--- a/Build/source/utils/texinfo/info/key.h
+++ b/Build/source/utils/texinfo/info/key.h
@@ -3,12 +3,12 @@
 /* This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Andrew Bettison <andrewb@zip.com.au> */
 
diff --git a/Build/source/utils/texinfo/info/m-x.c b/Build/source/utils/texinfo/info/m-x.c
index 52365d1843e..6499256472c 100644
--- a/Build/source/utils/texinfo/info/m-x.c
+++ b/Build/source/utils/texinfo/info/m-x.c
@@ -1,13 +1,13 @@
 /* m-x.c -- Meta-x minibuffer reader.
-   $Id: m-x.c,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: m-x.c,v 1.7 2008/02/26 16:51:05 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -33,7 +32,7 @@
    name.  A return value of NULL indicates that no function name could
    be read. */
 char *
-read_function_name (char *prompt, WINDOW *window)
+read_function_name (const char *prompt, WINDOW *window)
 {
   register int i;
   char *line;
@@ -70,7 +69,7 @@ DECLARE_INFO_COMMAND (describe_command,
 {
   char *line;
 
-  line = read_function_name ((char *) _("Describe command: "), window);
+  line = read_function_name (_("Describe command: "), window);
 
   if (!line)
     {
@@ -137,7 +136,7 @@ DECLARE_INFO_COMMAND (info_execute_command,
         (strncmp (line, "echo-area-", 10) == 0))
       {
         free (line);
-        info_error ((char *) _("Cannot execute an `echo-area' command here."),
+        info_error (_("Cannot execute an `echo-area' command here."),
             NULL, NULL);
         return;
       }
@@ -151,7 +150,7 @@ DECLARE_INFO_COMMAND (info_execute_command,
     if (InfoFunction(command))
       (*InfoFunction(command)) (active_window, count, 0);
     else
-      info_error ((char *) _("Undefined command: %s"), line, NULL);
+      info_error (_("Undefined command: %s"), line, NULL);
   }
 }
 
diff --git a/Build/source/utils/texinfo/info/makedoc.c b/Build/source/utils/texinfo/info/makedoc.c
index 41b1beb9679..7142f3db493 100644
--- a/Build/source/utils/texinfo/info/makedoc.c
+++ b/Build/source/utils/texinfo/info/makedoc.c
@@ -1,13 +1,13 @@
 /* makedoc.c -- make doc.c and funs.h from input files.
-   $Id: makedoc.c,v 1.4 2004/04/11 17:56:46 karl Exp $
+   $Id: makedoc.c,v 1.9 2007/12/09 23:30:40 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -28,6 +27,8 @@
 #include "info.h"
 #include "infokey.h"
 
+char *program_name = "makedoc";
+
 static void fatal_file_error (char *filename);
 
 /* Name of the header file which receives the declarations of functions. */
@@ -143,9 +144,12 @@ main (int argc, char **argv)
       key_filename = NULL_DEVICE;
     }
 
+  /* The order of these calls depends exactly on the order in the
+     Makefile.{in,am}, or they might fail on filesystems with
+     high-precision times; see also the fclose calls below.  */
   funs_stream = must_fopen (funs_filename, "w");
-  doc_stream = must_fopen (doc_filename, "w");
   key_stream = must_fopen (key_filename, "w");
+  doc_stream = must_fopen (doc_filename, "w");
 
   fprintf (funs_stream,
       "/* %s -- Generated declarations for Info commands. */\n\n\
@@ -224,9 +228,11 @@ main (int argc, char **argv)
   fprintf (key_stream, "   { (char *)NULL, 0 }\n};\n");
   fprintf (funs_stream, "\n#define A_NCOMMANDS %u\n", next_func_key());
 
+  /* The order of these calls also depends exactly on the order in the
+   * Makefile.{in,am}; see the must_fopen calls above.  */
   fclose (funs_stream);
-  fclose (doc_stream);
   fclose (key_stream);
+  fclose (doc_stream);
 
   if (tags_only)
     maybe_dump_tags (stdout);
diff --git a/Build/source/utils/texinfo/info/man.c b/Build/source/utils/texinfo/info/man.c
index 33fd6d4be0b..22919677052 100644
--- a/Build/source/utils/texinfo/info/man.c
+++ b/Build/source/utils/texinfo/info/man.c
@@ -1,13 +1,13 @@
 /*  man.c: How to read and format man files.
-    $Id: man.c,v 1.4 2004/04/11 17:56:46 karl Exp $
+    $Id: man.c,v 1.11 2007/12/03 01:38:42 karl Exp $
 
-   Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,10 +15,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-   Written by Brian Fox Thu May  4 09:17:52 1995 (bfox@ai.mit.edu). */
+   Originally written by Brian Fox Thu May  4 09:17:52 1995. */
 
 #include "info.h"
 #include <sys/ioctl.h>
@@ -290,8 +289,10 @@ get_manpage_contents (char *pagename)
 
   get_page_and_section (pagename);
 
-  if (manpage_section != (char *)NULL)
+  if (manpage_section)
     formatter_args[arg_index++] = manpage_section;
+  else
+    formatter_args[arg_index++] = "-a";    
 
   formatter_args[arg_index++] = manpage_pagename;
   formatter_args[arg_index] = (char *)NULL;
@@ -325,6 +326,19 @@ get_manpage_contents (char *pagename)
       freopen (NULL_DEVICE, "r", stdin);
       dup2 (pipes[1], fileno (stdout));
 
+      if (MB_CUR_MAX > 1)
+        {
+          /* Info has trouble wrapping man output if it contains
+             multibyte characters */
+          setenv("LANGUAGE", "C", 1);
+          setenv("LANG", "C", 1);
+#ifdef LC_MESSAGES
+          setenv("LC_MESSAGES", "C", 1);
+#endif
+          setenv("LC_CTYPE", "C", 1);
+          setenv("LC_ALL", "C", 1);
+        }
+
       execv (formatter_args[0], formatter_args);
 
       /* If we get here, we couldn't exec, so close out the pipe and
@@ -440,7 +454,7 @@ manpage_node_of_file_buffer (FILE_BUFFER *file_buffer, char *pagename)
 
       for (i = 0; (tag = file_buffer->tags[i]); i++)
         {
-          if (strcasecmp (pagename, tag->nodename) == 0)
+          if (mbscasecmp (pagename, tag->nodename) == 0)
             break;
         }
     }
diff --git a/Build/source/utils/texinfo/info/man.h b/Build/source/utils/texinfo/info/man.h
index 73ef1b6274a..89377cbcbd0 100644
--- a/Build/source/utils/texinfo/info/man.h
+++ b/Build/source/utils/texinfo/info/man.h
@@ -1,15 +1,15 @@
 /* man.h: Defines and external function declarations for man.c.
-   $Id: man.h,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: man.h,v 1.6 2007/07/01 21:20:30 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Author: Brian J. Fox (bfox@ai.mit.edu) Sat May  6 16:19:13 1995. */
 
diff --git a/Build/source/utils/texinfo/info/nodemenu.c b/Build/source/utils/texinfo/info/nodemenu.c
index 1090d08db02..c230db02e74 100644
--- a/Build/source/utils/texinfo/info/nodemenu.c
+++ b/Build/source/utils/texinfo/info/nodemenu.c
@@ -1,13 +1,13 @@
 /* nodemenu.c -- produce a menu of all visited nodes.
-   $Id: nodemenu.c,v 1.5 2004/04/11 17:56:46 karl Exp $
+   $Id: nodemenu.c,v 1.10 2008/02/26 16:51:05 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -116,7 +115,7 @@ compare_strings (const void *entry1, const void *entry2)
   char **e1 = (char **) entry1;
   char **e2 = (char **) entry2;
 
-  return (strcasecmp (*e1, *e2));
+  return (mbscasecmp (*e1, *e2));
 }
 
 /* The name of the nodemenu node. */
@@ -199,7 +198,7 @@ get_visited_nodes (Function *filter_func)
 
   printf_to_message_buffer
     ("%s", replace_in_documentation
-     ((char *) _("Here is the menu of nodes you have recently visited.\n\
+     (_("Here is the menu of nodes you have recently visited.\n\
 Select one from this menu, or use `\\[history-node]' in another window.\n"), 0),
      NULL, NULL);
 
@@ -314,7 +313,7 @@ DECLARE_INFO_COMMAND (select_visited_node,
 
   line =
     info_read_completing_in_echo_area (window,
-        (char *) _("Select visited node: "), menu);
+        _("Select visited node: "), menu);
 
   window = active_window;
 
@@ -334,7 +333,7 @@ DECLARE_INFO_COMMAND (select_visited_node,
       entry = info_get_labeled_reference (line, menu);
 
       if (!entry)
-        info_error ((char *) _("The reference disappeared! (%s)."), line, NULL);
+        info_error (_("The reference disappeared! (%s)."), line, NULL);
       else
         info_select_reference (window, entry);
     }
diff --git a/Build/source/utils/texinfo/info/nodes.c b/Build/source/utils/texinfo/info/nodes.c
index a3381a83145..a0b95411609 100644
--- a/Build/source/utils/texinfo/info/nodes.c
+++ b/Build/source/utils/texinfo/info/nodes.c
@@ -1,13 +1,13 @@
 /* nodes.c -- how to get an Info file and node.
-   $Id: nodes.c,v 1.4 2004/04/11 17:56:46 karl Exp $
+   $Id: nodes.c,v 1.10 2007/12/03 01:38:43 karl Exp $
 
-   Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004, 2006, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -116,8 +115,11 @@ info_get_node (char *filename, char *nodename)
   /* Look for the node.  */
   node = info_get_node_of_file_buffer (nodename, file_buffer);
 
-  /* If the node not found was "Top", try again with different case.  */
-  if (!node && (nodename == NULL || strcasecmp (nodename, "Top") == 0))
+  /* If the node not found was "Top", try again with different case,
+     unless this was a man page.  */
+  if (!node
+      && mbscasecmp (filename, MANPAGE_FILE_BUFFER_NAME) != 0
+      && (nodename == NULL || mbscasecmp (nodename, "Top") == 0))
     {
       node = info_get_node_of_file_buffer ("Top", file_buffer);
       if (!node)
@@ -137,6 +139,7 @@ NODE *
 info_get_node_of_file_buffer (char *nodename, FILE_BUFFER *file_buffer)
 {
   NODE *node = NULL;
+  int implicit_nodename = 0;
 
   /* If we are unable to find the file, we have to give up.  There isn't
      anything else we can do. */
@@ -149,7 +152,10 @@ info_get_node_of_file_buffer (char *nodename, FILE_BUFFER *file_buffer)
 
   /* If NODENAME is not specified, it defaults to "Top". */
   if (!nodename)
-    nodename = "Top";
+    {
+      nodename = "Top";
+      implicit_nodename = 1;  /* don't return man page for top */
+    }
 
   /* If the name of the node that we wish to find is exactly "*", then the
      node body is the contents of the entire file.  Create and return such
@@ -168,9 +174,9 @@ info_get_node_of_file_buffer (char *nodename, FILE_BUFFER *file_buffer)
 #if defined (HANDLE_MAN_PAGES)
   /* If the file buffer is the magic one associated with manpages, call
      the manpage node finding function instead. */
-  else if (file_buffer->flags & N_IsManPage)
+  else if (!implicit_nodename && file_buffer->flags & N_IsManPage)
     {
-        node = get_manpage_node (file_buffer, nodename);
+      node = get_manpage_node (file_buffer, nodename);
     }
 #endif /* HANDLE_MAN_PAGES */
   /* If this is the "main" info file, it might contain a tags table.  Search
@@ -288,7 +294,7 @@ info_find_file_internal (char *filename, int get_tags)
 #if defined (HANDLE_MAN_PAGES)
   /* If the name of the file that we want is our special file buffer for
      Unix manual pages, then create the file buffer, and return it now. */
-  if (strcasecmp (filename, MANPAGE_FILE_BUFFER_NAME) == 0)
+  if (mbscasecmp (filename, MANPAGE_FILE_BUFFER_NAME) == 0)
     file_buffer = create_manpage_file_buffer ();
   else
 #endif /* HANDLE_MAN_PAGES */
@@ -325,7 +331,7 @@ info_load_file_internal (char *filename, int get_tags)
      doesn't exist, then try again with the last part of the filename
      appearing in lowercase. */
   /* This is probably not needed at all on those systems which define
-     FILENAME_CMP to be strcasecmp.  But let's do it anyway, lest some
+     FILENAME_CMP to be mbscasecmp.  But let's do it anyway, lest some
      network redirector supports case sensitivity.  */
   if (retcode < 0)
     {
diff --git a/Build/source/utils/texinfo/info/nodes.h b/Build/source/utils/texinfo/info/nodes.h
index e2fbabea172..213dc3c85f7 100644
--- a/Build/source/utils/texinfo/info/nodes.h
+++ b/Build/source/utils/texinfo/info/nodes.h
@@ -1,12 +1,13 @@
 /* nodes.h -- How we represent nodes internally.
-   $Id: nodes.h,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: nodes.h,v 1.6 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/pcterm.c b/Build/source/utils/texinfo/info/pcterm.c
index ed348dc54d1..1c3d6861ce2 100644
--- a/Build/source/utils/texinfo/info/pcterm.c
+++ b/Build/source/utils/texinfo/info/pcterm.c
@@ -1,21 +1,20 @@
 /* pcterm.c -- How to handle the PC terminal for Info under MS-DOS/MS-Windows.
-   $Id: pcterm.c,v 1.4 2004/04/11 17:56:46 karl Exp $
+   $Id: pcterm.c,v 1.7 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1998, 1999, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2003, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 /* WARNING WARNING WARNING!!!
diff --git a/Build/source/utils/texinfo/info/search.c b/Build/source/utils/texinfo/info/search.c
index a1d5da6c711..83cb9d47867 100644
--- a/Build/source/utils/texinfo/info/search.c
+++ b/Build/source/utils/texinfo/info/search.c
@@ -1,12 +1,13 @@
 /* search.c -- searching large bodies of text.
-   $Id: search.c,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: search.c,v 1.7 2007/12/17 19:12:11 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,12 +15,12 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-   Written by Brian Fox (bfox@ai.mit.edu). */
+   Originally written by Brian Fox (bfox@ai.mit.edu). */
 
 #include "info.h"
+#include <regex.h>
 
 #include "search.h"
 #include "nodes.h"
@@ -83,6 +84,164 @@ search (char *string, SEARCH_BINDING *binding)
   return (result);
 }
 
+/* Search forwards or backwards for anything matching the regexp in the text
+   delimited by BINDING. The search is forwards if BINDING->start is greater
+   than BINDING->end. */
+long
+regexp_search (char *regexp, SEARCH_BINDING *binding, long length)
+{
+  static char *previous_regexp = NULL;
+  static char *previous_content = NULL;
+  static int was_insensitive = 0;
+  static regex_t preg;
+  static regmatch_t *matches;
+  static int match_alloc = 0;
+  static int match_count = 0;
+  regoff_t pos;
+  long result;
+
+  if (previous_regexp == NULL
+      || (binding->flags & S_FoldCase != was_insensitive)
+      || (strcmp (previous_regexp, regexp) != 0))
+    {
+      /* need to compile a new regexp */
+      int result;
+      char *unescaped_regexp;
+      char *p, *q;
+
+      previous_content = NULL;
+
+      if (previous_regexp != NULL)
+        {
+          free (previous_regexp);
+          previous_regexp = NULL;
+          regfree (&preg);
+        }
+
+      was_insensitive = binding->flags & S_FoldCase;
+
+      /* expand the \n and \t in regexp */
+      unescaped_regexp = xmalloc (1 + strlen (regexp));
+      for (p = regexp, q = unescaped_regexp; *p != '\0'; p++, q++)
+        {
+          if (*p == '\\')
+            switch(*++p)
+              {
+              case 'n':
+                *q = '\n';
+                break;
+              case 't':
+                *q = '\t';
+                break;
+              case '\0':
+                *q = '\\';
+                p--;
+                break;
+              default:
+                *q++ = '\\';
+                *q = *p;
+                break;
+              }
+          else
+            *q = *p;
+        }
+      *q = '\0';
+
+      result = regcomp (&preg, unescaped_regexp,
+                       REG_EXTENDED|
+                       REG_NEWLINE|
+                       (was_insensitive ? REG_ICASE : 0));
+      free (unescaped_regexp);
+
+      if (result != 0)
+        {
+          int size = regerror (result, &preg, NULL, 0);
+          char *buf = xmalloc (size);
+          regerror (result, &preg, buf, size);
+          info_error (_("regexp error: %s"), buf, NULL);
+          return -1;
+        }
+
+      previous_regexp = xstrdup(regexp);
+    }
+
+  if (previous_content != binding->buffer)
+    {
+      /* new buffer to search in, let's scan it */
+      regoff_t start = 0;
+      char saved_char;
+
+      previous_content = binding->buffer;
+      saved_char = previous_content[length-1];
+      previous_content[length-1] = '\0';
+
+      for (match_count = 0; start < length; )
+        {
+          int result = 0;
+          if (match_count >= match_alloc)
+            {
+              /* match list full. Initially allocate 256 entries, then double
+                 every time we fill it */
+              match_alloc = (match_alloc > 0 ? match_alloc * 2 : 256);
+              matches = (regmatch_t*) xrealloc (matches,
+                                            match_alloc * sizeof(regmatch_t));
+            }
+
+          result = regexec (&preg, &previous_content[start],
+                            1, &matches[match_count], 0);
+          if (result == 0)
+            {
+              if (matches[match_count].rm_eo == 0)
+                {
+                  /* ignore empty matches */
+                  start++;
+                }
+              else
+                {
+                  matches[match_count].rm_so += start;
+                  matches[match_count].rm_eo += start;
+                  start = matches[match_count++].rm_eo;
+                }
+            }
+          else
+            {
+              break;
+            }
+        }
+      previous_content[length-1] = saved_char;
+    }
+
+  pos = binding->start;
+  if (pos > binding->end)
+    {
+      /* searching backward */
+      int i;
+      for (i = match_count - 1; i >= 0; i--)
+        {
+          if (matches[i].rm_so <= pos)
+            return matches[i].rm_so;
+        }
+    }
+  else
+    {
+      /* searching forward */
+      int i;
+      for (i = 0; i < match_count; i++)
+        {
+          if (matches[i].rm_so >= pos)
+            {
+              if (binding->flags & S_SkipDest)
+                return matches[i].rm_eo;
+              else
+                return matches[i].rm_so;
+            }
+        }
+    }
+
+  /* not found */
+  return -1;
+}
+
 /* Search forwards for STRING through the text delimited in BINDING. */
 long
 search_forward (char *string, SEARCH_BINDING *binding)
diff --git a/Build/source/utils/texinfo/info/search.h b/Build/source/utils/texinfo/info/search.h
index 3e0610799ba..b2943f0adb3 100644
--- a/Build/source/utils/texinfo/info/search.h
+++ b/Build/source/utils/texinfo/info/search.h
@@ -1,12 +1,13 @@
 /* search.h -- Structure used to search large bodies of text, with bounds.
-   $Id: search.h,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: search.h,v 1.7 2007/12/17 19:12:11 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,10 +15,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-   Written by Brian Fox (bfox@ai.mit.edu). */
+   Originally written by Brian Fox (bfox@ai.mit.edu). */
 
 /* The search functions take two arguments:
 
@@ -47,6 +47,7 @@ SEARCH_BINDING *copy_binding (SEARCH_BINDING *binding);
 extern long search_forward (char *string, SEARCH_BINDING *binding);
 extern long search_backward (char *input_string, SEARCH_BINDING *binding);
 extern long search (char *string, SEARCH_BINDING *binding);
+extern long regexp_search (char *regexp, SEARCH_BINDING *binding, long length);
 extern int looking_at (char *string, SEARCH_BINDING *binding);
 
 /* Note that STRING_IN_LINE () always returns the offset of the 1st character
diff --git a/Build/source/utils/texinfo/info/session.c b/Build/source/utils/texinfo/info/session.c
index 7a8996bbe20..36f12d6794e 100644
--- a/Build/source/utils/texinfo/info/session.c
+++ b/Build/source/utils/texinfo/info/session.c
@@ -1,13 +1,13 @@
 /* session.c -- user windowing interface to Info.
-   $Id: session.c,v 1.16 2004/12/14 00:15:36 karl Exp $
+   $Id: session.c,v 1.37 2008/03/23 23:32:22 karl Exp $
 
-   Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2007, 2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -64,6 +63,9 @@ static int info_windows_index = 0;
 /* Number of slots allocated to `info_windows'. */
 static int info_windows_slots = 0;
 
+/* Whether to use regexps or not for search.  */
+static int use_regex = 1;
+
 void remember_window_and_node (WINDOW *window, NODE *node);
 void forget_window_and_nodes (WINDOW *window);
 void display_startup_message_and_start (void);
@@ -110,7 +112,7 @@ begin_multiple_window_info_session (char *filename, char **nodenames)
           if (!largest)
             {
               display_update_display (windows);
-              info_error ((char *) msg_cant_find_window, NULL, NULL);
+              info_error (msg_cant_find_window, NULL, NULL);
               info_session ();
               xexit (0);
             }
@@ -125,7 +127,7 @@ begin_multiple_window_info_session (char *filename, char **nodenames)
           else
             {
               display_update_display (windows);
-              info_error ((char *) msg_win_too_small, NULL, NULL);
+              info_error (msg_win_too_small, NULL, NULL);
               info_session ();
               xexit (0);
             }
@@ -137,7 +139,7 @@ begin_multiple_window_info_session (char *filename, char **nodenames)
 /* Start an info session with INITIAL_NODE, and an error message in the echo
    area made from FORMAT and ARG. */
 void
-begin_info_session_with_error (NODE *initial_node, char *format,
+begin_info_session_with_error (NODE *initial_node, const char *format,
     void *arg1, void *arg2)
 {
   initialize_info_session (initial_node, 1);
@@ -159,7 +161,7 @@ display_startup_message_and_start (void)
   char *format;
 
   format = replace_in_documentation
-    ((char *) _("Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] for menu item."),
+    (_("Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] for menu item."),
      0);
 
   window_message_in_echo_area (format, VERSION, NULL);
@@ -266,7 +268,7 @@ initialize_info_session (NODE *node, int clear_screen)
       if (!term_name)
         term_name = "dumb";
 
-      info_error ((char *) msg_term_too_dumb, term_name, NULL);
+      info_error (msg_term_too_dumb, term_name, NULL);
       xexit (1);
     }
 
@@ -598,7 +600,7 @@ move_to_new_line (int old, int new, WINDOW *window)
 {
   if (old == -1)
     {
-      info_error ((char *) msg_cant_find_point, NULL, NULL);
+      info_error (msg_cant_find_point, NULL, NULL);
     }
   else
     {
@@ -606,7 +608,7 @@ move_to_new_line (int old, int new, WINDOW *window)
 
       if (new >= window->line_count || new < 0)
         return;
-
+      
       goal = window_get_goal_column (window);
       window->goal_column = goal;
 
@@ -616,6 +618,9 @@ move_to_new_line (int old, int new, WINDOW *window)
     }
 }
 
+static int forward_move_node_structure (WINDOW *window, int behaviour);
+static int backward_move_node_structure (WINDOW *window, int behaviour);
+
 /* Move WINDOW's point down to the next line if possible. */
 DECLARE_INFO_COMMAND (info_next_line, _("Move down to the next line"))
 {
@@ -624,11 +629,32 @@ DECLARE_INFO_COMMAND (info_next_line, _("Move down to the next line"))
   if (count < 0)
     info_prev_line (window, -count, key);
   else
-    {
-      old_line = window_line_of_point (window);
-      new_line = old_line + count;
-      move_to_new_line (old_line, new_line, window);
-    }
+    while (count)
+      {
+        int diff;
+
+        old_line = window_line_of_point (window);
+        diff = window->line_count - old_line;
+        if (diff > count)
+          diff = count;
+
+        count -= diff;
+        new_line = old_line + diff;
+        if (new_line >= window->line_count)
+          {
+            if (cursor_movement_scrolls_p)
+              {
+                if (forward_move_node_structure (window,
+                                                 info_scroll_behaviour))
+                  break;
+                move_to_new_line (0, 0, window);
+              }
+            else
+              break;
+          }
+        else
+          move_to_new_line (old_line, new_line, window);
+      }
 }
 
 /* Move WINDOW's point up to the previous line if possible. */
@@ -639,11 +665,31 @@ DECLARE_INFO_COMMAND (info_prev_line, _("Move up to the previous line"))
   if (count < 0)
     info_next_line (window, -count, key);
   else
-    {
-      old_line = window_line_of_point (window);
-      new_line = old_line - count;
-      move_to_new_line (old_line, new_line, window);
-    }
+    while (count)
+      {
+        int diff;
+        
+        old_line = window_line_of_point (window);
+        diff = old_line + 1;
+        if (diff > count)
+          diff = count;
+        
+        count -= diff;
+        new_line = old_line - diff;
+        
+        if (new_line < 0
+            && cursor_movement_scrolls_p)
+          {
+            if (backward_move_node_structure (window, info_scroll_behaviour))
+              break;
+            if (window->line_count > window->height)
+              set_window_pagetop (window, window->line_count - window->height);
+            move_to_new_line (window->line_count,
+                              window->line_count - 1, window);
+          }
+        else
+          move_to_new_line (old_line, new_line, window);
+      }
 }
 
 /* Move WINDOW's point to the end of the true line. */
@@ -692,11 +738,27 @@ DECLARE_INFO_COMMAND (info_forward_char, _("Move forward a character"))
     info_backward_char (window, -count, key);
   else
     {
-      window->point += count;
-
-      if (window->point >= window->node->nodelen)
-        window->point = window->node->nodelen - 1;
-
+      while (count)
+        {
+          int diff = window->node->nodelen - window->point;
+          
+          if (diff > count)
+            diff = count;
+          window->point += diff;
+          count -= diff;
+          if (window->point >= window->node->nodelen)
+            {
+              if (cursor_movement_scrolls_p
+                  && forward_move_node_structure (window,
+                                                  info_scroll_behaviour) == 0)
+                window->point = 0;
+              else
+                {
+                  window->point = window->node->nodelen - 1;
+                  break;
+                }
+            }
+        }
       info_show_point (window);
     }
 }
@@ -708,11 +770,34 @@ DECLARE_INFO_COMMAND (info_backward_char, _("Move backward a character"))
     info_forward_char (window, -count, key);
   else
     {
-      window->point -= count;
+      while (count)
+        {
+          int diff = count;
 
-      if (window->point < 0)
-        window->point = 0;
+          if (window->point < diff)
+            diff = window->point + 1;
+          
+          window->point -= diff;
+          count -= diff;
 
+          if (window->point < 0)
+            {
+              if (cursor_movement_scrolls_p
+                  && backward_move_node_structure (window,
+                                                   info_scroll_behaviour) == 0)
+                {
+                  window->point = window->node->nodelen - 1;
+                  if (window->line_count > window->height)
+                    set_window_pagetop (window,
+                                        window->line_count - window->height);
+                }
+              else
+                {
+                  window->point = 0;
+                  break;
+                }
+            }
+        }
       info_show_point (window);
     }
 }
@@ -739,8 +824,19 @@ DECLARE_INFO_COMMAND (info_forward_word, _("Move forward a word"))
   while (count)
     {
       if (point + 1 >= end)
-        return;
-
+        {
+          if (cursor_movement_scrolls_p
+              && forward_move_node_structure (window,
+                                              info_scroll_behaviour) == 0)
+            {
+              point = 0;
+              buffer = window->node->contents;
+              end = window->node->nodelen;
+            }
+          else
+            return;
+        }
+      
       /* If we are not in a word, move forward until we are in one.
          Then, move forward until we hit a non-alphabetic character. */
       c = buffer[point];
@@ -755,7 +851,20 @@ DECLARE_INFO_COMMAND (info_forward_word, _("Move forward a word"))
             }
         }
 
-      if (point >= end) return;
+      if (point >= end)
+        {
+          if (cursor_movement_scrolls_p
+              && forward_move_node_structure (window,
+                                              info_scroll_behaviour) == 0)
+            {
+              point = 0;
+              buffer = window->node->contents;
+              end = window->node->nodelen;
+            }
+          else
+            return;
+        }
+
 
       while (++point < end)
         {
@@ -787,8 +896,21 @@ DECLARE_INFO_COMMAND (info_backward_word, _("Move backward a word"))
   while (count)
     {
       if (point == 0)
-        break;
-
+        {
+          if (cursor_movement_scrolls_p
+              && backward_move_node_structure (window,
+                                               info_scroll_behaviour) == 0)
+            {
+              if (window->line_count > window->height)
+                set_window_pagetop (window,
+                                    window->line_count - window->height);
+              buffer = window->node->contents;
+              point = window->node->nodelen;
+            }
+          else
+            break;
+        }
+      
       /* Like info_forward_word (), except that we look at the
          characters just before point. */
 
@@ -836,64 +958,106 @@ char *info_scroll_choices[] = {
   "Continuous", "Next Only", "Page Only", (char *)NULL
 };
 
+/* Controls whether scroll-behavior affects line movement commands */
+int cursor_movement_scrolls_p = 1;
+
+/* Choices for the scroll-last-node variable */
+char *scroll_last_node_choices[] = {
+  "Stop", "Scroll", "Top", NULL
+};
+
+/* Controls what to do when a scrolling command is issued at the end of the
+   last node. */
+int scroll_last_node = SLN_Stop;
+
 /* Default window sizes for scrolling commands.  */
-int default_window_size = -1;	/* meaning 1 window-full */
-int default_scroll_size = -1;	/* meaning half screen size */
+int default_window_size = -1;   /* meaning 1 window-full */
+int default_scroll_size = -1;   /* meaning half screen size */
 
 #define INFO_LABEL_FOUND() \
   (info_parsed_nodename || (info_parsed_filename \
                             && !is_dir_name (info_parsed_filename)))
 
+static int
+last_node_p (NODE *node)
+{
+  info_next_label_of_node (node);
+  if (!INFO_LABEL_FOUND ())
+    {
+      info_up_label_of_node (node);
+      return !INFO_LABEL_FOUND () || strcmp (info_parsed_nodename, "Top") == 0;
+    }
+  return 0;
+}
+
 /* Move to 1st menu item, Next, Up/Next, or error in this window. */
-static void
+static int
 forward_move_node_structure (WINDOW *window, int behaviour)
 {
   switch (behaviour)
     {
     case IS_PageOnly:
-      info_error ((char *) msg_at_node_bottom, NULL, NULL);
-      break;
+      info_error (msg_at_node_bottom, NULL, NULL);
+      return 1;
 
     case IS_NextOnly:
       info_next_label_of_node (window->node);
       if (!info_parsed_nodename && !info_parsed_filename)
-        info_error ((char *) msg_no_pointer, (char *) _("Next"), NULL);
+        {
+          info_error (msg_no_pointer, (char *) _("Next"), NULL);
+          return 1;
+        }
       else
         {
-          window_message_in_echo_area ((char *) _("Following Next node..."),
-              NULL, NULL);
           info_handle_pointer ("Next", window);
         }
       break;
 
     case IS_Continuous:
       {
+        if (last_node_p (window->node))
+	  {
+	    switch (scroll_last_node)
+	      {
+	      case SLN_Stop:
+		info_error (_("No more nodes within this document."),
+			    NULL, NULL);
+		return 1;
+		
+	      case SLN_Scroll:
+		break;
+		
+	      case SLN_Top:
+		info_top_node (window, 1, 0);
+		return 0;
+		
+	      default:
+		abort ();
+	      }
+	  }
+	
         /* First things first.  If this node contains a menu, move down
            into the menu. */
-        {
-          REFERENCE **menu;
-
-          menu = info_menu_of_node (window->node);
+	{
+	  REFERENCE **menu;
 
-          if (menu)
-            {
-              info_free_references (menu);
-              window_message_in_echo_area ((char *) _("Selecting first menu item..."),
-                  NULL, NULL);
-              info_menu_digit (window, 1, '1');
-              return;
-            }
-        }
+	  menu = info_menu_of_node (window->node);
+	  
+	  if (menu)
+	    {
+	      info_free_references (menu);
+	      info_menu_digit (window, 1, '1');
+	      return 0;
+	    }
+	}
 
         /* Okay, this node does not contain a menu.  If it contains a
            "Next:" pointer, use that. */
         info_next_label_of_node (window->node);
         if (INFO_LABEL_FOUND ())
           {
-            window_message_in_echo_area ((char *) _("Selecting Next node..."),
-                NULL, NULL);
             info_handle_pointer ("Next", window);
-            return;
+            return 0;
           }
 
         /* Okay, there wasn't a "Next:" for this node.  Move "Up:" until we
@@ -960,12 +1124,8 @@ forward_move_node_structure (WINDOW *window, int behaviour)
 
                   /* This node has a "Next" pointer, and it is not the
                      same as the first menu item found in this node. */
-                  window_message_in_echo_area
-                    ((char *) _("Moving Up %d time(s), then Next."),
-                     (void *) (long) up_counter, NULL);
-
                   info_handle_pointer ("Next", window);
-                  return;
+                  return 0;
                 }
               else
                 {
@@ -985,34 +1145,37 @@ forward_move_node_structure (WINDOW *window, int behaviour)
                   window->point = info_win->points[old_current];
                   recalculate_line_starts (window);
                   window->flags |= W_UpdateWindow;
-                  info_error ((char *) _("No more nodes within this document."),
+                  info_error (_("No more nodes within this document."),
                       NULL, NULL);
+                  return 1;
                 }
             }
         }
         break;
       }
     }
+  return info_error_was_printed; /*FIXME*/
 }
 
 /* Move Prev, Up or error in WINDOW depending on BEHAVIOUR. */
-static void
+static int
 backward_move_node_structure (WINDOW *window, int behaviour)
 {
   switch (behaviour)
     {
     case IS_PageOnly:
-      info_error ((char *) msg_at_node_top, NULL, NULL);
-      break;
+      info_error (msg_at_node_top, NULL, NULL);
+      return 1;
 
     case IS_NextOnly:
       info_prev_label_of_node (window->node);
       if (!info_parsed_nodename && !info_parsed_filename)
-        info_error ((char *) _("No `Prev' for this node."), NULL, NULL);
+        {
+          info_error (_("No `Prev' for this node."), NULL, NULL);
+          return 1;
+        }
       else
         {
-          window_message_in_echo_area ((char *) _("Moving Prev in this window."),
-              NULL, NULL);
           info_handle_pointer ("Prev", window);
         }
       break;
@@ -1026,13 +1189,14 @@ backward_move_node_structure (WINDOW *window, int behaviour)
           info_up_label_of_node (window->node);
           if (!info_parsed_nodename && (!info_parsed_filename
                                         || is_dir_name (info_parsed_filename)))
-            info_error ((char *)
-                _("No `Prev' or `Up' for this node within this document."),
-                NULL, NULL);
+            {
+              info_error (
+                    _("No `Prev' or `Up' for this node within this document."),
+                          NULL, NULL);
+              return 1;
+            }
           else
             {
-              window_message_in_echo_area ((char *) _("Moving Up in this window."),
-                  NULL, NULL);
               info_handle_pointer ("Up", window);
             }
         }
@@ -1070,8 +1234,6 @@ backward_move_node_structure (WINDOW *window, int behaviour)
           /* Move to the previous node.  If this node now contains a menu,
              and we have not inhibited movement to it, move to the node
              corresponding to the last menu item. */
-          window_message_in_echo_area ((char *) _("Moving Prev in this window."),
-              NULL, NULL);
           info_handle_pointer ("Prev", window);
 
           if (!inhibit_menu_traversing)
@@ -1080,14 +1242,13 @@ backward_move_node_structure (WINDOW *window, int behaviour)
                      (menu = info_menu_of_node (window->node)))
                 {
                   info_free_references (menu);
-                  window_message_in_echo_area
-                    ((char *) _("Moving to `Prev's last menu item."), NULL, NULL);
                   info_menu_digit (window, 1, '0');
                 }
             }
         }
       break;
     }
+  return 0;
 }
 
 /* Move continuously forward through the node structure of this info file. */
@@ -1139,7 +1300,7 @@ _scroll_forward(WINDOW *window, int count, unsigned char key, int behaviour)
       /* Without an explicit numeric argument, scroll the bottom two
          lines to the top of this window,  Or, if at bottom of window,
          and the chosen behaviour is to scroll through nodes get the
-	 "Next" node for this window. */
+         "Next" node for this window. */
       if (default_window_size > 0)
         desired_top = window->pagetop + default_window_size;
       else if (!info_explicit_arg && count == 1)
@@ -1150,7 +1311,8 @@ _scroll_forward(WINDOW *window, int count, unsigned char key, int behaviour)
              another node, depending on BEHAVIOUR. */
           if (desired_top > window->line_count)
             {
-              forward_move_node_structure (window, behaviour);
+              if (forward_move_node_structure (window, behaviour))
+                info_end_of_node (window, 1, 0);
               return;
             }
         }
@@ -1178,16 +1340,20 @@ _scroll_backward(WINDOW *window, int count, unsigned char key, int behaviour)
 
       /* Without an explicit numeric argument, scroll the top two lines
          to the bottom of this window, or, depending on the selected
-	 behaviour, move to the previous, or Up'th node. */
+         behaviour, move to the previous, or Up'th node. */
       if (default_window_size > 0)
         desired_top = window->pagetop - default_window_size;
       else if (!info_explicit_arg && count == 1)
         {
-          desired_top = window->pagetop - (window->height - 2);
-
+	  desired_top = window->pagetop - (window->height - 2);
+	  
           if ((desired_top < 0) && (window->pagetop == 0))
             {
-              backward_move_node_structure (window, behaviour);
+              if ((backward_move_node_structure (window, behaviour) == 0)
+                  && (cursor_movement_scrolls_p))
+		info_end_of_node (window, 1, 0);
+              window->point = (window->line_starts[window->pagetop]
+                               - window->node->contents);
               return;
             }
         }
@@ -1198,6 +1364,8 @@ _scroll_backward(WINDOW *window, int count, unsigned char key, int behaviour)
         desired_top = 0;
 
       set_window_pagetop (window, desired_top);
+      window->point = (window->line_starts[window->pagetop]
+                       - window->node->contents);
     }
 }
 
@@ -1210,7 +1378,7 @@ DECLARE_INFO_COMMAND (info_scroll_forward, _("Scroll forward in this window"))
 /* Like info_scroll_forward, but sets default_window_size as a side
    effect.  */
 DECLARE_INFO_COMMAND (info_scroll_forward_set_window,
-		      _("Scroll forward in this window and set default window size"))
+                      _("Scroll forward in this window and set default window size"))
 {
   if (info_explicit_arg)
     default_window_size = count;
@@ -1226,7 +1394,7 @@ DECLARE_INFO_COMMAND (info_scroll_forward_page_only, _("Scroll forward in this w
 /* Like info_scroll_forward_page_only, but sets default_window_size as a side
    effect.  */
 DECLARE_INFO_COMMAND (info_scroll_forward_page_only_set_window,
-		      _("Scroll forward in this window staying within node and set default window size"))
+                      _("Scroll forward in this window staying within node and set default window size"))
 {
   if (info_explicit_arg)
     default_window_size = count;
@@ -1242,7 +1410,7 @@ DECLARE_INFO_COMMAND (info_scroll_backward, _("Scroll backward in this window"))
 /* Like info_scroll_backward, but sets default_window_size as a side
    effect.  */
 DECLARE_INFO_COMMAND (info_scroll_backward_set_window,
-		      _("Scroll backward in this window and set default window size"))
+                      _("Scroll backward in this window and set default window size"))
 {
   if (info_explicit_arg)
     default_window_size = count;
@@ -1259,7 +1427,7 @@ DECLARE_INFO_COMMAND (info_scroll_backward_page_only, _("Scroll backward in this
 /* Like info_scroll_backward_page_only, but sets default_window_size as a side
    effect.  */
 DECLARE_INFO_COMMAND (info_scroll_backward_page_only_set_window,
-		      _("Scroll backward in this window staying within node and set default window size"))
+                      _("Scroll backward in this window staying within node and set default window size"))
 {
   if (info_explicit_arg)
     default_window_size = count;
@@ -1290,10 +1458,10 @@ DECLARE_INFO_COMMAND (info_down_line, _("Scroll down by lines"))
       int desired_top = window->pagetop + count;
 
       if (desired_top >= window->line_count)
-	desired_top = window->line_count - 2;
+        desired_top = window->line_count - 2;
 
       if (window->pagetop <= desired_top)
-	set_window_pagetop (window, desired_top);
+        set_window_pagetop (window, desired_top);
     }
 }
 
@@ -1307,7 +1475,7 @@ DECLARE_INFO_COMMAND (info_up_line, _("Scroll up by lines"))
       int desired_top = window->pagetop - count;
 
       if (desired_top < 0)
-	desired_top = 0;
+        desired_top = 0;
 
       set_window_pagetop (window, desired_top);
     }
@@ -1316,7 +1484,7 @@ DECLARE_INFO_COMMAND (info_up_line, _("Scroll up by lines"))
 /* Scroll the window forward by N lines and remember N as default for
    subsequent commands.  */
 DECLARE_INFO_COMMAND (info_scroll_half_screen_down,
-		      _("Scroll down by half screen size"))
+                      _("Scroll down by half screen size"))
 {
   if (count < 0)
     info_scroll_half_screen_up (window, -count, key);
@@ -1326,23 +1494,23 @@ DECLARE_INFO_COMMAND (info_scroll_half_screen_down,
       int desired_top;
 
       if (info_explicit_arg)
-	default_scroll_size = count;
+        default_scroll_size = count;
       if (default_scroll_size > 0)
-	scroll_size = default_scroll_size;
+        scroll_size = default_scroll_size;
 
       desired_top = window->pagetop + scroll_size;
       if (desired_top >= window->line_count)
-	desired_top = window->line_count - 2;
+        desired_top = window->line_count - 2;
 
       if (window->pagetop <= desired_top)
-	set_window_pagetop (window, desired_top);
+        set_window_pagetop (window, desired_top);
     }
 }
 
 /* Scroll the window backward by N lines and remember N as default for
    subsequent commands.  */
 DECLARE_INFO_COMMAND (info_scroll_half_screen_up,
-		      _("Scroll up by half screen size"))
+                      _("Scroll up by half screen size"))
 {
   if (count < 0)
     info_scroll_half_screen_down (window, -count, key);
@@ -1352,13 +1520,13 @@ DECLARE_INFO_COMMAND (info_scroll_half_screen_up,
       int desired_top;
 
       if (info_explicit_arg)
-	default_scroll_size = count;
+        default_scroll_size = count;
       if (default_scroll_size > 0)
-	scroll_size = default_scroll_size;
+        scroll_size = default_scroll_size;
 
       desired_top = window->pagetop - scroll_size;
       if (desired_top < 0)
-	desired_top = 0;
+        desired_top = 0;
 
       set_window_pagetop (window, desired_top);
     }
@@ -1382,7 +1550,7 @@ DECLARE_INFO_COMMAND (info_next_window, _("Select the next window"))
   /* If no other window, error now. */
   if (!windows->next && !echo_area_is_active)
     {
-      info_error ((char *) msg_one_window, NULL, NULL);
+      info_error (msg_one_window, NULL, NULL);
       return;
     }
 
@@ -1422,7 +1590,7 @@ DECLARE_INFO_COMMAND (info_prev_window, _("Select the previous window"))
 
   if (!windows->next && !echo_area_is_active)
     {
-      info_error ((char *) msg_one_window, NULL, NULL);
+      info_error (msg_one_window, NULL, NULL);
       return;
     }
 
@@ -1478,7 +1646,7 @@ DECLARE_INFO_COMMAND (info_split_window, _("Split the current window"))
 
   if (!split)
     {
-      info_error ((char *) msg_win_too_small, NULL, NULL);
+      info_error (msg_win_too_small, NULL, NULL);
     }
   else
     {
@@ -1546,11 +1714,11 @@ DECLARE_INFO_COMMAND (info_delete_window, _("Delete the current window"))
 {
   if (!windows->next)
     {
-      info_error ((char *) msg_cant_kill_last, NULL, NULL);
+      info_error (msg_cant_kill_last, NULL, NULL);
     }
   else if (window->flags & W_WindowIsPerm)
     {
-      info_error ((char *) _("Cannot delete a permanent window"), NULL, NULL);
+      info_error (_("Cannot delete a permanent window"), NULL, NULL);
     }
   else
     {
@@ -1635,7 +1803,7 @@ DECLARE_INFO_COMMAND (info_scroll_other_window, _("Scroll the other window"))
   /* If only one window, give up. */
   if (!windows->next)
     {
-      info_error ((char *) msg_one_window, NULL, NULL);
+      info_error (msg_one_window, NULL, NULL);
       return;
     }
 
@@ -1677,6 +1845,17 @@ DECLARE_INFO_COMMAND (info_toggle_wrap,
 {
   window_toggle_wrap (window);
 }
+
+/* Toggle the usage of regular expressions in searches. */
+DECLARE_INFO_COMMAND (info_toggle_regexp,
+              _("Toggle the usage of regular expressions in searches"))
+{
+  use_regex = 1 - use_regex;
+  window_message_in_echo_area (use_regex
+                               ? _("Using regular expressions for searches.")
+                               : _("Using literal strings for searches."),
+                               NULL, NULL);
+}
 
 /* **************************************************************** */
 /*                                                                  */
@@ -1755,7 +1934,7 @@ info_select_reference (WINDOW *window, REFERENCE *entry)
       if (file_system_error)
         info_error (file_system_error, NULL, NULL);
       else
-        info_error ((char *) msg_cant_find_node, nodename, NULL);
+        info_error (msg_cant_find_node, nodename, NULL);
     }
 
   maybe_free (file_system_error);
@@ -1831,7 +2010,7 @@ info_handle_pointer (char *label, WINDOW *window)
           if (info_recent_file_error)
             info_error (info_recent_file_error, NULL, NULL);
           else
-            info_error ((char *) msg_cant_file_node, filename, nodename);
+            info_error (msg_cant_file_node, filename, nodename);
         }
 
       free (filename);
@@ -1839,7 +2018,7 @@ info_handle_pointer (char *label, WINDOW *window)
     }
   else
     {
-      info_error ((char *) msg_no_pointer, label, NULL);
+      info_error (msg_no_pointer, label, NULL);
     }
 }
 
@@ -1895,7 +2074,7 @@ DECLARE_INFO_COMMAND (info_last_node, _("Select the last node in this file"))
     }
 
   if (!node)
-    info_error ((char *) _("This window has no additional nodes"), NULL, NULL);
+    info_error (_("This window has no additional nodes"), NULL, NULL);
   else
     info_set_node_of_window (1, window, node);
 }
@@ -1928,7 +2107,7 @@ DECLARE_INFO_COMMAND (info_first_node, _("Select the first node in this file"))
     }
 
   if (!node)
-    info_error ((char *) _("This window has no additional nodes"), NULL, NULL);
+    info_error (_("This window has no additional nodes"), NULL, NULL);
   else
     info_set_node_of_window (1, window, node);
 }
@@ -1950,7 +2129,7 @@ DECLARE_INFO_COMMAND (info_menu_digit, _("Select this menu item"))
 
   if (!menu)
     {
-      info_error ((char *) msg_no_menu_node, NULL, NULL);
+      info_error (msg_no_menu_node, NULL, NULL);
       return;
     }
 
@@ -1974,7 +2153,7 @@ DECLARE_INFO_COMMAND (info_menu_digit, _("Select this menu item"))
         info_next_line (window, menu[i]->line_number - 1, key);
     }
   else
-    info_error ((char *) _("There aren't %d items in this menu."),
+    info_error (_("There aren't %d items in this menu."),
                 (void *) (long) item, NULL);
 
   info_free_references (menu);
@@ -2063,9 +2242,9 @@ info_menu_or_ref_item (WINDOW *window, int count,
   if (!menu)
     {
       if (builder == info_menu_of_node)
-        info_error ((char *) msg_no_menu_node, NULL, NULL);
+        info_error (msg_no_menu_node, NULL, NULL);
       else
-        info_error ((char *) msg_no_xref_node, NULL, NULL);
+        info_error (msg_no_xref_node, NULL, NULL);
       return;
     }
 
@@ -2132,13 +2311,13 @@ info_menu_or_ref_item (WINDOW *window, int count,
                         else if (window->point < refs[which]->start)
                           break;
                       }
-		    if (which > 0)
-		      {
-			if (closest == -1)
-			  which--;
-			else
-			  which = closest;
-		      }
+                    if (which > 0)
+                      {
+                        if (closest == -1)
+                          which--;
+                        else
+                          which = closest;
+                      }
                   }
 
                 defentry = (REFERENCE *)xmalloc (sizeof (REFERENCE));
@@ -2166,24 +2345,24 @@ info_menu_or_ref_item (WINDOW *window, int count,
       if (builder == info_menu_of_node)
         {
           if (defentry)
-	    {
-	      prompt = xmalloc (strlen (defentry->label)
-				+ strlen (_("Menu item (%s): ")));
-	      sprintf (prompt, _("Menu item (%s): "), defentry->label);
-	    }
+            {
+              prompt = xmalloc (strlen (defentry->label)
+                                + strlen (_("Menu item (%s): ")));
+              sprintf (prompt, _("Menu item (%s): "), defentry->label);
+            }
           else
-	    prompt = xstrdup (_("Menu item: "));
+            prompt = xstrdup (_("Menu item: "));
         }
       else
         {
           if (defentry)
-	    {
-	      prompt = xmalloc (strlen (defentry->label)
-				+ strlen (_("Follow xref (%s): ")));
-	      sprintf (prompt, _("Follow xref (%s): "), defentry->label);
-	    }
+            {
+              prompt = xmalloc (strlen (defentry->label)
+                                + strlen (_("Follow xref (%s): ")));
+              sprintf (prompt, _("Follow xref (%s): "), defentry->label);
+            }
           else
-	    prompt = xstrdup (_("Follow xref: "));
+            prompt = xstrdup (_("Follow xref: "));
         }
 
       line = info_read_completing_in_echo_area (window, prompt, menu);
@@ -2239,9 +2418,9 @@ info_menu_or_ref_item (WINDOW *window, int count,
 
           for (i = 0; menu && (ref = menu[i]); i++)
             {
-              /* Need to use strcasecmp because LINE is downcased
+              /* Need to use mbscasecmp because LINE is downcased
                  inside info_read_completing_in_echo_area.  */
-              if (strcasecmp (line, ref->label) == 0)
+              if (mbscasecmp (line, ref->label) == 0)
                 {
                   /* ref->end is more accurate estimate of position
                      for menus than ref->start.  Go figure.  */
@@ -2261,7 +2440,7 @@ info_menu_or_ref_item (WINDOW *window, int count,
         }
 
       if (!entry && defentry)
-        info_error ((char *) _("The reference disappeared! (%s)."), line, NULL);
+        info_error (_("The reference disappeared! (%s)."), line, NULL);
       else
         {
           NODE *orig = window->node;
@@ -2339,7 +2518,7 @@ DECLARE_INFO_COMMAND (info_find_menu, _("Move to the start of this node's menu")
   position = search (INFO_MENU_LABEL, &binding);
 
   if (position == -1)
-    info_error ((char *) msg_no_menu_node, NULL, NULL);
+    info_error (msg_no_menu_node, NULL, NULL);
   else
     {
       window->point = position;
@@ -2358,7 +2537,7 @@ DECLARE_INFO_COMMAND (info_visit_menu,
   menu = info_menu_of_node (window->node);
 
   if (!menu)
-    info_error ((char *) msg_no_menu_node, NULL, NULL);
+    info_error (msg_no_menu_node, NULL, NULL);
 
   for (i = 0; (!info_error_was_printed) && (entry = menu[i]); i++)
     {
@@ -2368,7 +2547,7 @@ DECLARE_INFO_COMMAND (info_visit_menu,
       window_tile_windows (TILE_INTERNALS);
 
       if (!new)
-        info_error ((char *) msg_win_too_small, NULL, NULL);
+        info_error (msg_win_too_small, NULL, NULL);
       else
         {
           active_window = new;
@@ -2417,28 +2596,28 @@ DECLARE_INFO_COMMAND (info_goto_node, _("Read a node name and select it"))
               {
                 entry = (REFERENCE *)xmalloc (sizeof (REFERENCE));
                 entry->filename = entry->nodename = (char *)NULL;
-		if (this_is_the_current_fb)
-		  entry->label = xstrdup (fb->tags[i]->nodename);
-		else
-		  {
-		    entry->label = (char *) xmalloc
-		      (4 + strlen (fb->filename) +
-		       strlen (fb->tags[i]->nodename));
-		    sprintf (entry->label, "(%s)%s",
-			     fb->filename, fb->tags[i]->nodename);
-		  }
+                if (this_is_the_current_fb)
+                  entry->label = xstrdup (fb->tags[i]->nodename);
+                else
+                  {
+                    entry->label = (char *) xmalloc
+                      (4 + strlen (fb->filename) +
+                       strlen (fb->tags[i]->nodename));
+                    sprintf (entry->label, "(%s)%s",
+                             fb->filename, fb->tags[i]->nodename);
+                  }
 
                 add_pointer_to_array
                   (entry, items_index, items, items_slots, 100, REFERENCE *);
               }
           }
       }
-    line = info_read_maybe_completing (window, (char *) _("Goto node: "),
+    line = info_read_maybe_completing (window, _("Goto node: "),
         items);
     info_free_references (items);
   }
 #else /* !GOTO_COMPLETES */
-  line = info_read_in_echo_area (window, (char *) _("Goto node: "));
+  line = info_read_in_echo_area (window, _("Goto node: "));
 #endif /* !GOTO_COMPLETES */
 
   /* If the user aborted, quit now. */
@@ -2480,11 +2659,11 @@ info_follow_menus (NODE *initial_node, char **menus,
       char *arg = *menus; /* Remember the name of the menu entry we want. */
 
       /* A leading space is certainly NOT part of a node name.  Most
-	 probably, they typed a space after the separating comma.  The
-	 strings in menus[] have their whitespace canonicalized, so
-	 there's at most one space to ignore.  */
+         probably, they typed a space after the separating comma.  The
+         strings in menus[] have their whitespace canonicalized, so
+         there's at most one space to ignore.  */
       if (*arg == ' ')
-	arg++;
+        arg++;
       if (!first_arg)
         first_arg = arg;
 
@@ -2519,11 +2698,11 @@ info_follow_menus (NODE *initial_node, char **menus,
 
           for (i = 0; (entry = menu[i]); i++)
             {
-              if (strcasecmp (entry->label, arg) == 0)
+              if (mbscasecmp (entry->label, arg) == 0)
                 break;
               else
                 if ((best_guess == -1)
-                    && (strncasecmp (entry->label, arg, strlen (arg)) == 0))
+                    && (mbsncasecmp (entry->label, arg, strlen (arg)) == 0))
                   best_guess = i;
             }
 
@@ -2537,12 +2716,12 @@ info_follow_menus (NODE *initial_node, char **menus,
         {
           if (arg == first_arg)
             {
-	      /* Maybe they typed "info foo" instead of "info -f foo".  */
-	      node = info_get_node (first_arg, 0);
-	      if (node)
-		add_file_directory_to_path (first_arg);
-	      else
-		node = make_manpage_node (first_arg);
+              /* Maybe they typed "info foo" instead of "info -f foo".  */
+              node = info_get_node (first_arg, 0);
+              if (node)
+                add_file_directory_to_path (first_arg);
+              else
+                node = make_manpage_node (first_arg);
               if (node)
                 goto maybe_got_node;
             }
@@ -2563,11 +2742,11 @@ info_follow_menus (NODE *initial_node, char **menus,
       /* Try to find this node.  */
       node = info_get_node (entry->filename, entry->nodename);
       if (!node && arg == first_arg)
-	{
-	  node = make_manpage_node (first_arg);
-	  if (node)
-	    goto maybe_got_node;
-	}
+        {
+          node = make_manpage_node (first_arg);
+          if (node)
+            goto maybe_got_node;
+        }
 
       /* Since we cannot find it, try using the label of the entry as a
          file, i.e., "(LABEL)Top".  */
@@ -2612,7 +2791,7 @@ split_list_of_nodenames (char *str)
     {
       if (*str == ',')
         {
-          *str++ = 0;		/* get past the null byte */
+          *str++ = 0;           /* get past the null byte */
           len++;
           nodes = xrealloc (nodes, len * sizeof (char *));
           nodes[len - 2] = str;
@@ -2630,7 +2809,7 @@ split_list_of_nodenames (char *str)
 DECLARE_INFO_COMMAND (info_menu_sequence,
    _("Read a list of menus starting from dir and follow them"))
 {
-  char *line = info_read_in_echo_area (window, (char *) _("Follow menus: "));
+  char *line = info_read_in_echo_area (window, _("Follow menus: "));
 
   /* If the user aborted, quit now. */
   if (!line)
@@ -2650,28 +2829,28 @@ DECLARE_INFO_COMMAND (info_menu_sequence,
       NODE *node = NULL;
 
       /* If DIR_NODE is NULL, they might be reading a file directly,
-	 like in "info -d . -f ./foo".  Try using "Top" instead.  */
+         like in "info -d . -f ./foo".  Try using "Top" instead.  */
       if (!dir_node)
-	{
-	  char *file_name = window->node->parent;
+        {
+          char *file_name = window->node->parent;
 
-	  if (!file_name)
-	    file_name = window->node->filename;
-	  dir_node = info_get_node (file_name, NULL);
-	}
+          if (!file_name)
+            file_name = window->node->filename;
+          dir_node = info_get_node (file_name, NULL);
+        }
 
       /* If we still cannot find the starting point, give up.
-	 We cannot allow a NULL pointer inside info_follow_menus.  */
+         We cannot allow a NULL pointer inside info_follow_menus.  */
       if (!dir_node)
-	info_error ((char *) msg_cant_find_node, "Top", NULL);
+        info_error (msg_cant_find_node, "Top", NULL);
       else
-	node = info_follow_menus (dir_node, nodes, &errstr, &errarg1, &errarg2);
+        node = info_follow_menus (dir_node, nodes, &errstr, &errarg1, &errarg2);
 
       free (nodes);
       if (!errstr)
         info_set_node_of_window (1, window, node);
       else
-        info_error ((char *) errstr, errarg1, errarg2);
+        info_error (errstr, errarg1, errarg2);
     }
 
   free (line);
@@ -2699,16 +2878,16 @@ entry_in_menu (char *arg, REFERENCE **menu, int exact)
       int best_guess = -1;
 
       for (i = 0; (entry = menu[i]); i++)
-	{
-	  if (strcasecmp (entry->label, arg) == 0)
-	    break;
-	  else
-	    if (strncasecmp (entry->label, arg, strlen (arg)) == 0)
-	      best_guess = i;
-	}
+        {
+          if (mbscasecmp (entry->label, arg) == 0)
+            break;
+          else
+            if (mbsncasecmp (entry->label, arg, strlen (arg)) == 0)
+              best_guess = i;
+        }
 
       if (!entry && best_guess != -1)
-	entry = menu[best_guess];
+        entry = menu[best_guess];
     }
 
   return entry;
@@ -2729,18 +2908,18 @@ info_intuit_options_node (WINDOW *window, NODE *initial_node, char *program)
   static const char *invocation_nodes[] = {
     "%s invocation",
     "Invoking %s",
-    "Preliminaries",	/* m4 has Invoking under Preliminaries! */
+    "Preliminaries",    /* m4 has Invoking under Preliminaries! */
     "Invocation",
     "Command Arguments",/* Emacs */
     "Invoking `%s'",
     "%s options",
     "Options",
-    "Option ",		/* e.g. "Option Summary" */
+    "Option ",          /* e.g. "Option Summary" */
     "Invoking",
-    "All options",	/* tar, paxutils */
+    "All options",      /* tar, paxutils */
     "Arguments",
-    "%s cmdline",	/* ar */
-    "%s",		/* last resort */
+    "%s cmdline",       /* ar */
+    "%s",               /* last resort */
     (const char *)0
   };
   NODE *node = NULL;
@@ -2759,37 +2938,37 @@ info_intuit_options_node (WINDOW *window, NODE *initial_node, char *program)
       menu = info_menu_of_node (initial_node);
 
       /* If no menu item in this node, stop here.  Perhaps this node
-	 is the one they need.  */
+         is the one they need.  */
       if (!menu)
-	break;
+        break;
 
       /* Look for node names typical for usage nodes in this menu.  */
       for (try_node = invocation_nodes; *try_node; try_node++)
-	{
-	  char *nodename;
+        {
+          char *nodename;
 
-	  nodename = xmalloc (strlen (program) + strlen (*try_node));
-	  sprintf (nodename, *try_node, program);
-	  /* The last resort "%s" is dangerous, so we restrict it
+          nodename = xmalloc (strlen (program) + strlen (*try_node));
+          sprintf (nodename, *try_node, program);
+          /* The last resort "%s" is dangerous, so we restrict it
              to exact matches here.  */
-	  entry = entry_in_menu (nodename, menu,
-				 strcmp (*try_node, "%s") == 0);
-	  free (nodename);
-	  if (entry)
-	    break;
-	}
+          entry = entry_in_menu (nodename, menu,
+                                 strcmp (*try_node, "%s") == 0);
+          free (nodename);
+          if (entry)
+            break;
+        }
 
       if (!entry)
-	break;
+        break;
 
       if (!entry->filename)
-	entry->filename = xstrdup (initial_node->parent ? initial_node->parent
-				   : initial_node->filename);
+        entry->filename = xstrdup (initial_node->parent ? initial_node->parent
+                                   : initial_node->filename);
       /* Try to find this node.  */
       node = info_get_node (entry->filename, entry->nodename);
       info_free_references (menu);
       if (!node)
-	break;
+        break;
     }
 
   /* We've got our best shot at the invocation node.  Now select it.  */
@@ -2809,21 +2988,21 @@ program_name_from_file_name (char *file_name)
 
   for (i = strlen (program_name) - 1; i > 0; i--)
     if (program_name[i] == '.'
-	&& (FILENAME_CMPN (program_name + i, ".info", 5) == 0
-	    || FILENAME_CMPN (program_name + i, ".inf", 4) == 0
+        && (FILENAME_CMPN (program_name + i, ".info", 5) == 0
+            || FILENAME_CMPN (program_name + i, ".inf", 4) == 0
 #ifdef __MSDOS__
-	    || FILENAME_CMPN (program_name + i, ".i", 2) == 0
+            || FILENAME_CMPN (program_name + i, ".i", 2) == 0
 #endif
-	    || isdigit (program_name[i + 1]))) /* a man page foo.1 */
+            || isdigit (program_name[i + 1]))) /* a man page foo.1 */
       {
-	program_name[i] = 0;
-	break;
+        program_name[i] = 0;
+        break;
       }
   return program_name;
 }
 
 DECLARE_INFO_COMMAND (info_goto_invocation_node,
-		      _("Find the node describing program invocation"))
+                      _("Find the node describing program invocation"))
 {
   const char *invocation_prompt = _("Find Invocation node of [%s]: ");
   char *program_name, *line;
@@ -2833,11 +3012,11 @@ DECLARE_INFO_COMMAND (info_goto_invocation_node,
   /* Intuit the name of the program they are likely to want.
      We use the file name of the current Info file as a hint.  */
   file_name = window->node->parent ? window->node->parent
-				   : window->node->filename;
+                                   : window->node->filename;
   default_program_name = program_name_from_file_name (file_name);
 
   prompt = (char *)xmalloc (strlen (default_program_name) +
-			    strlen (invocation_prompt));
+                            strlen (invocation_prompt));
   sprintf (prompt, invocation_prompt, default_program_name);
   line = info_read_in_echo_area (window, prompt);
   free (prompt);
@@ -2855,7 +3034,7 @@ DECLARE_INFO_COMMAND (info_goto_invocation_node,
      from the Top node.  */
   top_node = info_get_node (file_name, NULL);
   if (!top_node)
-    info_error ((char *) msg_cant_find_node, "Top", NULL);
+    info_error (msg_cant_find_node, "Top", NULL);
 
   info_intuit_options_node (window, top_node, program_name);
   free (line);
@@ -2867,7 +3046,7 @@ DECLARE_INFO_COMMAND (info_man, _("Read a manpage reference and select it"))
 {
   char *line;
 
-  line = info_read_in_echo_area (window, (char *) _("Get Manpage: "));
+  line = info_read_in_echo_area (window, _("Get Manpage: "));
 
   if (!line)
     {
@@ -2968,13 +3147,13 @@ kill_node (WINDOW *window, char *nodename)
   /* If there is a nodename, find it in our window list. */
   for (iw = 0; (info_win = info_windows[iw]); iw++)
     if (strcmp (nodename, info_win->nodes[info_win->current]->nodename) == 0
-	&& info_win->window == window)
+        && info_win->window == window)
       break;
 
   if (!info_win)
     {
       if (*nodename)
-        info_error ((char *) _("Cannot kill node `%s'"), nodename, NULL);
+        info_error (_("Cannot kill node `%s'"), nodename, NULL);
       else
         window_clear_echo_area ();
 
@@ -2984,7 +3163,7 @@ kill_node (WINDOW *window, char *nodename)
   /* If there are no more nodes left anywhere to view, complain and exit. */
   if (info_windows_index == 1 && info_windows[0]->nodes_index == 1)
     {
-      info_error ((char *) _("Cannot kill the last node"), NULL, NULL);
+      info_error (_("Cannot kill the last node"), NULL, NULL);
       return;
     }
 
@@ -3088,7 +3267,7 @@ DECLARE_INFO_COMMAND (info_view_file, _("Read the name of a file and select it")
 {
   char *line;
 
-  line = info_read_in_echo_area (window, (char *) _("Find file: "));
+  line = info_read_in_echo_area (window, _("Find file: "));
   if (!line)
     {
       info_abort_key (active_window, 1, 0);
@@ -3105,7 +3284,7 @@ DECLARE_INFO_COMMAND (info_view_file, _("Read the name of a file and select it")
           if (info_recent_file_error)
             info_error (info_recent_file_error, NULL, NULL);
           else
-            info_error ((char *) _("Cannot find `%s'."), line, NULL);
+            info_error (_("Cannot find `%s'."), line, NULL);
         }
       else
         info_set_node_of_window (1, window, node);
@@ -3148,7 +3327,7 @@ dump_nodes_to_file (char *filename, char **nodenames,
 
   if (!output_stream)
     {
-      info_error ((char *) _("Could not create output file `%s'."),
+      info_error (_("Could not create output file `%s'."),
           output_filename, NULL);
       return;
     }
@@ -3162,7 +3341,7 @@ dump_nodes_to_file (char *filename, char **nodenames,
     fclose (output_stream);
 
 #if defined (VERBOSE_NODE_DUMPING)
-  info_error ((char *) _("Done."), NULL, NULL);
+  info_error (_("Done."), NULL, NULL);
 #endif /* VERBOSE_NODE_DUMPING */
 }
 
@@ -3196,11 +3375,11 @@ dump_node_to_stream (char *filename, char *nodename,
       else
         {
           if (filename && *nodename != '(')
-            info_error ((char *) msg_cant_file_node,
+            info_error (msg_cant_file_node,
                 filename_non_directory (filename),
                 nodename);
           else
-            info_error ((char *) msg_cant_find_node, nodename, NULL);
+            info_error (msg_cant_find_node, nodename, NULL);
         }
       return;
     }
@@ -3217,7 +3396,7 @@ dump_node_to_stream (char *filename, char *nodename,
 
 #if defined (VERBOSE_NODE_DUMPING)
   /* Maybe we should print some information about the node being output. */
-  info_error ((char *) _("Writing node %s..."), node_printed_rep (node), NULL);
+  info_error (_("Writing node %s..."), node_printed_rep (node), NULL);
 #endif /* VERBOSE_NODE_DUMPING */
 
   write_node_to_stream (node, stream);
@@ -3266,7 +3445,7 @@ dump_node_to_file (NODE *node, char *filename, int dump_subnodes)
 
   if (!output_stream)
     {
-      info_error ((char *) _("Could not create output file `%s'."), filename,
+      info_error (_("Could not create output file `%s'."), filename,
           NULL);
       return;
     }
@@ -3284,7 +3463,7 @@ dump_node_to_file (NODE *node, char *filename, int dump_subnodes)
     fclose (output_stream);
 
 #if defined (VERBOSE_NODE_DUMPING)
-  info_error ((char *) _("Done."), NULL, NULL);
+  info_error (_("Done."), NULL, NULL);
 #endif /* VERBOSE_NODE_DUMPING */
 }
 
@@ -3328,13 +3507,13 @@ print_node (NODE *node)
 
   if (!printer_pipe)
     {
-      info_error ((char *) _("Cannot open pipe to `%s'."), print_command, NULL);
+      info_error (_("Cannot open pipe to `%s'."), print_command, NULL);
       return;
     }
 
 #if defined (VERBOSE_NODE_DUMPING)
   /* Maybe we should print some information about the node being output. */
-  info_error ((char *) _("Printing node %s..."), node_printed_rep (node), NULL);
+  info_error (_("Printing node %s..."), node_printed_rep (node), NULL);
 #endif /* VERBOSE_NODE_DUMPING */
 
   write_node_to_stream (node, printer_pipe);
@@ -3344,7 +3523,7 @@ print_node (NODE *node)
     fclose (printer_pipe);
 
 #if defined (VERBOSE_NODE_DUMPING)
-  info_error ((char *) _("Done."), NULL, NULL);
+  info_error (_("Done."), NULL, NULL);
 #endif /* VERBOSE_NODE_DUMPING */
 }
 
@@ -3427,7 +3606,9 @@ info_search_in_node (char *string, NODE *node, long int start,
   if (isearch_is_active)
     binding.flags |= S_SkipDest;
 
-  offset = search (string, &binding);
+  offset = (use_regex ? 
+            regexp_search (string, &binding, node->nodelen):
+            search (string, &binding));
 
   if (offset != -1 && window)
     {
@@ -3517,6 +3698,7 @@ info_search_internal (char *string, WINDOW *window,
       register int current_tag = 0, number_of_tags;
       char *last_subfile;
       TAG *tag;
+      char *msg = NULL;
 
       /* Find number of tags and current tag. */
       last_subfile = (char *)NULL;
@@ -3539,7 +3721,7 @@ info_search_internal (char *string, WINDOW *window,
       while (1)
         {
           NODE *node;
-
+	  
           /* Allow C-g to quit the search, failing it if pressed. */
           return_if_control_g (-1);
 
@@ -3547,10 +3729,16 @@ info_search_internal (char *string, WINDOW *window,
           for (i = current_tag + dir; i != current_tag; i += dir)
             {
               if (i < 0)
-                i = number_of_tags - 1;
+		{
+		  msg = N_("Search continued from the end of the document.");
+		  i = number_of_tags - 1;
+		}
               else if (i == number_of_tags)
-                i = 0;
-
+		{
+		  msg = N_("Search continued from the beginning of the document.");
+		  i = 0;
+		}
+	      
               tag = file_buffer->tags[i];
               if (tag->nodelen != 0)
                 break;
@@ -3564,7 +3752,7 @@ info_search_internal (char *string, WINDOW *window,
           if (!echo_area_is_active && (last_subfile != tag->filename))
             {
               window_message_in_echo_area
-                ((char *) _("Searching subfile %s ..."),
+                (_("Searching subfile %s ..."),
                  filename_non_directory (tag->filename), NULL);
 
               last_subfile = tag->filename;
@@ -3580,7 +3768,7 @@ info_search_internal (char *string, WINDOW *window,
                   if (info_recent_file_error)
                     info_error (info_recent_file_error, NULL, NULL);
                   else
-                    info_error ((char *) msg_cant_file_node,
+                    info_error (msg_cant_file_node,
                                 filename_non_directory (file_buffer->filename),
                                 tag->nodename);
                 }
@@ -3600,7 +3788,12 @@ info_search_internal (char *string, WINDOW *window,
               /* Yes!  We win. */
               remember_window_and_node (window, node);
               if (!echo_area_is_active)
-                window_clear_echo_area ();
+		{
+		  if (msg)
+		    window_message_in_echo_area ("%s", gettext (msg), NULL);
+		  else
+		    window_clear_echo_area ();
+		}
               return (0);
             }
 
@@ -3631,7 +3824,7 @@ DECLARE_INFO_COMMAND (info_search, _("Read a string and search for it"))
 }
 
 DECLARE_INFO_COMMAND (info_search_backward,
-		      _("Read a string and search backward for it"))
+                      _("Read a string and search backward for it"))
 {
   last_search_direction = count > 0 ? -1 : 1;
   last_search_case_sensitive = 0;
@@ -3655,7 +3848,7 @@ info_search_1 (WINDOW *window, int count, unsigned char key,
     {
       direction = 1;
       if (count == 0)
-        count = 1;	/* for backward compatibility */
+        count = 1;      /* for backward compatibility */
     }
 
   /* Read a string from the user, defaulting the search to SEARCH_STRING. */
@@ -3667,16 +3860,16 @@ info_search_1 (WINDOW *window, int count, unsigned char key,
 
   if (ask_for_string)
     {
-      prompt = (char *)xmalloc (strlen (_("%s%sfor string [%s]: "))
-				+ strlen (_("Search backward"))
-				+ strlen (_("Search"))
-				+ strlen (_(" case-sensitively "))
-				+ strlen (_(" "))
-				+ strlen (search_string));
+      prompt = (char *)xmalloc (strlen (_("%s%s%s [%s]: "))
+                                + strlen (_("Regexp search"))
+                                + strlen (_(" case-sensitively"))
+                                + strlen (_(" backward"))
+                                + strlen (search_string));
 
-      sprintf (prompt, _("%s%sfor string [%s]: "),
-               direction < 0 ? _("Search backward") : _("Search"),
-               case_sensitive ? _(" case-sensitively ") : _(" "),
+      sprintf (prompt, _("%s%s%s [%s]: "),
+               use_regex ? _("Regexp search") : _("Search"),
+               case_sensitive ? _(" case-sensitively") : "",
+               direction < 0 ? _(" backward") : "",
                search_string);
 
       line = info_read_in_echo_area (window, prompt);
@@ -3715,7 +3908,7 @@ info_search_1 (WINDOW *window, int count, unsigned char key,
                                    active_window, direction, case_sensitive);
 
   if (result != 0 && !info_error_was_printed)
-    info_error ((char *) _("Search failed."), NULL, NULL);
+    info_error (_("Search failed."), NULL, NULL);
   else if (old_pagetop != active_window->pagetop)
     {
       int new_pagetop;
@@ -3733,23 +3926,23 @@ info_search_1 (WINDOW *window, int count, unsigned char key,
 }
 
 DECLARE_INFO_COMMAND (info_search_next,
-		      _("Repeat last search in the same direction"))
+                      _("Repeat last search in the same direction"))
 {
   if (!last_search_direction)
-    info_error ((char *) _("No previous search string"), NULL, NULL);
+    info_error (_("No previous search string"), NULL, NULL);
   else
     info_search_1 (window, last_search_direction * count,
-		   key, last_search_case_sensitive, 0);
+                   key, last_search_case_sensitive, 0);
 }
 
 DECLARE_INFO_COMMAND (info_search_previous,
-		      _("Repeat last search in the reverse direction"))
+                      _("Repeat last search in the reverse direction"))
 {
   if (!last_search_direction)
-    info_error ((char *) _("No previous search string"), NULL, NULL);
+    info_error (_("No previous search string"), NULL, NULL);
   else
     info_search_1 (window, -last_search_direction * count,
-		   key, last_search_case_sensitive, 0);
+                   key, last_search_case_sensitive, 0);
 }
 
 /* **************************************************************** */
@@ -3848,9 +4041,11 @@ show_isearch_prompt (int dir, unsigned char *string, int failing_p)
   unsigned int prompt_len, p_rep_index, p_rep_size;
 
   if (dir < 0)
-    prefix = _("I-search backward: ");
+    prefix = use_regex ? _("Regexp I-search backward: ")
+                       : _("I-search backward: ");
   else
-    prefix = _("I-search: ");
+    prefix = use_regex ? _("Regexp I-search: ")
+                       : _("I-search: ");
 
   p_rep_index = p_rep_size = 0;
   p_rep = (char *)NULL;
@@ -3986,11 +4181,11 @@ incremental_search (WINDOW *window, int count, unsigned char ignore)
           else if (func == (VFunction *) isearch_forward
               || func == (VFunction *) isearch_backward)
             {
-	      /* If this key invokes an incremental search, then this
-		 means that we will either search again in the same
-		 direction, search again in the reverse direction, or
-		 insert the last search string that was accepted through
-		 incremental searching. */
+              /* If this key invokes an incremental search, then this
+                 means that we will either search again in the same
+                 direction, search again in the reverse direction, or
+                 insert the last search string that was accepted through
+                 incremental searching. */
               if ((func == (VFunction *) isearch_forward && dir > 0) ||
                   (func == (VFunction *) isearch_backward && dir < 0))
                 {
@@ -4062,17 +4257,17 @@ incremental_search (WINDOW *window, int count, unsigned char ignore)
               last_isearch_accepted = xstrdup (isearch_string);
             }
 
-	  /* If the key is the isearch_terminate_search_key, but some buffered
-	     input is pending, it is almost invariably because the ESC key is
-	     actually the beginning of an escape sequence, like in case they
-	     pressed an arrow key.  So don't gobble the ESC key, push it back
-	     into pending input.  */
-	  /* FIXME: this seems like a kludge!  We need a more reliable
-	     mechanism to know when ESC is a separate key and when it is
-	     part of an escape sequence.  */
+          /* If the key is the isearch_terminate_search_key, but some buffered
+             input is pending, it is almost invariably because the ESC key is
+             actually the beginning of an escape sequence, like in case they
+             pressed an arrow key.  So don't gobble the ESC key, push it back
+             into pending input.  */
+          /* FIXME: this seems like a kludge!  We need a more reliable
+             mechanism to know when ESC is a separate key and when it is
+             part of an escape sequence.  */
           if (key != RET  /* Emacs addicts want RET to get lost */
-	      && (key != isearch_terminate_search_key
-		  || info_any_buffered_input_p ()))
+              && (key != isearch_terminate_search_key
+                  || info_any_buffered_input_p ()))
             info_set_pending_input (key);
 
           if (func == (VFunction *) info_abort_key)
@@ -4104,19 +4299,29 @@ incremental_search (WINDOW *window, int count, unsigned char ignore)
             break;
           }
       
-
-      if (search_result == 0)
+      /* Regex isearch means we better search again every time.  We
+         might have had a failed search for "\", for example, but now we
+         have "\.".  */
+      if (use_regex)
         {
+          search_result = info_search_internal (isearch_string,
+                                                window, dir, case_sensitive);
+        }
+      else if (search_result == 0)
+        { /* I don't understand why we test for search_result being
+             zero; it means if the search failed we don't search again. 
+             Clearly the special check isn't applicable to regex search
+             anyway.  --karl, 11feb08.  */
           /* Check to see if the current search string is right here.  If
              we are looking at it, then don't bother calling the search
              function. */
           if (((dir < 0) &&
-	       ((case_sensitive ? strncmp : strncasecmp)
+               ((case_sensitive ? strncmp : mbsncasecmp)
                             (window->node->contents + window->point,
                              isearch_string, isearch_string_index) == 0)) ||
               ((dir > 0) &&
                ((window->point - isearch_string_index) >= 0) &&
-	       ((case_sensitive ? strncmp : strncasecmp)
+               ((case_sensitive ? strncmp : mbsncasecmp)
                             (window->node->contents +
                              (window->point - (isearch_string_index - 1)),
                              isearch_string, isearch_string_index) == 0)))
@@ -4126,7 +4331,7 @@ incremental_search (WINDOW *window, int count, unsigned char ignore)
             }
           else
             search_result = info_search_internal (isearch_string,
-						  window, dir, case_sensitive);
+                                                  window, dir, case_sensitive);
         }
 
       /* If this search failed, and we didn't already have a failed search,
@@ -4227,7 +4432,7 @@ info_gc_file_buffers (void)
 /* **************************************************************** */
 
 /* Move to the next or previous cross reference in this node. */
-static void
+static int
 info_move_to_xref (WINDOW *window, int count, unsigned char key, int dir)
 {
   long firstmenu, firstxref;
@@ -4235,6 +4440,10 @@ info_move_to_xref (WINDOW *window, int count, unsigned char key, int dir)
   long placement = -1;
   long start = 0;
   NODE *node = window->node;
+  int save_use_regex = use_regex;
+
+  /* Most of our keywords contain * characters; don't use regexes.  */
+  use_regex = 0;
 
   if (dir < 0)
     start = node->nodelen;
@@ -4270,8 +4479,10 @@ info_move_to_xref (WINDOW *window, int count, unsigned char key, int dir)
 
   if (firstmenu == -1 && firstxref == -1)
     {
-      info_error ((char *) msg_no_xref_node, NULL, NULL);
-      return;
+      if (!cursor_movement_scrolls_p)
+        info_error (msg_no_xref_node, NULL, NULL);
+      use_regex = save_use_regex;
+      return cursor_movement_scrolls_p;
     }
 
   /* There is at least one cross reference or menu entry in this node.
@@ -4298,6 +4509,9 @@ info_move_to_xref (WINDOW *window, int count, unsigned char key, int dir)
           (INFO_MENU_ENTRY_LABEL, node, nextmenu + dir, (WINDOW *)NULL, dir, 0);
     }
 
+  /* No more searches, back to whatever the user wanted.  */
+  use_regex = save_use_regex;
+
   /* If there is both a next menu entry, and a next xref entry, choose the
      one which occurs first.  Otherwise, select the one which actually
      appears in this node following point. */
@@ -4318,22 +4532,28 @@ info_move_to_xref (WINDOW *window, int count, unsigned char key, int dir)
      point, choose the first menu or xref entry appearing in this node. */
   if (placement == -1)
     {
-      if (firstmenu != -1 && firstxref != -1)
+      if (cursor_movement_scrolls_p)
+        return 1;
+      else
         {
-          if (((dir == 1) && (firstmenu < firstxref)) ||
-              ((dir == -1) && (firstmenu > firstxref)))
+          if (firstmenu != -1 && firstxref != -1)
+            {
+              if (((dir == 1) && (firstmenu < firstxref)) ||
+                  ((dir == -1) && (firstmenu > firstxref)))
+                placement = firstmenu + 1;
+              else
+                placement = firstxref;
+            }
+          else if (firstmenu != -1)
             placement = firstmenu + 1;
           else
             placement = firstxref;
         }
-      else if (firstmenu != -1)
-        placement = firstmenu + 1;
-      else
-        placement = firstxref;
     }
   window->point = placement;
   window_adjust_pagetop (window);
   window->flags |= W_UpdateWindow;
+  return 0;
 }
 
 DECLARE_INFO_COMMAND (info_move_to_prev_xref,
@@ -4342,7 +4562,16 @@ DECLARE_INFO_COMMAND (info_move_to_prev_xref,
   if (count < 0)
     info_move_to_prev_xref (window, -count, key);
   else
-    info_move_to_xref (window, count, key, -1);
+    {
+      while (info_move_to_xref (window, count, key, -1))
+        {
+          info_error_was_printed = 0;
+          if (backward_move_node_structure (window, info_scroll_behaviour))
+            break;
+          move_to_new_line (window->line_count, window->line_count - 1,
+                            window);
+        }
+    }
 }
 
 DECLARE_INFO_COMMAND (info_move_to_next_xref,
@@ -4351,7 +4580,19 @@ DECLARE_INFO_COMMAND (info_move_to_next_xref,
   if (count < 0)
     info_move_to_next_xref (window, -count, key);
   else
-    info_move_to_xref (window, count, key, 1);
+    {
+      /* Note: This can cause some blinking when the next cross reference is
+         located several nodes further. This effect can be easily suppressed
+         by setting display_inhibited to 1, however this will also make
+         error messages to be dumped on stderr, instead on the echo area. */ 
+      while (info_move_to_xref (window, count, key, 1))
+        {
+          info_error_was_printed = 0;
+          if (forward_move_node_structure (window, info_scroll_behaviour))
+            break;
+          move_to_new_line (0, 0, window);
+        }
+    }
 }
 
 /* Select the menu item or reference that appears on this line. */
@@ -4386,7 +4627,7 @@ DECLARE_INFO_COMMAND (info_abort_key, _("Cancel current operation"))
      do it. */
   if (!info_error_rings_bell_p)
     terminal_ring_bell ();
-  info_error ((char *) _("Quit"), NULL, NULL);
+  info_error (_("Quit"), NULL, NULL);
 
   info_initialize_numeric_arg ();
   info_clear_pending_input ();
@@ -4477,7 +4718,7 @@ DECLARE_INFO_COMMAND (info_quit, _("Quit using Info"))
 /* Declaration only.  Special cased in info_dispatch_on_key ().
    Doc string is to avoid ugly results with describe_key etc.  */
 DECLARE_INFO_COMMAND (info_do_lowercase_version,
-		      _("Run command bound to this key's lowercase variant"))
+                      _("Run command bound to this key's lowercase variant"))
 {}
 
 static void
@@ -4488,7 +4729,7 @@ dispatch_error (char *keyseq)
   rep = pretty_keyseq (keyseq);
 
   if (!echo_area_is_active)
-    info_error ((char *) _("Unknown command (%s)."), rep, NULL);
+    info_error (_("Unknown command (%s)."), rep, NULL);
   else
     {
       char *temp = xmalloc (1 + strlen (rep) + strlen (_("\"%s\" is invalid")));
@@ -4618,15 +4859,15 @@ info_dispatch_on_key (unsigned char key, Keymap map)
             if (func == (VFunction *) info_do_lowercase_version)
               {
 #if defined(INFOKEY)
-		unsigned char lowerkey;
-
-		lowerkey = Meta_p(key) ? Meta (tolower (UnMeta (key))) : tolower (key);
-		if (lowerkey == key)
-		  {
-		    add_char_to_keyseq (key);
-		    dispatch_error (info_keyseq);
-		    return;
-		  }
+                unsigned char lowerkey;
+
+                lowerkey = Meta_p(key) ? Meta (tolower (UnMeta (key))) : tolower (key);
+                if (lowerkey == key)
+                  {
+                    add_char_to_keyseq (key);
+                    dispatch_error (info_keyseq);
+                    return;
+                  }
                 info_dispatch_on_key (lowerkey, map);
 #else /* !INFOKEY */
                 info_dispatch_on_key (tolower (key), map);
@@ -4942,15 +5183,15 @@ info_gather_typeahead (void)
       chars_avail = pc_term_chars_avail ();
     else
       {
-	/* We could be more accurate by calling ltell, but we have no idea
-	   whether tty is buffered by stdio functions, and if so, how many
-	   characters are already waiting in the buffer.  So we punt.  */
-	struct stat st;
-
-	if (fstat (tty, &st) < 0)
-	  chars_avail = 1;
-	else
-	  chars_avail = st.st_size;
+        /* We could be more accurate by calling ltell, but we have no idea
+           whether tty is buffered by stdio functions, and if so, how many
+           characters are already waiting in the buffer.  So we punt.  */
+        struct stat st;
+
+        if (fstat (tty, &st) < 0)
+          chars_avail = 1;
+        else
+          chars_avail = st.st_size;
       }
     if (chars_avail > space_avail)
       chars_avail = space_avail;
@@ -4999,7 +5240,7 @@ info_get_input_char (void)
       {
         int n;
         do
-	  n = read (tty, &c, 1);
+          n = read (tty, &c, 1);
         while (n == -1 && errno == EINTR);
         rawkey = n == 1 ? c : EOF;
       }
@@ -5015,7 +5256,7 @@ info_get_input_char (void)
             {
               fclose (info_input_stream);
               info_input_stream = stdin;
-	      tty = fileno (info_input_stream);
+              tty = fileno (info_input_stream);
               display_inhibited = 0;
               display_update_display (windows);
               display_cursor_at_point (active_window);
diff --git a/Build/source/utils/texinfo/info/session.h b/Build/source/utils/texinfo/info/session.h
index 62f8ffe57d2..2052d07cae8 100644
--- a/Build/source/utils/texinfo/info/session.h
+++ b/Build/source/utils/texinfo/info/session.h
@@ -1,13 +1,13 @@
 /* session.h -- Functions found in session.c.
-   $Id: session.h,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: session.h,v 1.10 2008/03/04 09:44:57 gray Exp $
 
-   Copyright (C) 1993, 1998, 1999, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1998, 1999, 2001, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,10 +15,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-   Written by Brian Fox (bfox@ai.mit.edu). */
+   Originally written by Brian Fox (bfox@ai.mit.edu). */
 
 #ifndef SESSION_H
 #define SESSION_H
@@ -60,6 +59,18 @@ extern char *info_scroll_choices[];
 #define IS_NextOnly   1 /* Try to get "Next:" menu item. */
 #define IS_PageOnly   2 /* Simply give up at the bottom of a node. */
 
+extern int cursor_movement_scrolls_p;
+
+/* Values for scroll_last_node */
+#define SLN_Stop   0 /* Stop at the last node */
+#define SLN_Scroll 1 /* Do usual scrolling */
+#define SLN_Top    2 /* Go to the top node */
+
+extern char *scroll_last_node_choices[];
+/* Controls what to do when a scrolling command is issued at the end of the
+   last node. */
+extern int scroll_last_node;
+
 /* Utility functions found in session.c */
 extern void info_dispatch_on_key (unsigned char key, Keymap map);
 extern unsigned char info_get_input_char (void);
@@ -108,7 +119,7 @@ extern void begin_multiple_window_info_session (char *filename,
     char **nodenames);
 extern void begin_info_session (NODE *initial_node);
 extern void begin_info_session_with_error (NODE *initial_node,
-    char *format, void *arg1, void *arg2);
+    const char *format, void *arg1, void *arg2);
 extern void info_session (void);
 extern void initialize_info_session (NODE *node, int clear_screen);
 extern void info_read_and_dispatch (void);
@@ -134,6 +145,7 @@ extern void info_scroll_forward (WINDOW *window, int count, unsigned char key);
 extern void info_scroll_backward (WINDOW *window, int count, unsigned char key);
 extern void info_redraw_display (WINDOW *window, int count, unsigned char key);
 extern void info_toggle_wrap (WINDOW *window, int count, unsigned char key);
+extern void info_toggle_regexp (WINDOW *window, int count, unsigned char key);
 extern void info_move_to_window_line (WINDOW *window, int count,
     unsigned char key);
 extern void info_up_line (WINDOW *window, int count, unsigned char key);
diff --git a/Build/source/utils/texinfo/info/signals.c b/Build/source/utils/texinfo/info/signals.c
index 724768b4ec7..0657f97f69e 100644
--- a/Build/source/utils/texinfo/info/signals.c
+++ b/Build/source/utils/texinfo/info/signals.c
@@ -1,13 +1,13 @@
 /* signals.c -- install and maintain signal handlers.
-   $Id: signals.c,v 1.7 2004/04/11 17:56:46 karl Exp $
+   $Id: signals.c,v 1.10 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/signals.h b/Build/source/utils/texinfo/info/signals.h
index 2e3761e37b8..08992adfef6 100644
--- a/Build/source/utils/texinfo/info/signals.h
+++ b/Build/source/utils/texinfo/info/signals.h
@@ -1,12 +1,13 @@
 /* signals.h -- header to include system dependent signal definitions.
-   $Id: signals.h,v 1.2 2004/04/11 17:56:46 karl Exp $
+   $Id: signals.h,v 1.5 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1994, 1995, 1997, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1997, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/termdep.h b/Build/source/utils/texinfo/info/termdep.h
index 45f38aca5b3..d8343d53fe3 100644
--- a/Build/source/utils/texinfo/info/termdep.h
+++ b/Build/source/utils/texinfo/info/termdep.h
@@ -1,13 +1,13 @@
 /* termdep.h -- system things that terminal.c depends on.
-   $Id: termdep.h,v 1.2 2004/04/11 17:56:46 karl Exp $
+   $Id: termdep.h,v 1.5 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1996, 1997, 1998, 2001, 2002 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 1998, 2001, 2002, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/terminal.c b/Build/source/utils/texinfo/info/terminal.c
index 9238643d456..c3ddd56fe09 100644
--- a/Build/source/utils/texinfo/info/terminal.c
+++ b/Build/source/utils/texinfo/info/terminal.c
@@ -1,13 +1,13 @@
 /* terminal.c -- how to handle the physical terminal for Info.
-   $Id: terminal.c,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: terminal.c,v 1.6 2007/07/01 21:20:31 karl Exp $
 
    Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998,
-   1999, 2001, 2002, 2004 Free Software Foundation, Inc.
+   1999, 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/terminal.h b/Build/source/utils/texinfo/info/terminal.h
index dbf6b496ff8..135b3aea10d 100644
--- a/Build/source/utils/texinfo/info/terminal.h
+++ b/Build/source/utils/texinfo/info/terminal.h
@@ -1,13 +1,13 @@
 /* terminal.h -- The external interface to terminal I/O.
-   $Id: terminal.h,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: terminal.h,v 1.6 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1996, 1997, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 2001, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/tilde.c b/Build/source/utils/texinfo/info/tilde.c
index ac32abd040a..602963115b8 100644
--- a/Build/source/utils/texinfo/info/tilde.c
+++ b/Build/source/utils/texinfo/info/tilde.c
@@ -1,13 +1,13 @@
 /* tilde.c -- tilde expansion code (~/foo := $HOME/foo).
-   $Id: tilde.c,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: tilde.c,v 1.7 2007/07/01 21:20:31 karl Exp $
 
    Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1998, 1999,
-   2002, 2004 Free Software Foundation, Inc.
+   2002, 2004, 2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,12 +15,10 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
-/* Include config.h before doing alloca.  */
 #include "info.h"
 #include "tilde.h"
 
diff --git a/Build/source/utils/texinfo/info/tilde.h b/Build/source/utils/texinfo/info/tilde.h
index b499f3efea2..4287cb5a78e 100644
--- a/Build/source/utils/texinfo/info/tilde.h
+++ b/Build/source/utils/texinfo/info/tilde.h
@@ -1,16 +1,16 @@
 /* tilde.h: Externally available variables and function in libtilde.a.
-   $Id: tilde.h,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: tilde.h,v 1.6 2007/07/01 21:20:31 karl Exp $
 
    This file has appeared in prior works by the Free Software Foundation;
    thus it carries copyright dates from 1988 through 1993.
 
-   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,8 +18,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/info/variables.c b/Build/source/utils/texinfo/info/variables.c
index 3636801a49b..834094632ae 100644
--- a/Build/source/utils/texinfo/info/variables.c
+++ b/Build/source/utils/texinfo/info/variables.c
@@ -1,12 +1,13 @@
 /* variables.c -- how to manipulate user visible variables in Info.
-   $Id: variables.c,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: variables.c,v 1.9 2008/03/04 09:45:15 gray Exp $
 
-   Copyright (C) 1993, 1997, 2001, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 2001, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -60,14 +60,28 @@ VARIABLE_ALIST info_variables[] = {
       N_("Controls what happens when scrolling is requested at the end of a node"),
       &info_scroll_behaviour, (char **)info_scroll_choices },
 
+  /* Alternate spelling */
+  { "scroll-behavior",
+      N_("Same as scroll-behaviour"),
+      &info_scroll_behaviour, (char **)info_scroll_choices },
+
   { "scroll-step",
       N_("The number lines to scroll when the cursor moves out of the window"),
       &window_scroll_step, (char **)NULL },
 
+  { "cursor-movement-scrolls",
+    N_("Controls whether scroll-behavior affects cursor movement commands"),
+    &cursor_movement_scrolls_p, (char **)on_off_choices },
+  
   { "ISO-Latin",
       N_("When \"On\", Info accepts and displays ISO Latin characters"),
       &ISO_Latin_p, (char **)on_off_choices },
 
+  { "scroll-last-node",
+    N_("What to do when a scrolling command is issued at the end of the "
+       "last node"),
+    &scroll_last_node, (char**)scroll_last_node_choices },
+  
   { (char *)NULL, (char *)NULL, (int *)NULL, (char **)NULL }
 };
 
@@ -77,7 +91,7 @@ DECLARE_INFO_COMMAND (describe_variable, _("Explain the use of a variable"))
   char *description;
 
   /* Get the variable's name. */
-  var = read_variable_name ((char *) _("Describe variable: "), window);
+  var = read_variable_name (_("Describe variable: "), window);
 
   if (!var)
     return;
@@ -102,7 +116,7 @@ DECLARE_INFO_COMMAND (set_variable, _("Set the value of an Info variable"))
   char *line;
 
   /* Get the variable's name and value. */
-  var = read_variable_name ((char *) _("Set variable: "), window);
+  var = read_variable_name (_("Set variable: "), window);
 
   if (!var)
     return;
@@ -201,7 +215,7 @@ DECLARE_INFO_COMMAND (set_variable, _("Set the value of an Info variable"))
    address of a VARIABLE_ALIST member.  A return value of NULL indicates
    that no variable could be read. */
 VARIABLE_ALIST *
-read_variable_name (char *prompt, WINDOW *window)
+read_variable_name (const char *prompt, WINDOW *window)
 {
   register int i;
   char *line;
diff --git a/Build/source/utils/texinfo/info/variables.h b/Build/source/utils/texinfo/info/variables.h
index 7e5b08239b0..309814e932d 100644
--- a/Build/source/utils/texinfo/info/variables.h
+++ b/Build/source/utils/texinfo/info/variables.h
@@ -1,15 +1,15 @@
 /* variables.h -- Description of user visible variables in Info.
-   $Id: variables.h,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: variables.h,v 1.9 2008/03/04 09:45:27 gray Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -42,7 +41,7 @@ typedef struct {
 /* Read the name of an Info variable in the echo area and return the
    address of a VARIABLE_ALIST member.  A return value of NULL indicates
    that no variable could be read. */
-extern VARIABLE_ALIST *read_variable_name (char *prompt, WINDOW *window);
+extern VARIABLE_ALIST *read_variable_name (const char *prompt, WINDOW *window);
 
 /* Make an array of REFERENCE which actually contains the names of the
    variables available in Info. */
@@ -61,6 +60,8 @@ extern int gc_compressed_files;
 extern int show_index_match;
 extern int info_scroll_behaviour;
 extern int window_scroll_step;
+extern int cursor_movement_scrolls_p;
 extern int ISO_Latin_p;
+extern int scroll_last_node;
 
 #endif /* not INFO_VARIABLES_H */
diff --git a/Build/source/utils/texinfo/info/window.c b/Build/source/utils/texinfo/info/window.c
index cf5665b038d..7612a3699eb 100644
--- a/Build/source/utils/texinfo/info/window.c
+++ b/Build/source/utils/texinfo/info/window.c
@@ -1,13 +1,13 @@
 /* window.c -- windows in Info.
-   $Id: window.c,v 1.4 2004/04/11 17:56:46 karl Exp $
+   $Id: window.c,v 1.10 2008/02/26 16:51:06 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004, 2007, 2008
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -250,9 +249,22 @@ window_new_screen_size (int width, int height)
               break;
             }
           else
-            win= win->next;
+            win = win->next;
         }
     }
+
+  /* One more loop.  If any heights or widths have become negative,
+     set them to zero.  This can apparently happen with resizing down to
+     very small sizes.  Sadly, it is not apparent to me where in the
+     above calculations it goes wrong.  */
+  for (win = windows; win; win = win->next)
+    {
+      if (win->height < 0)
+        win->height = 0;
+
+      if (win->width < 0)
+        win->width = 0;
+    }
 }
 
 /* Make a new window showing NODE, and return that window structure.
@@ -905,11 +917,11 @@ recalculate_line_starts (WINDOW *window)
   calculate_line_starts (window);
 }
 
-/* Global variable control redisplay of scrolled windows.  If non-zero, it
-   is the desired number of lines to scroll the window in order to make
-   point visible.  A user might set this to 1 for smooth scrolling.  If
-   set to zero, the line containing point is centered within the window. */
-int window_scroll_step = 0;
+/* Global variable control redisplay of scrolled windows.  If non-zero,
+   it is the desired number of lines to scroll the window in order to
+   make point visible.  A value of 1 produces smooth scrolling.  If set
+   to zero, the line containing point is centered within the window. */
+int window_scroll_step = 1;
 
 /* Adjust the pagetop of WINDOW such that the cursor point will be visible. */
 void
@@ -1257,7 +1269,7 @@ window_clear_echo_area (void)
    printf () hair is present.  The message appears immediately.  If there was
    already a message appearing in the echo area, it is removed. */
 void
-window_message_in_echo_area (char *format, void *arg1, void *arg2)
+window_message_in_echo_area (const char *format, void *arg1, void *arg2)
 {
   free_echo_area ();
   echo_area_node = build_message_node (format, arg1, arg2);
@@ -1274,7 +1286,7 @@ static int old_echo_area_nodes_index = 0;
 static int old_echo_area_nodes_slots = 0;
 
 void
-message_in_echo_area (char *format, void *arg1, void *arg2)
+message_in_echo_area (const char *format, void *arg1, void *arg2)
 {
   if (echo_area_node)
     {
@@ -1324,7 +1336,7 @@ message_buffer_resize (int length)
 /* Format MESSAGE_BUFFER with the results of printing FORMAT with ARG1 and
    ARG2. */
 static void
-build_message_buffer (char *format, void *arg1, void *arg2, void *arg3)
+build_message_buffer (const char *format, void *arg1, void *arg2, void *arg3)
 {
   register int i, len;
   void *args[3];
@@ -1348,7 +1360,7 @@ build_message_buffer (char *format, void *arg1, void *arg2, void *arg3)
       else
         {
           char c;
-          char *fmt_start = format + i;
+          const char *fmt_start = format + i;
           char *fmt;
           int fmt_len, formatted_len;
 	  int paramed = 0;
@@ -1471,7 +1483,7 @@ build_message_buffer (char *format, void *arg1, void *arg2, void *arg3)
 /* Build a new node which has FORMAT printed with ARG1 and ARG2 as the
    contents. */
 NODE *
-build_message_node (char *format, void *arg1, void *arg2)
+build_message_node (const char *format, void *arg1, void *arg2)
 {
   NODE *node;
 
@@ -1513,7 +1525,7 @@ initialize_message_buffer (void)
 
 /* Print FORMAT with ARG1,2 to the end of the current message buffer. */
 void
-printf_to_message_buffer (char *format, void *arg1, void *arg2, void *arg3)
+printf_to_message_buffer (const char *format, void *arg1, void *arg2, void *arg3)
 {
   build_message_buffer (format, arg1, arg2, arg3);
 }
diff --git a/Build/source/utils/texinfo/info/window.h b/Build/source/utils/texinfo/info/window.h
index 44f620f0a46..dd0138f42ed 100644
--- a/Build/source/utils/texinfo/info/window.h
+++ b/Build/source/utils/texinfo/info/window.h
@@ -1,15 +1,15 @@
 /* window.h -- Structure and flags used in manipulating Info windows.
-   $Id: window.h,v 1.3 2004/04/11 17:56:46 karl Exp $
+   $Id: window.h,v 1.7 2008/02/26 16:51:06 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -167,13 +166,13 @@ extern void window_goto_percentage (WINDOW *window, int percent);
 
 /* Build a new node which has FORMAT printed with ARG1 and ARG2 as the
    contents. */
-extern NODE *build_message_node (char *format, void *arg1, void *arg2);
+extern NODE *build_message_node (const char *format, void *arg1, void *arg2);
 
 /* Useful functions can be called from outside of window.c. */
 extern void initialize_message_buffer (void);
 
 /* Print FORMAT with ARG1,2 to the end of the current message buffer. */
-extern void printf_to_message_buffer (char *format, void *arg1, void *arg2,
+extern void printf_to_message_buffer (const char *format, void *arg1, void *arg2,
     void *arg3);
 
 /* Convert the contents of the message buffer to a node. */
@@ -189,13 +188,13 @@ extern int pad_to (int count, char *string);
    The arguments are treated similar to printf () arguments, but not all of
    printf () hair is present.  The message appears immediately.  If there was
    already a message appearing in the echo area, it is removed. */
-extern void window_message_in_echo_area (char *format, void *arg1, void *arg2);
+extern void window_message_in_echo_area (const char *format, void *arg1, void *arg2);
 
 /* Place a temporary message in the echo area built from FORMAT, ARG1
    and ARG2.  The message appears immediately, but does not destroy
    any existing message.  A future call to unmessage_in_echo_area ()
    restores the old contents. */
-extern void message_in_echo_area (char *format, void *arg1, void *arg2);
+extern void message_in_echo_area (const char *format, void *arg1, void *arg2);
 extern void unmessage_in_echo_area (void);
 
 /* Clear the echo area, removing any message that is already present.
diff --git a/Build/source/utils/texinfo/install-info/Makefile.am b/Build/source/utils/texinfo/install-info/Makefile.am
new file mode 100644
index 00000000000..d81a48b9f98
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/Makefile.am
@@ -0,0 +1,31 @@
+# $Id: Makefile.am,v 1.1 2008/01/02 01:36:16 karl Exp $
+# Makefile.am for texinfo/install-info.
+# Run automake in .. to produce Makefile.in from this.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+SUBDIRS = tests
+bin_PROGRAMS = ginstall-info
+
+# Use `ginstall-info' in the definition of PROGRAMS and in dependencies
+# because automake generates an install-info target in every Makefile
+# (this is easier than changing Automake.)
+ginstall_info_SOURCES = install-info.c
+
+# Transform `ginstall-info' to `install-info' before applying any
+# user-specified name transformations.
+transform = s/ginstall-info/install-info/; $(program_transform_name)
+
+localedir = $(datadir)/locale
+AM_CPPFLAGS = 					\
+  -I$(top_srcdir)				\
+  -I$(top_srcdir)/gnulib/lib			\
+  -I$(top_builddir)/gnulib/lib			\
+  -DLOCALEDIR=\"$(localedir)\"
+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
diff --git a/Build/source/utils/texinfo/install-info/Makefile.in b/Build/source/utils/texinfo/install-info/Makefile.in
new file mode 100644
index 00000000000..6e6034ff91e
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/Makefile.in
@@ -0,0 +1,803 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# $Id: Makefile.am,v 1.1 2008/01/02 01:36:16 karl Exp $
+# Makefile.am for texinfo/install-info.
+# Run automake in .. to produce Makefile.in from this.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = ginstall-info$(EXEEXT)
+subdir = install-info
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
+	$(top_srcdir)/gnulib/m4/argz.m4 \
+	$(top_srcdir)/gnulib/m4/codeset.m4 \
+	$(top_srcdir)/gnulib/m4/eealloc.m4 \
+	$(top_srcdir)/gnulib/m4/environ.m4 \
+	$(top_srcdir)/gnulib/m4/error.m4 \
+	$(top_srcdir)/gnulib/m4/exitfail.m4 \
+	$(top_srcdir)/gnulib/m4/extensions.m4 \
+	$(top_srcdir)/gnulib/m4/getopt.m4 \
+	$(top_srcdir)/gnulib/m4/gettext.m4 \
+	$(top_srcdir)/gnulib/m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib/m4/glibc21.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib/m4/iconv.m4 \
+	$(top_srcdir)/gnulib/m4/include_next.m4 \
+	$(top_srcdir)/gnulib/m4/inline.m4 \
+	$(top_srcdir)/gnulib/m4/intlmacosx.m4 \
+	$(top_srcdir)/gnulib/m4/lib-ld.m4 \
+	$(top_srcdir)/gnulib/m4/lib-link.m4 \
+	$(top_srcdir)/gnulib/m4/lib-prefix.m4 \
+	$(top_srcdir)/gnulib/m4/localcharset.m4 \
+	$(top_srcdir)/gnulib/m4/longlong.m4 \
+	$(top_srcdir)/gnulib/m4/malloc.m4 \
+	$(top_srcdir)/gnulib/m4/malloca.m4 \
+	$(top_srcdir)/gnulib/m4/mbchar.m4 \
+	$(top_srcdir)/gnulib/m4/mbiter.m4 \
+	$(top_srcdir)/gnulib/m4/mbrtowc.m4 \
+	$(top_srcdir)/gnulib/m4/mbscasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbsncasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbstate_t.m4 \
+	$(top_srcdir)/gnulib/m4/mbswidth.m4 \
+	$(top_srcdir)/gnulib/m4/memchr.m4 \
+	$(top_srcdir)/gnulib/m4/memcpy.m4 \
+	$(top_srcdir)/gnulib/m4/memmove.m4 \
+	$(top_srcdir)/gnulib/m4/mkstemp.m4 \
+	$(top_srcdir)/gnulib/m4/nls.m4 \
+	$(top_srcdir)/gnulib/m4/onceonly.m4 \
+	$(top_srcdir)/gnulib/m4/po.m4 \
+	$(top_srcdir)/gnulib/m4/progtest.m4 \
+	$(top_srcdir)/gnulib/m4/setenv.m4 \
+	$(top_srcdir)/gnulib/m4/stdbool.m4 \
+	$(top_srcdir)/gnulib/m4/stdint.m4 \
+	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
+	$(top_srcdir)/gnulib/m4/strdup.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
+	$(top_srcdir)/gnulib/m4/string_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_time_h.m4 \
+	$(top_srcdir)/gnulib/m4/tempname.m4 \
+	$(top_srcdir)/gnulib/m4/unistd_h.m4 \
+	$(top_srcdir)/gnulib/m4/wchar.m4 \
+	$(top_srcdir)/gnulib/m4/wchar_t.m4 \
+	$(top_srcdir)/gnulib/m4/wctype.m4 \
+	$(top_srcdir)/gnulib/m4/wcwidth.m4 \
+	$(top_srcdir)/gnulib/m4/wint_t.m4 \
+	$(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
+ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
+ginstall_info_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+ginstall_info_DEPENDENCIES = ../lib/libtxi.a \
+	$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(ginstall_info_SOURCES)
+DIST_SOURCES = $(ginstall_info_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+# Transform `ginstall-info' to `install-info' before applying any
+# user-specified name transformations.
+transform = s/ginstall-info/install-info/; $(program_transform_name)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H = @ALLOCA_H@
+AMTAR = @AMTAR@
+ARGZ_H = @ARGZ_H@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETOPT_H = @GETOPT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GREP = @GREP@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_IO_H = @HAVE_IO_H@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRNDUP = @HAVE_STRNDUP@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRSEP = @HAVE_STRSEP@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNSETENV = @HAVE_UNSETENV@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE__BOOL = @HAVE__BOOL@
+HELP2MAN = @HELP2MAN@
+HEVEA = @HEVEA@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POSUB = @POSUB@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+SYS_STAT_H = @SYS_STAT_H@
+SYS_TIME_H = @SYS_TIME_H@
+TERMLIBS = @TERMLIBS@
+TEX = @TEX@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VOID_UNSETENV = @VOID_UNSETENV@
+WCHAR_H = @WCHAR_H@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WCTYPE_H = @WCTYPE_H@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+native_tools = @native_tools@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = tests
+
+# Use `ginstall-info' in the definition of PROGRAMS and in dependencies
+# because automake generates an install-info target in every Makefile
+# (this is easier than changing Automake.)
+ginstall_info_SOURCES = install-info.c
+AM_CPPFLAGS = \
+  -I$(top_srcdir)				\
+  -I$(top_srcdir)/gnulib/lib			\
+  -I$(top_builddir)/gnulib/lib			\
+  -DLOCALEDIR=\"$(localedir)\"
+
+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  install-info/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  install-info/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ginstall-info$(EXEEXT): $(ginstall_info_OBJECTS) $(ginstall_info_DEPENDENCIES) 
+	@rm -f ginstall-info$(EXEEXT)
+	$(LINK) $(ginstall_info_OBJECTS) $(ginstall_info_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install-info.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-binPROGRAMS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/Build/source/utils/texinfo/install-info/README b/Build/source/utils/texinfo/install-info/README
new file mode 100644
index 00000000000..1ad2119bedb
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/README
@@ -0,0 +1,15 @@
+$Id: README,v 1.1 2008/01/02 01:36:16 karl Exp $
+texinfo/install-info/README
+
+  Copyright (C) 2008 Free Software Foundation, Inc.
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
+install-info updates the top-level dir file in the Info tree.
+(It does not actually install files into the Info directory, oddly enough.)
+
+Debian has a completely different implementation (in Perl) of
+install-info.  This has been a point of great confusion.  We are trying
+to reconcile the two.  Bug reports and help are welcome, as always.
diff --git a/Build/source/utils/texinfo/install-info/install-info.c b/Build/source/utils/texinfo/install-info/install-info.c
new file mode 100644
index 00000000000..5fabcfcf971
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/install-info.c
@@ -0,0 +1,2675 @@
+/* install-info -- create Info directory entry(ies) for an Info file.
+   $Id: install-info.c,v 1.10 2008/04/19 17:03:14 karl Exp $
+
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2007, 2008 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "system.h"
+#include <getopt.h>
+#include <regex.h>
+#include <argz.h>
+
+#define TAB_WIDTH 8
+
+static char *progname = "install-info";
+
+struct spec_entry;
+struct spec_section;
+
+struct line_data *findlines (char *data, int size, int *nlinesp);
+void insert_entry_here (struct spec_entry *entry, int line_number,
+                        struct line_data *dir_lines, int n_entries); 
+int compare_section_names (const void *s1, const void *s2);
+int compare_entries_text (const void *e1, const void *e2); 
+
+/* Data structures.  */
+
+
+/* Record info about a single line from a file as read into core.  */
+struct line_data
+{
+  /* The start of the line.  */
+  char *start;
+  /* The number of characters in the line,
+     excluding the terminating newline.  */
+  int size;
+  /* Vector containing pointers to the entries to add before this line.
+     The vector is null-terminated.  */
+  struct spec_entry **add_entries_before;
+  /* Vector containing pointers to the sections to add before this line.
+     The vector is not null-terminated.  */
+  struct spec_section **add_sections_before;
+  /* The vector ADD_SECTIONS_BEFORE_HERE contains exactly this many
+     pointers to sections. */
+  int num_sections_to_add;
+  /* 1 means don't output this line.  */
+  int delete;
+};
+
+
+/* This is used for a list of the specified menu section names
+   in which entries should be added.  */
+struct spec_section
+{
+  struct spec_section *next;
+  char *name;
+  /* 1 means we have not yet found an existing section with this name
+     in the dir file--so we will need to add a new section.  */
+  int missing;
+};
+
+
+/* This is used for a list of the entries specified to be added.  */
+struct spec_entry
+{
+  struct spec_entry *next;
+  char *text;
+  size_t text_len;
+  /* A pointer to the list of sections to which this entry should be
+     added.  */
+  struct spec_section *entry_sections;
+  /* A pointer to a section that is beyond the end of the chain whose
+     head is pointed to by entry_sections.  */
+  struct spec_section *entry_sections_tail;
+  /* Non-zero means that the entry doesn't have a name specified.  This
+     can only happen if a --description preceeds a --name option. */
+  int missing_name;
+  /* Non-zero means that the entry doesn't have a description.  This
+     happens when a --name option is given prior to a --description 
+     option. */
+  int missing_description;
+  /* Non-zero means that the entry doesn't have an Info file specified.  
+     This means that the entry was taken from the command-line but it
+     only contains the name, and not the info file's basename, which
+     we get later on.  This only happens on entries that originate
+     from --name options. */
+  int missing_basename;
+};
+
+
+/* This is used for a list of nodes found by parsing the dir file.  */
+struct node
+{
+  struct node *next;
+  /* The node name.  */
+  char *name;
+  /* The line number of the line where the node starts.
+     This is the line that contains control-underscore.  */
+  int start_line;
+  /* The line number of the line where the node ends,
+     which is the end of the file or where the next line starts.  */
+  int end_line;
+  /* Start of first line in this node's menu
+     (the line after the * Menu: line).  */
+  char *menu_start;
+  /* The start of the chain of sections in this node's menu.  */
+  struct menu_section *sections;
+  /* The last menu section in the chain.  */
+  struct menu_section *last_section;
+};
+
+
+/* This is used for a list of sections found in a node's menu.
+   Each  struct node  has such a list in the  sections  field.  */
+struct menu_section
+{
+  struct menu_section *next;
+  char *name;
+  /* Line number of start of section.  */
+  int start_line;
+  /* Line number of end of section.  */
+  int end_line;
+};
+
+/* This table defines all the long-named options, says whether they
+   use an argument, and maps them into equivalent single-letter options.  */
+
+struct option longopts[] =
+{
+  { "add-once",  no_argument, NULL, '1'},
+  { "align",     required_argument, NULL, 'A'},
+  { "append-new-sections", no_argument, NULL, 'a'},
+  { "calign",    required_argument, NULL, 'C'},
+  { "debug",     no_argument, NULL, 'g' },
+  { "delete",    no_argument, NULL, 'r' },
+  { "dir-file",  required_argument, NULL, 'd' },
+  { "entry",     required_argument, NULL, 'e' },
+  { "name",      required_argument, NULL, 't' },
+  { "menuentry", required_argument, NULL, 't' },
+  { "description", required_argument, NULL, 'c' },
+  { "help",      no_argument, NULL, 'h' },
+  { "no-indent", no_argument, NULL, 'I' },
+  { "infodir",   required_argument, NULL, 'D' },
+  { "info-dir",  required_argument, NULL, 'D' },
+  { "info-file", required_argument, NULL, 'i' },
+  { "item",      required_argument, NULL, 'e' },
+  { "keep-old",  no_argument, NULL, 'k' },
+  { "maxwidth",  required_argument, NULL, 'W'},
+  { "max-width", required_argument, NULL, 'W'},
+  { "quiet",     no_argument, NULL, 'q' },
+  { "remove",    no_argument, NULL, 'r' },
+  { "remove-exactly",    no_argument, NULL, 'x' },
+  { "section",           required_argument, NULL, 's' },
+  { "regex",     required_argument, NULL, 'R' },
+  { "silent",    no_argument, NULL, 'q' },
+  { "test",      no_argument, NULL, 'n' },
+  { "dry-run",   no_argument, NULL, 'n' },
+  { "version",   no_argument, NULL, 'V' },
+  { 0 }
+};
+
+regex_t *psecreg = NULL;
+
+/* Nonzero means that the name specified for the Info file will be used
+   (without removing .gz, .info extension or leading path) to match the
+   entries that must be removed.  */
+int remove_exactly = 0;
+
+/* Nonzero means that sections that don't have entries in them will be
+   deleted. */
+int remove_empty_sections = 1;
+
+/* Nonzero means that new Info entries into the DIR file will go into all 
+   sections that match with --section-regex or --section.  Zero means 
+   that new entries wil go into the first section that matches.*/
+int add_entries_into_all_matching_sections = 1;
+
+/* Nonzero means we do not replace same-named info entries. */
+int keep_old_flag = 0;
+
+/* Nonzero means --test was specified, to inhibit updating the dir file.  */
+int chicken_flag = 0;
+
+/* Zero means that entries will not be formatted when they are either 
+   added or replaced. */
+int indent_flag = 1;
+
+/* Zero means that new sections will be added at the end of the DIR file. */
+int order_new_sections_alphabetically_flag = 1;
+
+
+/* Error message functions.  */
+
+/* Print error message.  S1 is printf control string, S2 and S3 args for it. */
+
+/* VARARGS1 */
+void
+error (const char *s1, const char *s2, const char *s3)
+{
+  fprintf (stderr, "%s: ", progname);
+  fprintf (stderr, s1, s2, s3);
+  putc ('\n', stderr);
+}
+
+/* VARARGS1 */
+void
+warning (const char *s1, const char *s2, const char *s3)
+{
+  fprintf (stderr, _("%s: warning: "), progname);
+  fprintf (stderr, s1, s2, s3);
+  putc ('\n', stderr);
+}
+
+/* Print error message and exit.  */
+
+void
+fatal (const char *s1, const char *s2, const char *s3)
+{
+  error (s1, s2, s3);
+  xexit (1);
+}
+
+/* Return a newly-allocated string
+   whose contents concatenate those of S1, S2, S3.  */
+char *
+concat (const char *s1, const char *s2, const char *s3)
+{
+  int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
+  char *result = (char *) xmalloc (len1 + len2 + len3 + 1);
+
+  strcpy (result, s1);
+  strcpy (result + len1, s2);
+  strcpy (result + len1 + len2, s3);
+  *(result + len1 + len2 + len3) = 0;
+
+  return result;
+}
+
+/* Return a string containing SIZE characters
+   copied from starting at STRING.  */
+
+char *
+copy_string (const char *string, int size)
+{
+  int i;
+  char *copy = (char *) xmalloc (size + 1);
+  for (i = 0; i < size; i++)
+    copy[i] = string[i];
+  copy[size] = 0;
+  return copy;
+}
+
+/* Print fatal error message based on errno, with file name NAME.  */
+
+void
+pfatal_with_name (const char *name)
+{
+  char *s = concat ("", strerror (errno), _(" for %s"));
+  fatal (s, name, 0);
+}
+
+/* Compare the menu item names in LINE1 (line length LEN1)
+   and LINE2 (line length LEN2).  Return 1 if the item name
+   in LINE1 is less, 0 otherwise.  */
+
+static int
+menu_line_lessp (char *line1, int len1, char *line2, int len2)
+{
+  int minlen = (len1 < len2 ? len1 : len2);
+  int i;
+
+  for (i = 0; i < minlen; i++)
+    {
+      /* If one item name is a prefix of the other,
+         the former one is less.  */
+      if (line1[i] == ':' && line2[i] != ':')
+        return 1;
+      if (line2[i] == ':' && line1[i] != ':')
+        return 0;
+      /* If they both continue and differ, one is less.  */
+      if (line1[i] < line2[i])
+        return 1;
+      if (line1[i] > line2[i])
+        return 0;
+    }
+  /* With a properly formatted dir file,
+     we can only get here if the item names are equal.  */
+  return 0;
+}
+
+/* Compare the menu item names in LINE1 (line length LEN1)
+   and LINE2 (line length LEN2).  Return 1 if the item names are equal,
+   0 otherwise.  */
+
+static int
+menu_line_equal (char *line1, int len1, char *line2, int len2)
+{
+  int minlen = (len1 < len2 ? len1 : len2);
+  int i;
+
+  for (i = 0; i < minlen; i++)
+    {
+      /* If both item names end here, they are equal.  */
+      if (line1[i] == ':' && line2[i] == ':')
+        return 1;
+      /* If they both continue and differ, one is less.  */
+      if (line1[i] != line2[i])
+        return 0;
+    }
+  /* With a properly formatted dir file,
+     we can only get here if the item names are equal.  */
+  return 1;
+}
+
+
+/* Given the full text of a menu entry, null terminated,
+   return just the menu item name (copied).  */
+
+char *
+extract_menu_item_name (char *item_text)
+{
+  char *p;
+
+  if (*item_text == '*')
+    item_text++;
+  while (*item_text == ' ')
+    item_text++;
+
+  p = item_text;
+  while (*p && *p != ':') p++;
+  return copy_string (item_text, p - item_text);
+}
+
+/* Given the full text of a menu entry, terminated by null or newline,
+   return just the menu item file (copied).  */
+
+char *
+extract_menu_file_name (char *item_text)
+{
+  char *p = item_text;
+
+  /* If we have text that looks like * ITEM: (FILE)NODE...,
+     extract just FILE.  Otherwise return "(none)".  */
+
+  if (*p == '*')
+    p++;
+  while (*p == ' ')
+    p++;
+
+  /* Skip to and past the colon.  */
+  while (*p && *p != '\n' && *p != ':') p++;
+  if (*p == ':') p++;
+
+  /* Skip past the open-paren.  */
+  while (1)
+    {
+      if (*p == '(')
+        break;
+      else if (*p == ' ' || *p == '\t')
+        p++;
+      else
+        return "(none)";
+    }
+  p++;
+
+  item_text = p;
+
+  /* File name ends just before the close-paren.  */
+  while (*p && *p != '\n' && *p != ')') p++;
+  if (*p != ')')
+    return "(none)";
+
+  return copy_string (item_text, p - item_text);
+}
+
+
+
+/* Return FNAME with any [.info][.gz] suffix removed.  */
+
+static char *
+strip_info_suffix (char *fname)
+{
+  char *ret = xstrdup (fname);
+  unsigned len = strlen (ret);
+
+  if (len > 3 && FILENAME_CMP (ret + len - 3, ".gz") == 0)
+    {
+      len -= 3;
+      ret[len] = 0;
+    }
+  else if (len > 4 && FILENAME_CMP (ret + len - 4, ".bz2") == 0)
+    {
+      len -= 4;
+      ret[len] = 0;
+    }
+  else if (len > 5 && FILENAME_CMP (ret + len - 5, ".lzma") == 0)
+   {
+      len -= 5;
+      ret[len] =0;
+   }
+
+  if (len > 5 && FILENAME_CMP (ret + len - 5, ".info") == 0)
+    {
+      len -= 5;
+      ret[len] = 0;
+    }
+  else if (len > 4 && FILENAME_CMP (ret + len - 4, ".inf") == 0)
+    {
+      len -= 4;
+      ret[len] = 0;
+    }
+#ifdef __MSDOS__
+  else if (len > 4 && (FILENAME_CMP (ret + len - 4, ".inz") == 0
+                       || FILENAME_CMP (ret + len - 4, ".igz") == 0))
+    {
+      len -= 4;
+      ret[len] = 0;
+    }
+#endif /* __MSDOS__ */
+
+  return ret;
+}
+
+
+/* Return true if ITEM matches NAME and is followed by TERM_CHAR.  ITEM
+   can also be followed by `.gz', `.info.gz', or `.info' (and then
+   TERM_CHAR) and still match.  */
+
+static int
+menu_item_equal (const char *item, char term_char, const char *name)
+{
+  int ret;
+  const char *item_basename = item;
+  unsigned name_len = strlen (name);
+
+  /* We must compare the basename in ITEM, since we are passed the
+     basename of the original info file.  Otherwise, a new entry like
+     "lilypond/lilypond" won't match "lilypond".
+     
+     Actually, it seems to me that we should really compare the whole
+     name, and not just the basename.  Couldn't there be dir1/foo.info
+     and dir2/foo.info?  Also, it seems like we should be using the
+     filename from the new dir entries, not the filename on the command
+     line.  Not worrying about those things right now, though.  --karl,
+     26mar04.  */
+  if (!remove_exactly) {
+  while (*item_basename && !IS_SLASH (*item_basename)
+         && *item_basename != term_char)
+    item_basename++;
+  if (! *item_basename || *item_basename == term_char)
+    item_basename = item;  /* no /, use original */
+  else
+    item_basename++;       /* have /, move past it */
+  }
+    
+  /* First, ITEM must actually match NAME (usually it won't).  */
+  ret = mbsncasecmp (item_basename, name, name_len) == 0;
+  if (ret)
+    {
+      /* Then, `foobar' doesn't match `foo', so be sure we've got all of
+         ITEM.  The various suffixes should never actually appear in the
+         dir file, but sometimes people put them in.  */
+      static char *suffixes[]
+        = { "", ".info.gz", ".info", ".inf", ".gz",
+#ifdef __MSDOS__
+            ".inz", ".igz",
+#endif
+            NULL };
+      unsigned i;
+      ret = 0;
+      for (i = 0; !ret && suffixes[i]; i++)
+        {
+          char *suffix = suffixes[i];
+          unsigned suffix_len = strlen (suffix);
+          ret = mbsncasecmp (item_basename + name_len, suffix, suffix_len) == 0
+                && item_basename[name_len + suffix_len] == term_char;
+        }
+    }
+
+  return ret;
+}
+
+
+
+void
+suggest_asking_for_help (void)
+{
+  fprintf (stderr, _("\tTry `%s --help' for a complete list of options.\n"),
+           progname);
+  xexit (1);
+}
+
+void
+print_help (void)
+{
+  printf (_("Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"), progname);
+  puts ("");
+  puts (_("Add or remove entries in INFO-FILE from the Info directory DIR-FILE."));
+  puts ("");
+
+  puts (_("\
+Options:\n\
+ --debug             report what is being done.\n\
+ --delete            delete existing entries for INFO-FILE from DIR-FILE;\n\
+                      don't insert any new entries.\n\
+ --description=TEXT  the description of the entry is TEXT; used with\n\
+                      the --name option to become synonymous with the\n\
+                      --entry option.\n\
+ --dir-file=NAME     specify file name of Info directory file;\n\
+                      equivalent to using the DIR-FILE argument.\n\
+ --dry-run           same as --test."));
+
+  puts (_("\
+ --entry=TEXT        insert TEXT as an Info directory entry.\n\
+                      TEXT is written as an Info menu item line followed\n\
+                       by zero or more extra lines starting with whitespace.\n\
+                      If you specify more than one entry, all are added.\n\
+                      If you don't specify any entries, they are determined\n\
+                       from information in the Info file itself.\n\
+                      When removing, TEXT specifies the entry to remove.\n\
+                      TEXT is only removed as a last resort, if the\n\
+                      entry as determined from the Info file is not present,\n\
+                      and the basename of the Info file isn't found either."));
+
+  puts (_("\
+ --help              display this help and exit.\n\
+ --info-dir=DIR      same as --dir-file=DIR/dir.\n\
+ --info-file=FILE    specify Info file to install in the directory;\n\
+                      equivalent to using the INFO-FILE argument.\n\
+ --item=TEXT         same as --entry=TEXT.\n\
+ --keep-old          do not replace entries, or remove empty sections.\n\
+ --menuentry=TEXT    same as --name=TEXT.\n\
+ --name=TEXT         the name of the entry is TEXT; used with --description\n\
+                      to become synonymous with the --entry option.\n\
+ --no-indent         do not format new entries in the DIR file.\n\
+ --quiet             suppress warnings."));
+
+  puts (_("\
+ --regex=R           put this file's entries in all sections that match the\n\
+                      regular expression R (ignoring case).\n\
+ --remove            same as --delete.\n\
+ --remove-exactly    only remove if the info file name matches exactly;\n\
+                      suffixes such as .info and .gz are not ignored.\n\
+ --section=SEC       put entries in section SEC of the directory.\n\
+                      If you specify more than one section, all the entries\n\
+                       are added in each of the sections.\n\
+                      If you don't specify any sections, they are determined\n\
+                       from information in the Info file itself.\n\
+ --section R SEC     equivalent to --regex=R --section=SEC --add-once."));
+
+  puts (_("\
+ --silent            suppress warnings.\n\
+ --test              suppress updating of DIR-FILE.\n\
+ --version           display version information and exit."));
+
+  puts ("");
+  
+  puts (_("\
+Email bug reports to bug-texinfo@gnu.org,\n\
+general questions and discussion to help-texinfo@gnu.org.\n\
+Texinfo home page: http://www.gnu.org/software/texinfo/"));
+}
+
+
+/* If DIRFILE does not exist, and we are not in test mode, create a
+   minimal one (or abort).  If it already exists, do nothing.  */
+
+static void
+ensure_dirfile_exists (char *dirfile)
+{
+  int desc;
+  
+  if (chicken_flag)
+    return;
+    
+  desc = open (dirfile, O_RDONLY);
+  if (desc < 0 && errno == ENOENT)
+    {
+      FILE *f;
+      char *readerr = strerror (errno);
+      close (desc);
+      f = fopen (dirfile, "w");
+      if (f)
+        {
+          fprintf (f, _("This is the file .../info/dir, which contains the\n\
+topmost node of the Info hierarchy, called (dir)Top.\n\
+The first time you invoke Info you start off looking at this node.\n\
+\x1f\n\
+%s\tThis is the top of the INFO tree\n\
+\n\
+  This (the Directory node) gives a menu of major topics.\n\
+  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n\
+  \"h\" gives a primer for first-timers,\n\
+  \"mEmacs<Return>\" visits the Emacs manual, etc.\n\
+\n\
+  In Emacs, you can click mouse button 2 on a menu item or cross reference\n\
+  to select it.\n\
+\n\
+%s\n\
+"), "File: dir,\tNode: Top",  /* These keywords must not be translated.  */
+    "* Menu:"
+);
+          if (fclose (f) < 0)
+            pfatal_with_name (dirfile);
+        }
+      else
+        {
+          /* Didn't exist, but couldn't open for writing.  */
+          fprintf (stderr,
+                   _("%s: could not read (%s) and could not create (%s)\n"),
+                   dirfile, readerr, strerror (errno));
+          xexit (1);
+        }
+    }
+  else
+    close (desc); /* It already existed, so fine.  */
+}
+
+/* Open FILENAME and return the resulting stream pointer.  If it doesn't
+   exist, try FILENAME.gz.  If that doesn't exist either, call
+   CREATE_CALLBACK (with FILENAME as arg) to create it, if that is
+   non-NULL.  If still no luck, fatal error.
+
+   If we do open it, return the actual name of the file opened in
+   OPENED_FILENAME and the compress program to use to (de)compress it in
+   COMPRESSION_PROGRAM.  The compression program is determined by the
+   magic number, not the filename.  */
+
+FILE *
+open_possibly_compressed_file (char *filename,
+    void (*create_callback) (char *),
+    char **opened_filename, char **compression_program, int *is_pipe) 
+{
+  char *local_opened_filename, *local_compression_program;
+  int nread;
+  char data[13];
+  FILE *f;
+
+  /* We let them pass NULL if they don't want this info, but it's easier
+     to always determine it.  */
+  if (!opened_filename)
+    opened_filename = &local_opened_filename;
+
+  *opened_filename = filename;
+  f = fopen (*opened_filename, FOPEN_RBIN);
+  if (!f)
+    {
+      *opened_filename = concat (filename, ".gz", "");
+      f = fopen (*opened_filename, FOPEN_RBIN);
+  if (!f)
+    {
+      free (*opened_filename);
+      *opened_filename = concat (filename, ".bz2", "");
+      f = fopen (*opened_filename, FOPEN_RBIN);
+    }
+  if (!f)
+    {
+     free (*opened_filename);
+     *opened_filename = concat (filename, ".lzma", "");
+     f = fopen (*opened_filename, FOPEN_RBIN);
+    }
+
+#ifdef __MSDOS__
+      if (!f)
+        {
+          free (*opened_filename);
+          *opened_filename = concat (filename, ".igz", "");
+          f = fopen (*opened_filename, FOPEN_RBIN);
+        }
+      if (!f)
+        {
+          free (*opened_filename);
+          *opened_filename = concat (filename, ".inz", "");
+          f = fopen (*opened_filename, FOPEN_RBIN);
+        }
+#endif
+      if (!f)
+        {
+          if (create_callback)
+            { /* That didn't work either.  Create the file if we can.  */
+              (*create_callback) (filename);
+
+              /* And try opening it again.  */
+              free (*opened_filename);
+              *opened_filename = filename;
+              f = fopen (*opened_filename, FOPEN_RBIN);
+              if (!f)
+                pfatal_with_name (filename);
+            }
+          else
+            pfatal_with_name (filename);
+        }
+    }
+
+  /* Read first few bytes of file rather than relying on the filename.
+     If the file is shorter than this it can't be usable anyway.  */
+  nread = fread (data, sizeof (data), 1, f);
+  if (nread != 1)
+    {
+      /* Empty files don't set errno, so we get something like
+         "install-info: No error for foo", which is confusing.  */
+      if (nread == 0)
+        fatal (_("%s: empty file"), *opened_filename, 0);
+      pfatal_with_name (*opened_filename);
+    }
+
+  if (!compression_program)
+    compression_program = &local_compression_program;
+
+  if (data[0] == '\x1f' && data[1] == '\x8b')
+#if STRIP_DOT_EXE
+    /* An explicit .exe yields a better diagnostics from popen below
+       if they don't have gzip installed.  */
+    *compression_program = "gzip.exe";
+#else
+    *compression_program = "gzip";
+#endif
+  else if (data[0] == 'B' && data[1] == 'Z' && data[2] == 'h')
+#ifndef STRIP_DOT_EXE
+    *compression_program = "bzip2.exe";
+#else
+    *compression_program = "bzip2";
+#endif
+  else if (data[0] == 'B' && data[1] == 'Z' && data[2] == '0')
+#ifndef STRIP_DOT_EXE
+    *compression_program = "bzip.exe";
+#else
+    *compression_program = "bzip";
+#endif
+    /* We (try to) match against old lzma format (which lacks proper
+       header, two first matches), as well as the new format (last match).  */
+  else if ((data[9] == 0x00 && data[10] == 0x00 && data[11] == 0x00
+            && data[12] == 0x00)
+           || (data[5] == '\xFF' && data[6] == '\xFF' && data[7] == '\xFF'
+               && data[8] == '\xFF' && data[9] == '\xFF' && data[10] == '\xFF'
+               && data[11] == '\xFF' && data[12] == '\xFF') 
+           || (data[0] == '\xFF' && data[1] == 'L' && data[2] == 'Z'
+               && data[3] == 'M' && data[4] == 'A' && data[5] == 0x00))
+#ifndef STRIP_DOT_EXE
+    *compression_program = "lzma.exe";
+#else
+    *compression_program = "lzma";
+#endif
+  else
+    *compression_program = NULL;
+
+  if (*compression_program)
+    { /* It's compressed, so fclose the file and then open a pipe.  */
+      char *command = concat (*compression_program," -cd <", *opened_filename);
+      if (fclose (f) < 0)
+        pfatal_with_name (*opened_filename);
+      f = popen (command, "r");
+      if (f)
+        *is_pipe = 1;
+      else
+        pfatal_with_name (command);
+    }
+  else
+    { /* It's a plain file, seek back over the magic bytes.  */
+      if (fseek (f, 0, 0) < 0)
+        pfatal_with_name (*opened_filename);
+#if O_BINARY
+      /* Since this is a text file, and we opened it in binary mode,
+         switch back to text mode.  */
+      f = freopen (*opened_filename, "r", f);
+#endif
+      *is_pipe = 0;
+    }
+
+  return f;
+}
+
+/* Read all of file FILENAME into memory and return the address of the
+   data.  Store the size of the data into SIZEP.  If need be, uncompress
+   (i.e., try FILENAME.gz et al. if FILENAME does not exist) and store
+   the actual file name that was opened into OPENED_FILENAME (if it is
+   non-NULL), and the companion compression program (if any, else NULL)
+   into COMPRESSION_PROGRAM (if that is non-NULL).  If trouble, do
+   a fatal error.  */
+
+char *
+readfile (char *filename, int *sizep,
+    void (*create_callback) (char *), char **opened_filename,
+    char **compression_program)
+{
+  char *real_name;
+  FILE *f;
+  int pipe_p;
+  int filled = 0;
+  int data_size = 8192;
+  char *data = xmalloc (data_size);
+
+  /* If they passed the space for the file name to return, use it.  */
+  f = open_possibly_compressed_file (filename, create_callback,
+                                     opened_filename ? opened_filename
+                                                     : &real_name,
+                                     compression_program, &pipe_p);
+
+  for (;;)
+    {
+      int nread = fread (data + filled, 1, data_size - filled, f);
+      if (nread < 0)
+        pfatal_with_name (real_name);
+      if (nread == 0)
+        break;
+
+      filled += nread;
+      if (filled == data_size)
+        {
+          data_size += 65536;
+          data = xrealloc (data, data_size);
+        }
+    }
+
+  /* We'll end up wasting space if we're not passing the filename back
+     and it is not just FILENAME, but so what.  */
+  /* We need to close the stream, since on some systems the pipe created
+     by popen is simulated by a temporary file which only gets removed
+     inside pclose.  */
+  if (pipe_p)
+    pclose (f);
+  else
+    fclose (f);
+
+  *sizep = filled;
+  return data;
+}
+
+/* Output the old dir file, interpolating the new sections
+   and/or new entries where appropriate.  If COMPRESSION_PROGRAM is not
+   null, pipe to it to create DIRFILE.  Thus if we read dir.gz on input,
+   we'll write dir.gz on output.  */
+
+static void
+output_dirfile (char *dirfile, int dir_nlines, struct line_data *dir_lines,
+                int n_entries_to_add, struct spec_entry *entries_to_add,
+                struct spec_section *input_sections, char *compression_program)
+{
+  int n_entries_added = 0;
+  int i;
+  FILE *output;
+
+  if (compression_program)
+    {
+      char *command = concat (compression_program, ">", dirfile);
+      output = popen (command, "w");
+    }
+  else
+    output = fopen (dirfile, "w");
+
+  if (!output)
+    {
+      perror (dirfile);
+      xexit (1);
+    }
+
+  for (i = 0; i <= dir_nlines; i++)
+    {
+      int j;
+
+      /* If we decided to output some new entries before this line,
+         output them now.  */
+      if (dir_lines[i].add_entries_before)
+        for (j = 0; j < n_entries_to_add; j++)
+          {
+            struct spec_entry *this = dir_lines[i].add_entries_before[j];
+            if (this == 0)
+              break;
+            if (n_entries_added >= 1 && 
+                !add_entries_into_all_matching_sections)
+              break;
+            fputs (this->text, output);
+            n_entries_added++;
+          }
+      /* If we decided to add some sections here
+         because there are no such sections in the file,
+         output them now.  
+         FIXME:  we add all sections here, but they should
+         be interspersed throughout the DIR file in 
+         alphabetic order. */
+      if (dir_lines[i].add_sections_before)
+        {
+          struct spec_section *spec;
+          struct spec_entry *entry;
+          struct spec_entry **entries;
+          int n_entries = 0;
+
+          /* If we specified --add-once, and we've added an entry, then
+             it's time to bail. */
+          if (n_entries_added >= 1 && 
+              !add_entries_into_all_matching_sections)
+            break;
+
+          qsort (dir_lines[i].add_sections_before, 
+                 dir_lines[i].num_sections_to_add, 
+                 sizeof (struct spec_section *), compare_section_names);
+
+          /* Count the entries and allocate a vector for all of them.  */
+          for (entry = entries_to_add; entry; entry = entry->next)
+            n_entries++;
+          entries = ((struct spec_entry **)
+                     xmalloc (n_entries * sizeof (struct spec_entry *)));
+
+          /* Fill the vector ENTRIES with pointers to all the sections,
+             and sort them.  */
+          j = 0;
+          for (entry = entries_to_add; entry; entry = entry->next)
+            entries[j++] = entry;
+          qsort (entries, n_entries, sizeof (struct spec_entry *),
+                 compare_entries_text);
+
+          /* Generate the new sections in alphabetical order.  In each
+             new section, output all of the entries that belong to that
+             section, in alphabetical order.  */
+          for (j = 0; j < dir_lines[i].num_sections_to_add; j++)
+            {
+              spec = dir_lines[i].add_sections_before[j];
+              if (spec->missing)
+                {
+                  int k;
+
+                  putc ('\n', output);
+                  fputs (spec->name, output);
+                  putc ('\n', output);
+                  spec->missing = 0;
+                  for (k = 0; k < n_entries; k++)
+                    {
+                      struct spec_section *spec1;
+                      /* Did they at all want this entry to be put into
+                         this section?  */
+                      entry = entries[k];
+                      for (spec1 = entry->entry_sections;
+                           spec1 && spec1 != entry->entry_sections_tail;
+                           spec1 = spec1->next)
+                        {
+                          if (!strcmp (spec1->name, spec->name))
+                            break;
+                        }
+                      if (spec1 && spec1 != entry->entry_sections_tail)
+                        fputs (entry->text, output);
+                    }
+                }
+            }
+
+          n_entries_added++;
+          free (entries);
+        }
+
+      /* Output the original dir lines unless marked for deletion.  */
+      if (i < dir_nlines && !dir_lines[i].delete)
+        {
+          fwrite (dir_lines[i].start, 1, dir_lines[i].size, output);
+          putc ('\n', output);
+        }
+    }
+
+  /* Some systems, such as MS-DOS, simulate pipes with temporary files.
+     On those systems, the compressor actually gets run inside pclose,
+     so we must call pclose.  */
+  if (compression_program)
+    pclose (output);
+  else
+    fclose (output);
+}
+
+/* Parse the input to find the section names and the entry names it
+   specifies.  Return the number of entries to add from this file.  */
+int
+parse_input (const struct line_data *lines, int nlines,
+             struct spec_section **sections, struct spec_entry **entries,
+             int delete_flag) 
+{
+  int n_entries = 0;
+  int prefix_length = strlen ("INFO-DIR-SECTION ");
+  struct spec_section *head = *sections, *tail = NULL;
+  int reset_tail = 0;
+  char *start_of_this_entry = 0;
+  int ignore_sections = *sections != 0;
+  int ignore_entries  = delete_flag ? 0: *entries  != 0;
+
+  int i;
+
+  if (ignore_sections && ignore_entries)
+    return 0;
+
+  /* Loop here processing lines from the input file.  Each
+     INFO-DIR-SECTION entry is added to the SECTIONS linked list.
+     Each START-INFO-DIR-ENTRY block is added to the ENTRIES linked
+     list, and all its entries inherit the chain of SECTION entries
+     defined by the last group of INFO-DIR-SECTION entries we have
+     seen until that point.  */
+  for (i = 0; i < nlines; i++)
+    {
+      if (!ignore_sections
+          && !strncmp ("INFO-DIR-SECTION ", lines[i].start, prefix_length))
+        {
+          struct spec_section *next
+            = (struct spec_section *) xmalloc (sizeof (struct spec_section));
+          next->name = copy_string (lines[i].start + prefix_length,
+                                    lines[i].size - prefix_length);
+          next->next = *sections;
+          next->missing = 1;
+          if (reset_tail)
+            {
+              tail = *sections;
+              reset_tail = 0;
+            }
+          *sections = next;
+          head = *sections;
+        }
+      /* If entries were specified explicitly with command options,
+         ignore the entries in the input file.  */
+      else if (!ignore_entries)
+        {
+          if (!strncmp ("START-INFO-DIR-ENTRY", lines[i].start, lines[i].size)
+              && sizeof ("START-INFO-DIR-ENTRY") - 1 == lines[i].size)
+            {
+              if (!*sections)
+                {
+                  /* We found an entry, but didn't yet see any sections
+                     specified.  Default to section "Miscellaneous".  */
+                  *sections = (struct spec_section *)
+                    xmalloc (sizeof (struct spec_section));
+                  (*sections)->name = "Miscellaneous";
+                  (*sections)->next = 0;
+                  (*sections)->missing = 1;
+                  head = *sections;
+                }
+              /* Next time we see INFO-DIR-SECTION, we will reset the
+                 tail pointer.  */
+              reset_tail = 1;
+
+              if (start_of_this_entry != 0)
+                fatal (_("START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"), 0, 0);
+              start_of_this_entry = lines[i + 1].start;
+            }
+          else if (start_of_this_entry)
+            {
+              if ((!strncmp ("* ", lines[i].start, 2)
+                   && lines[i].start > start_of_this_entry)
+                  || (!strncmp ("END-INFO-DIR-ENTRY",
+                                lines[i].start, lines[i].size)
+                      && sizeof ("END-INFO-DIR-ENTRY") - 1 == lines[i].size))
+                {
+                  /* We found an end of this entry.  Allocate another
+                     entry, fill its data, and add it to the linked
+                     list.  */
+                  struct spec_entry *next
+                    = (struct spec_entry *) xmalloc (sizeof (struct spec_entry));
+                  next->text
+                    = copy_string (start_of_this_entry,
+                                   lines[i].start - start_of_this_entry);
+                  next->text_len = lines[i].start - start_of_this_entry;
+                  next->entry_sections = head;
+                  next->entry_sections_tail = tail;
+                  next->next = *entries;
+                  *entries = next;
+                  n_entries++;
+                  if (!strncmp ("END-INFO-DIR-ENTRY",
+                                lines[i].start, lines[i].size)
+                      && sizeof ("END-INFO-DIR-ENTRY") - 1 == lines[i].size)
+                    start_of_this_entry = 0;
+                  else
+                    start_of_this_entry = lines[i].start;
+                }
+              else if (!strncmp ("END-INFO-DIR-ENTRY",
+                                 lines[i].start, lines[i].size)
+                       && sizeof ("END-INFO-DIR-ENTRY") - 1 == lines[i].size)
+                fatal (_("END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"), 0, 0);
+            }
+        }
+    }
+  if (start_of_this_entry != 0)
+    fatal (_("START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"),
+           0, 0);
+
+  /* If we ignored the INFO-DIR-ENTRY directives, we need now go back
+     and plug the names of all the sections we found into every
+     element of the ENTRIES list.  */
+  if (ignore_entries && *entries)
+    {
+      struct spec_entry *entry;
+
+      for (entry = *entries; entry; entry = entry->next)
+        {
+          entry->entry_sections = head;
+          entry->entry_sections_tail = tail;
+        }
+    }
+
+  return n_entries;
+}
+
+
+/* Parse the dir file whose basename is BASE_NAME.  Find all the
+   nodes, and their menus, and the sections of their menus.  */
+static void
+parse_dir_file (struct line_data *lines, int nlines, struct node **nodes)
+{
+  int node_header_flag = 0;
+  int i;
+
+  *nodes = 0;
+  for (i = 0; i < nlines; i++)
+    {
+      /* Parse node header lines.  */
+      if (node_header_flag)
+        {
+          int j, end;
+          for (j = 0; j < lines[i].size; j++)
+            /* Find the node name and store it in the `struct node'.  */
+            if (!strncmp ("Node:", lines[i].start + j, 5))
+              {
+                char *line = lines[i].start;
+                /* Find the start of the node name.  */
+                j += 5;
+                while (line[j] == ' ' || line[j] == '\t')
+                  j++;
+                /* Find the end of the node name.  */
+                end = j;
+                while (line[end] != 0 && line[end] != ',' && line[end] != '\n'
+                       && line[end] != '\t')
+                  end++;
+                (*nodes)->name = copy_string (line + j, end - j);
+              }
+          node_header_flag = 0;
+        }
+
+      /* Notice the start of a node.  */
+      if (*lines[i].start == 037)
+        {
+          struct node *next = (struct node *) xmalloc (sizeof (struct node));
+
+          next->next = *nodes;
+          next->name = NULL;
+          next->start_line = i;
+          next->end_line = 0;
+          next->menu_start = NULL;
+          next->sections = NULL;
+          next->last_section = NULL;
+
+          if (*nodes != 0)
+            (*nodes)->end_line = i;
+          /* Fill in the end of the last menu section
+             of the previous node.  */
+          if (*nodes != 0 && (*nodes)->last_section != 0)
+            (*nodes)->last_section->end_line = i;
+
+          *nodes = next;
+
+          /* The following line is the header of this node;
+             parse it.  */
+          node_header_flag = 1;
+        }
+
+      /* Notice the lines that start menus.  */
+      if (*nodes != 0 && !strncmp ("* Menu:", lines[i].start, 7))
+        (*nodes)->menu_start = lines[i + 1].start;
+
+      /* Notice sections in menus.  */
+      if (*nodes != 0
+          && (*nodes)->menu_start != 0
+          && *lines[i].start != '\n'
+          && *lines[i].start != '*'
+          && *lines[i].start != ' '
+          && *lines[i].start != '\t')
+        {
+          /* Add this menu section to the node's list.
+             This list grows in forward order.  */
+          struct menu_section *next
+            = (struct menu_section *) xmalloc (sizeof (struct menu_section));
+
+          next->start_line = i + 1;
+          next->next = 0;
+          next->end_line = 0;
+          next->name = copy_string (lines[i].start, lines[i].size);
+          if ((*nodes)->sections)
+            {
+              (*nodes)->last_section->next = next;
+              (*nodes)->last_section->end_line = i;
+            }
+          else
+            (*nodes)->sections = next;
+          (*nodes)->last_section = next;
+        }
+
+    }
+
+  /* Finish the info about the end of the last node.  */
+  if (*nodes != 0)
+    {
+      (*nodes)->end_line = nlines;
+      if ((*nodes)->last_section != 0)
+        (*nodes)->last_section->end_line = nlines;
+    }
+}
+
+
+/* Iterate through NLINES LINES looking for an entry that has a name
+   that matches NAME.  If such an entry is found, flag the entry for 
+   deletion later on. */
+
+int
+mark_entry_for_deletion (struct line_data *lines, int nlines, char *name)
+{
+  int something_deleted = 0;
+  int i;
+  for (i = 0; i < nlines; i++)
+    {
+      /* Check for an existing entry that should be deleted.
+         Delete all entries which specify this file name.  */
+      if (*lines[i].start == '*')
+        {
+          char *q;
+          char *p = lines[i].start;
+
+          p++; /* skip * */
+          while (*p == ' ') p++; /* ignore following spaces */
+          q = p; /* remember this, it's the beginning of the menu item.  */
+
+          /* Read menu item.  */
+          while (*p != 0 && *p != ':')
+            p++;
+          p++; /* skip : */
+
+          if (*p == ':')
+            { /* XEmacs-style entry, as in * Mew::Messaging.  */
+              if (menu_item_equal (q, ':', name))
+                {
+                  lines[i].delete = 1;
+                  something_deleted = 1;
+                }
+            }
+          else
+            { /* Emacs-style entry, as in * Emacs: (emacs).  */
+              while (*p == ' ') p++; /* skip spaces after : */
+              if (*p == '(')         /* if at parenthesized (FILENAME) */
+                {
+                  p++;
+                  if (menu_item_equal (p, ')', name))
+                    {
+                      lines[i].delete = 1;
+                      something_deleted = 1;
+                    }
+                }
+            }
+        }
+
+      /* Treat lines that start with whitespace
+         as continuations; if we are deleting an entry,
+         delete all its continuations as well.  */
+      else if (i > 0 && (*lines[i].start == ' ' || *lines[i].start == '\t'))
+        {
+          lines[i].delete = lines[i - 1].delete;
+        }
+    }
+  return something_deleted;
+}
+
+
+/* Assuming the current column is COLUMN, return the column that
+   printing C will move the cursor to.
+   The first column is 0.
+   This function is used to assist in indenting of entries. */
+
+static size_t
+adjust_column (size_t column, char c)
+{
+  if (c == '\b')
+    {
+      if (column > 0)
+        column--;
+    }
+  else if (c == '\r')
+    column = 0;
+  else if (c == '\t')
+    column += TAB_WIDTH - column % TAB_WIDTH;
+  else                          /* if (isprint (c)) */
+    column++;
+  return column;
+}
+
+/* Indent the Info entry's NAME and DESCRIPTION.  Lines are wrapped at the
+   WIDTH column.  The description on first line is indented at the CALIGN-th 
+   column, and all subsequent lines are indented at the ALIGN-th column.  
+   The resulting Info entry is put into OUTSTR.
+   NAME is of the form "* TEXT (TEXT)[:TEXT].".
+ */
+static int
+format_entry (char *name, size_t name_len, char *desc, size_t desc_len, 
+              int calign, int align, size_t width, 
+              char **outstr, size_t *outstr_len)
+{
+  int i, j;
+  char c;
+  size_t column = 0;            /* Screen column where next char will go */
+  size_t offset_out = 0;        /* Index in `line_out' for next char. */
+  static char *line_out = NULL;
+  static size_t allocated_out = 0;
+  int saved_errno;
+  if (!desc || !name)
+    return 1;
+
+  *outstr = malloc (width  + 
+                    (((desc_len  + width) / (width - align)) * width) * 2 
+                    * sizeof (char));
+  *outstr[0] = '\0';
+
+  strncat (*outstr, name, name_len);
+
+  column = name_len;
+
+  if (name_len > calign - 2)
+    {
+      /* Name is too long to have description on the same line. */
+      if (desc_len > 1)
+        {
+          strncat (*outstr, "\n", 1);
+          column = 0;
+          for (j = 0; j < calign - 1; j++)
+            {
+              column = adjust_column (column, ' ');
+              strncat (*outstr, " ", 1);
+            }
+        }
+    }
+  else
+    for (j = 0; j < calign - name_len - 1; j++)
+      {
+        if (desc_len <= 2)
+          break;
+        column = adjust_column (column, ' ');
+        strncat (*outstr, " ", 1);
+      }
+
+  for (i = 0; i < desc_len; i++)
+    {
+      if (desc_len <= 2)
+        break;
+      c = desc[i];
+      if (offset_out + 1 >= allocated_out)
+        {
+          allocated_out = offset_out + 1;
+          line_out = (char *) realloc ((void *)line_out, allocated_out);
+        }
+
+      if (c == '\n')
+        {
+          line_out[offset_out++] = c;
+          strncat (*outstr, line_out, offset_out);
+          column = offset_out = 0;
+          continue;
+        }
+
+    rescan:
+      column = adjust_column (column, c);
+
+      if (column > width)
+        {
+          /* This character would make the line too long.
+             Print the line plus a newline, and make this character
+             start the next line. */
+
+          int found_blank = 0;
+          size_t logical_end = offset_out;
+
+          /* Look for the last blank. */
+          while (logical_end)
+            {
+              --logical_end;
+              if (line_out[logical_end] == ' '
+                  || line_out[logical_end] == '\t')
+                {
+                  found_blank = 1;
+                  break;
+                }
+            }
+
+          if (found_blank)
+            {
+              size_t i;
+
+              /* Found a blank.  Don't output the part after it. */
+              logical_end++;
+              strncat (*outstr, line_out, logical_end);
+              strncat (*outstr, "\n", 1);
+              for (j = 0; j < align - 1; j++)
+                {
+                  column = adjust_column (column, ' ');
+                  strncat (*outstr, " ", 1);
+                }
+
+              /* Move the remainder to the beginning of the next 
+                 line.
+                 The areas being copied here might overlap. */
+              memmove (line_out, line_out + logical_end,
+                       offset_out - logical_end);
+              offset_out -= logical_end;
+              for (column = i = 0; i < offset_out; i++)
+                column = adjust_column (column, line_out[i]);
+              goto rescan;
+            }
+
+          if (offset_out == 0)
+            {
+              line_out[offset_out++] = c;
+              continue;
+            }
+
+          line_out[offset_out++] = '\n';
+          strncat (*outstr, line_out, offset_out);
+          column = offset_out = 0;
+          goto rescan;
+        }
+
+      line_out[offset_out++] = c;
+    }
+
+  saved_errno = errno;
+
+  if (desc_len <= 2)
+    strncat (*outstr, "\n", 1);
+
+  if (offset_out)
+    strncat (*outstr, line_out, offset_out);
+
+  *outstr_len = strlen (*outstr);
+  return 1;
+}
+
+
+/* Extract the NAME and DESCRIPTION from ENTRY.  NAME and DESCRIPTION must be
+   free'd.
+ */
+static void
+split_entry (char *entry, char **name, size_t *name_len, char **description, size_t *description_len)
+{
+  char *endptr;
+
+  /* on the first line, the description starts after the first period. */
+  char *ptr = strchr (entry, '.');
+  /* Maybe there's no period, and no description */
+  if (!ptr)
+    {
+      size_t length = strlen (entry);
+      if (length == 0)
+        return;
+      *name = strdup (ptr);
+      *name_len = length + 1;
+      return;
+    }
+
+  /* The name is everything up to and including the period. */
+  *name_len = (size_t) (ptr - entry + 1);
+  *name = xmalloc (*name_len + 1);
+  (*name)[0] = '\0';
+  strncat (*name, entry, *name_len);
+
+  ptr++;
+  *description = xmalloc (strlen (entry));
+  (*description)[0] = '\0';
+
+  while (ptr[0] != '\0')
+    {
+
+      /* Eat up the whitespace after the name, and at the start of a line. */
+      while (isspace(ptr[0]))
+        ptr++;
+
+      /* Okay, we're at the start of the description. */
+      if (ptr[0] == '\0')
+        continue;
+
+      /* See how far the description goes... */
+      endptr = strchr (ptr, '\n');
+      /* Either the description continues up to the next newline. */
+      if (endptr)
+        {
+          size_t length  = (size_t) (endptr - ptr) / sizeof (char);
+          strncat (*description, ptr, length);
+          ptr = endptr;
+          /* First of all, we eat the newline here.  But then what?
+             Sometimes the newline separates 2 sentences, so we
+             end up with the next word starting directly after the period,
+             instead of after the customary 2 spaces in english. 
+             If the previous character was a `.', then we should add 2
+             spaces if there is anything on the next line.
+             if it's a comma, then we should put one space.
+             If it's neither, we just put a space.
+             If it's some other whitespace, we shouldn't do anything. */
+          ptr++;
+          if (length > 1 && strlen (ptr) > 0)
+            {
+              endptr--;
+              /* *ENDPTR is the 2nd last character */
+              if (*endptr == '.')
+                strncat (*description, "  ", 2);
+              else if (!isspace (*endptr))
+                strncat (*description, " ", 1);
+            }
+        }
+      /* Or the description continues to the end of the string. */
+      else
+        {
+          /* Just show the rest when there's no newline. */
+          size_t length = strlen (ptr);
+          strncat (*description, ptr, length);
+          ptr += length;
+        }
+    }
+  /* Descriptions end in a new line. */
+  strncat (*description, "\n", 1);
+  *description_len = strlen (*description);
+}
+
+
+/* Indent all ENTRIES according to some formatting options. 
+   CALIGN_CLI is the starting column for the first line of the description.
+   ALIGN_CLI is the starting column for all subsequent lines of the 
+   description.  MAXWIDTH_CLI is the number of columns in the line. 
+   When CALIGN_CLI, ALIGN_CLI, or MAXWIDTH_CLI is -1, choose a sane default. */
+
+static void
+reformat_new_entries (struct spec_entry *entries, int calign_cli, int align_cli, 
+                      int maxwidth_cli)
+{
+  struct spec_entry *entry;
+  for (entry = entries; entry; entry = entry->next)
+    {
+      int calign = -1, align = -1, maxwidth = -1;
+      char *name = NULL, *desc = NULL;
+      size_t name_len = 0, desc_len = 0;
+      split_entry (entry->text, &name, &name_len, &desc, &desc_len);
+      free (entry->text);
+
+      /* Specify sane defaults if we need to */
+      if (calign_cli == -1 || align_cli == -1)
+        {
+          struct spec_section *section;
+          calign = calign_cli;
+          align = align_cli;
+          for (section = entry->entry_sections; 
+               section && section != entry->entry_sections_tail;
+               section = section->next)
+            {
+              if (!strcmp (section->name, "Individual utilities"))
+                {
+                  if (calign == -1)
+                    calign = 48 + 1;
+                  if (align == -1)
+                    align = 50 + 1;
+                  break;
+                }
+            }
+          if (calign == -1)
+            calign = 32 + 1;
+          if (align == -1)
+            align = 34 + 1;
+        }
+      else
+        {
+          calign = calign_cli;
+          align = align_cli;
+        }
+
+      if (maxwidth_cli == -1)
+        maxwidth = 79;
+
+      format_entry (name, name_len, desc, desc_len, calign, align, 
+                    maxwidth, &entry->text, &entry->text_len);
+    }
+}
+
+/* Insert NAME into every entry in ENTRIES that requires it. 
+   NAME is the basename of the Info file being installed. 
+   The idea here is that there was a --name on the command-line
+   and we need to put the basename in the empty parentheses. */
+void
+add_missing_basenames (struct spec_entry *entries, char *name)
+{
+  struct spec_entry *entry;
+  for (entry = entries; entry; entry = entry->next)
+    {
+      if (entry->missing_basename)
+        {
+          /* Insert NAME into the right place in ENTRY->TEXT. */
+          char *info, *rest, *text;
+          size_t name_len = strlen (name);
+          char *ptr = strstr (entry->text, ": ().");
+          if (!ptr)
+            return;
+          ptr[0] = '\0';
+          rest = ptr += sizeof (": ().");
+
+          info = xmalloc (name_len +  6);
+          snprintf (info, name_len + 6, ": (%s).", name);
+          text = concat (entry->text, info, rest);
+          free (info);
+          if (entry->text)
+            free (entry->text);
+          entry->text = text;
+          entry->text_len = strlen (entry->text);
+          entry->missing_name = 0;
+          entry->missing_basename = 0;
+        }
+    }
+}
+
+
+/* Add NAME to the start of any entry in ENTRIES that is missing a name 
+   component.  If NAME doesn't start with `*', it is formatted to look 
+   like an Info entry.  */
+void
+add_missing_names (struct spec_entry *entries, char *name)
+{
+  struct spec_entry *entry;
+  for (entry = entries; entry; entry = entry->next)
+    {
+      if (entry->missing_name)
+        {
+          char *text;
+          /* Prepend NAME onto ENTRY->TEXT. */
+          int add_nl = 1;
+          if (entry->text)
+            if (entry->text[entry->text_len - 1] == '\n')
+              add_nl = 0;
+
+          if (name[0] == '*')
+            text = concat (name, entry->text == NULL ? "" : entry->text, 
+                           add_nl ? "\n" : "");
+          else
+            {
+              size_t full_name_len = strlen (name) * 2 + 9;
+              char *full_name = xmalloc (full_name_len);
+              snprintf (full_name, full_name_len, "* %s: (%s).", name, name);
+              text = concat (full_name, 
+                             entry->text == NULL ? "" : entry->text, 
+                             add_nl ? "\n" : "");
+              free (full_name);
+            }
+          if (entry->text)
+            free (entry->text);
+          entry->text = text;
+          entry->text_len = strlen (entry->text);
+          entry->missing_name = 0;
+          entry->missing_basename = 0;
+        }
+    }
+}
+
+/* Append DESC to every entry in ENTRIES that needs it. */
+
+void
+add_missing_descriptions (struct spec_entry *entries, char *desc)
+{
+  struct spec_entry *entry;
+  for (entry = entries; entry; entry = entry->next)
+    {
+      if (entry->missing_description)
+        {
+          char *text;
+          int add_nl = 1;
+          if (entry->text)
+            if (entry->text[entry->text_len - 1] == '\n')
+              add_nl = 0;
+          /* Append DESC onto ENTRY->TEXT. */
+          text = concat (entry->text == NULL ? "" : entry->text, desc,
+                               add_nl ? "\n" : "");
+          if (entry->text)
+            free (entry->text);
+          entry->text = text;
+          entry->text_len = strlen (entry->text);
+        }
+    }
+}
+
+
+/* Detect old-style Debian `--section REGEX TITLE' semantics in ARGV.
+   When detected the options are munged to look like:
+     `--regex REGEX --section TITLE --add-once'
+   Return 1 if munging took place, return 0 if not.
+   Otherwise return a negative number if something went wrong.
+   NEW_ARGC, and NEW_ARGV are filled with the newly munged options
+   when munging took place.
+ */
+static int
+munge_old_style_debian_options (int argc, char **argv, 
+                                int *new_argc, char ***new_argv)
+{
+  char *opt = NULL;
+  int i, err;
+  char *argz = NULL;
+  size_t argz_len = 0;
+  const char *regex, *title;
+  int munge = 0;
+
+  /* Flip through the options to detect the old `--section REGEX TITLE' 
+     syntax */
+  for (i = 0; i < argc; i++)
+    {
+      if (strcmp (argv[i], "--section") == 0)
+        {
+          FILE *fileptr;
+          /* Go forward one arg and obtain the REGEX. */
+          if (i + 1 < argc)
+            i++;
+          else
+            return -1;
+          regex = argv[i];
+          /* Go forward another arg and obtain the TITLE. */
+          if (i + 1 < argc)
+            i++;
+          else
+            return -1;
+          title = argv[i];
+          /* When the title starts with a `-' it's probably an option,
+             and not a title. */
+          if (title[0] == '-')
+            break;
+          /* When the title is a filename it's probably an Info file, or
+             a dir file, and not a title. */
+          fileptr = fopen (title, "r");
+          if (fileptr)
+            {
+              fclose (fileptr);
+              break;
+            }
+          /* Okay, it looks like we're using the old debian syntax 
+             for --section. */
+          munge = 1;
+        
+          /* Okay, we munge the options to look like this:
+             --regex=REGEX --section=TITLE --add-once */
+          opt = xmalloc (strlen (regex) + sizeof ("--regex="));
+          if (sprintf (opt, "--regex=%s", regex) == -1)
+            err = 1;
+          if (!err)
+            err = argz_add (&argz, &argz_len, opt);
+          free (opt); opt = NULL;
+
+          opt = xmalloc (strlen (regex) + sizeof ("--section="));
+          if (sprintf (opt, "--section=%s", title) == -1)
+            err = 1;
+          if (!err)
+            err = argz_add (&argz, &argz_len, opt);
+          free (opt); opt = NULL;
+
+          if (!err)
+            err = argz_add (&argz, &argz_len, "--add-once");
+        }
+      else
+        err = argz_add (&argz, &argz_len, argv[i]); 
+      if (err)
+        return -1;
+    }
+
+  if (munge)
+    {
+      *new_argc = argz_count (argz, argz_len);
+      *new_argv = xmalloc ((*new_argc + 1) * sizeof (char *));
+
+      opt = NULL; i = 0;
+      while ((opt = argz_next (argz, argz_len, opt)))
+        {
+          (*new_argv)[i] = xstrdup (opt);
+          i++;
+        }
+      (*new_argv)[*new_argc] = NULL;
+    }
+  free (argz);
+  return munge;
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  char *opened_dirfilename;
+  char *compression_program;
+  char *infile_sans_info;
+  char *infile = 0, *dirfile = 0;
+  int calign = -1;
+  int align  = -1;
+  int maxwidth = -1;
+
+  /* Record the text of the Info file, as a sequence of characters
+     and as a sequence of lines.  */
+  char *input_data = NULL;
+  int input_size = 0;
+  struct line_data *input_lines = NULL;
+  int input_nlines = 0;
+
+  /* Record here the specified section names and directory entries.  */
+  struct spec_section *input_sections = NULL;
+  struct spec_entry *entries_to_add = NULL;
+  struct spec_entry *entries_to_add_from_file = NULL;
+  int n_entries_to_add = 0;
+
+  /* Record the old text of the dir file, as plain characters,
+     as lines, and as nodes.  */
+  char *dir_data;
+  int dir_size;
+  int dir_nlines;
+  struct line_data *dir_lines;
+  struct node *dir_nodes;
+
+  /* Nonzero means --delete was specified (just delete existing entries).  */
+  int delete_flag = 0;
+  int something_deleted = 0;
+
+  /* Nonzero means -quiet/--silent was specified.  */
+  int quiet_flag = 0;
+
+  /* Nonzero means --debug was specified.  */
+  int debug_flag = 0;
+
+  int i;
+
+#ifdef HAVE_SETLOCALE
+  /* Set locale via LC_ALL.  */
+  setlocale (LC_ALL, "");
+#endif
+
+  /* Set the text message domain.  */
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+
+  munge_old_style_debian_options (argc, argv, &argc, &argv);
+
+  while (1)
+    {
+      int opt = getopt_long (argc, argv, 
+                             "i:d:e:s:t:E:c:C:W:A:hHrk1Ia", longopts, 0);
+
+      if (opt == EOF)
+        break;
+
+      switch (opt)
+        {
+        case 0:
+          /* If getopt returns 0, then it has already processed a
+             long-named option.  We should do nothing.  */
+          break;
+
+        case 1:
+          abort ();
+
+        case '1':
+          add_entries_into_all_matching_sections = 0;
+          break;
+
+        case 'a':
+          order_new_sections_alphabetically_flag = 0;
+          break;
+
+        case 'A':
+          {
+            char *end = NULL;
+            unsigned long int val;
+            val = strtoul (optarg, &end, 0);
+            if (end == NULL || end == optarg || *end != '\0')
+              suggest_asking_for_help ();
+            align = val;
+            if (align <= 0)
+              suggest_asking_for_help ();
+          }
+          break;
+
+        case 'c':
+        
+          {
+            struct spec_entry *next;
+            size_t length = strlen (optarg);
+
+            if (!entries_to_add)
+              {
+                next = 
+                  (struct spec_entry *) xmalloc (sizeof (struct spec_entry));
+            
+                next->text = NULL;
+                next->text_len = 0;
+                next->entry_sections = NULL;
+                next->entry_sections_tail = NULL;
+                next->missing_name = 1;
+                next->missing_basename = 1;
+                next->next = entries_to_add;
+                entries_to_add = next;
+                n_entries_to_add++;
+              }
+            else
+              next = entries_to_add;
+                
+            next->missing_description = 0;
+            if (next->text)
+              {
+                char *nl = strrchr (next->text, '\n');
+                if (nl)
+                  nl[0] = '\0';
+              }
+            /* Concat the description onto the current entry, adding a 
+               newline if we need one. */
+            next->text = concat (next->text == NULL ? "" : next->text, optarg, 
+                                 optarg[length - 1] == '\n' ? "" : "\n");
+            next->text_len = strlen (next->text);
+          }
+          break;
+
+        case 'C':
+          {
+            char *end = NULL;
+            unsigned long int val;
+            val = strtoul (optarg, &end, 0);
+            if (end == NULL || end == optarg || *end != '\0')
+              suggest_asking_for_help ();
+            calign = val;
+            if (calign <= 0)
+              suggest_asking_for_help ();
+          }
+          break;
+
+        case 'd':
+          if (dirfile)
+            {
+              fprintf (stderr, _("%s: already have dir file: %s\n"),
+                       progname, dirfile);
+              suggest_asking_for_help ();
+            }
+          dirfile = optarg;
+          break;
+
+        case 'D':
+          if (dirfile)
+            {
+              fprintf (stderr, _("%s: already have dir file: %s\n"),
+                       progname, dirfile);
+              suggest_asking_for_help ();
+            }
+          dirfile = concat (optarg, "", "/dir");
+          break;
+
+        case 't':
+          {
+            struct spec_entry *next
+              = (struct spec_entry *) xmalloc (sizeof (struct spec_entry));
+
+            size_t length;
+            if (optarg[0] != '*')
+              {
+                /* Make enough space for "* foo: ().\n". */
+                length = strlen (optarg) + 9;
+                next->text = xmalloc (length);
+                snprintf (next->text, length, "* %s: ().\n", optarg);
+                next->missing_basename = 1;
+                /* The basename will be inserted in between the parentheses
+                   at a later time.  See add_missing_basenames. */
+              }
+            else
+              {
+                /* Make enough space for "foo\n". */
+                length = strlen (optarg) + 2;
+                next->text = xmalloc (length);
+                snprintf (next->text, length, "%s\n", optarg);
+                next->missing_basename = 0;
+                /* FIXME: check for info entry correctness in TEXT. 
+                   e.g. `* Aaa: (bbb).' */
+              }
+
+            next->text_len = length - 1;
+            next->entry_sections = NULL;
+            next->entry_sections_tail = NULL;
+            next->next = entries_to_add;
+            next->missing_name = 0;
+            next->missing_description = 1;
+            entries_to_add = next;
+            n_entries_to_add++;
+          }
+          break;
+
+        case 'e':
+          {
+            struct spec_entry *next
+              = (struct spec_entry *) xmalloc (sizeof (struct spec_entry));
+            int olen = strlen (optarg);
+            if (! (*optarg != 0 && optarg[olen - 1] == '\n'))
+              {
+                optarg = concat (optarg, "\n", "");
+                olen++;
+              }
+            next->text = optarg;
+            next->text_len = olen;
+            next->entry_sections = NULL;
+            next->entry_sections_tail = NULL;
+            next->next = entries_to_add;
+            next->missing_name = 0;
+            next->missing_basename = 0;
+            next->missing_description = 0;
+            entries_to_add = next;
+            n_entries_to_add++;
+          }
+          break;
+
+        case 'g':
+          debug_flag = 1;
+          break;
+
+        case 'h':
+        case 'H':
+          print_help ();
+          xexit (0);
+
+        case 'i':
+          if (infile)
+            {
+              fprintf (stderr, _("%s: Specify the Info file only once.\n"),
+                       progname);
+              suggest_asking_for_help ();
+            }
+          infile = optarg;
+          break;
+
+        case 'I':
+          indent_flag = 0;
+          break;
+
+        case 'k':
+          keep_old_flag = 1;
+          break;
+
+        case 'n':
+          chicken_flag = 1;
+          break;
+
+        case 'q':
+          quiet_flag = 1;
+          break;
+
+        case 'r':
+          delete_flag = 1;
+          break;
+
+        case 'R':
+          {
+            int error;
+            if (psecreg)
+              {
+                warning 
+                  (_("Extra regular expression specified, ignoring `%s'"),
+                   optarg, 0);
+                break;
+              }
+            psecreg = (regex_t *) xmalloc (sizeof (regex_t));
+
+            error = regcomp (psecreg, optarg, REG_ICASE|REG_NOSUB);
+            if (error != 0)
+              {
+                int errbuf_size = regerror (error, psecreg, NULL, 0);
+                char *errbuf = (char *) xmalloc (errbuf_size);
+                regerror (error, psecreg, errbuf, errbuf_size);
+                fatal (_("Error in regular expression `%s': %s"),
+                       optarg, errbuf);
+              };
+          }
+          break;
+
+        case 's':
+          {
+            struct spec_section *next
+              = (struct spec_section *) xmalloc (sizeof (struct spec_section));
+            next->name = optarg;
+            next->next = input_sections;
+            next->missing = 1;
+            input_sections = next;
+          }
+          break;
+
+        case 'V':
+          printf ("install-info (GNU %s) %s\n", PACKAGE, VERSION);
+          puts ("");
+          printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
+This is free software: you are free to change and redistribute it.\n\
+There is NO WARRANTY, to the extent permitted by law.\n"),
+              "2008");
+          xexit (0);
+
+        case 'W':
+          {
+            char *end = NULL;
+            unsigned long int val;
+            val = strtoul (optarg, &end, 0);
+            if (end == NULL || end == optarg || *end != '\0')
+              suggest_asking_for_help ();
+            maxwidth = val;
+            if (maxwidth <= 0)
+              suggest_asking_for_help ();
+          }
+          break;
+
+        case 'x':
+          delete_flag = 1;
+          remove_exactly = 1;
+          break;
+
+        default:
+          suggest_asking_for_help ();
+        }
+    }
+
+  /* Interpret the non-option arguments as file names.  */
+  for (; optind < argc; ++optind)
+    {
+      if (infile == 0)
+        infile = argv[optind];
+      else if (dirfile == 0)
+        dirfile = argv[optind];
+      else
+        error (_("excess command line argument `%s'"), argv[optind], 0);
+    }
+
+  if (!infile)
+    fatal (_("No input file specified; try --help for more information."),
+           0, 0);
+  if (!dirfile)
+    fatal (_("No dir file specified; try --help for more information."), 0, 0);
+
+  /* Now read in the Info dir file.  */
+  if (debug_flag)
+    printf ("debug: reading dir file %s\n", dirfile);
+  dir_data = readfile (dirfile, &dir_size, ensure_dirfile_exists,
+                       &opened_dirfilename, &compression_program);
+  dir_lines = findlines (dir_data, dir_size, &dir_nlines);
+
+  parse_dir_file (dir_lines, dir_nlines, &dir_nodes);
+
+  if (!delete_flag)
+    {
+      /* Find which sections match our regular expression. */
+      if (psecreg)
+        {
+          struct node *node;
+          struct menu_section *section;
+          for (node = dir_nodes; node ; node = node->next)
+            for (section = node->sections; section ; section = section->next)
+              if (regexec (psecreg, section->name, 0, NULL, 0) == 0)
+                {
+                  /* we have a match! */
+                  struct spec_section *next = 
+                    (struct spec_section *) xmalloc 
+                    (sizeof (struct spec_section));
+                  next->name = section->name;
+                  next->next = input_sections;
+                  next->missing = 0;
+                  input_sections = next;
+                }
+        }
+
+    }
+
+  /* We will be comparing the entries in the dir file against the
+     current filename, so need to strip off any directory prefix and/or
+     [.info][.gz] suffix.  */
+  if (!remove_exactly) {
+    char *infile_basename = infile + strlen (infile);
+
+    if (HAVE_DRIVE (infile))
+      infile += 2;      /* get past the drive spec X: */
+
+    while (infile_basename > infile && !IS_SLASH (infile_basename[-1]))
+      infile_basename--;
+
+    infile_sans_info = strip_info_suffix (infile_basename);
+  } else
+    infile_sans_info = xstrdup(infile);
+
+  /* Now Read the Info file and parse it into lines, unless we're 
+     removing exactly.  */
+  if (!remove_exactly)
+    {
+      if (debug_flag)
+        printf ("debug: reading input file %s\n", infile);
+      input_data = readfile (infile, &input_size, NULL, NULL, NULL);
+      input_lines = findlines (input_data, input_size, &input_nlines);
+    }
+
+  i = parse_input (input_lines, input_nlines,
+                   &input_sections, &entries_to_add_from_file, delete_flag);
+  if (!delete_flag)
+    {
+      /* If there are no entries on the command-line at all, so we use the 
+         entries found in the Info file itself (if any). */
+      if (entries_to_add == NULL)
+        {
+          entries_to_add = entries_to_add_from_file;
+          n_entries_to_add = i;
+        }
+      /* There are entries on the command-line, and they override the entries
+         found in the Info file. */
+      else if (entries_to_add)
+        {
+          if (entries_to_add_from_file == NULL)
+            {
+              /* No entries found in the file anyway.  Fill in any 
+                 missing names with the info file's basename.  We're out
+                 of luck for any missing descriptions. */
+              add_missing_names (entries_to_add, infile_sans_info);
+              /* add_missing_descriptions (entries_to_add, "\n"); */
+            }
+          else
+            {
+              /* Fill in any missing names or descriptions with what was
+                 found in the Info file. */
+              char *desc = NULL;
+              size_t desc_len = 0;
+              char *name = NULL;
+              size_t name_len = 0;
+              split_entry (entries_to_add_from_file->text, &name, &name_len,
+                           &desc, &desc_len);
+              if (name)
+                {
+                  /* If the name doesn't look right, bail and use the 
+                     name based on the Info file. */
+                  if (name[0] != '*')
+                    add_missing_names (entries_to_add, infile_sans_info);
+                  else
+                    add_missing_names (entries_to_add, name);
+                  free (name);
+                }
+
+              if (desc)
+                {
+                  add_missing_descriptions (entries_to_add, desc);
+                  free (desc);
+                }
+            }
+        }
+            
+      /* Lastly, fill in any missing basenames that might still be hanging
+         around from --name options on the command-line. */
+      add_missing_basenames (entries_to_add, infile_sans_info);
+
+      /* Reformat the new entries if we're doing that. */
+      if (indent_flag)
+        {
+          char *no_indent = getenv ("INSTALL_INFO_NO_INDENT");
+          if (!no_indent)
+            reformat_new_entries (entries_to_add, calign, align, maxwidth);
+        }
+
+      /* If we got no sections, default to "Miscellaneous".  */
+      if (input_sections == NULL)
+        {
+          input_sections = (struct spec_section *)
+            xmalloc (sizeof (struct spec_section));
+          input_sections->name = "Miscellaneous";
+          input_sections->next = NULL;
+          input_sections->missing = 1;
+        }
+
+      if (entries_to_add == 0)
+        { /* No need to abort here, the original info file may not
+             have the requisite Texinfo commands.  This is not
+             something an installer should have to correct (it's a
+             problem for the maintainer), and there's no need to cause
+             subsequent parts of `make install' to fail.  */
+          if (!quiet_flag)
+            warning (_("no info dir entry in `%s'"), infile, 0);
+          xexit (0);
+        }
+
+      /* If the entries came from the command-line arguments, their
+         entry_sections pointers are not yet set.  Walk the chain of
+         the entries and for each entry update entry_sections to point
+         to the head of the list of sections where this entry should
+         be put.  Note that all the entries specified on the command
+         line get put into ALL the sections we've got, either from the
+         Info file, or (under --section) from the command line,
+         because in the loop below every entry inherits the entire
+         chain of sections.  */
+      if (n_entries_to_add > 0 && entries_to_add->entry_sections == NULL)
+        {
+          struct spec_entry *ep;
+
+          for (ep = entries_to_add; ep; ep = ep->next)
+            ep->entry_sections = input_sections;
+        }
+    }
+
+  if (delete_flag)
+    {
+      something_deleted = mark_entry_for_deletion (dir_lines, dir_nlines, 
+                                                   infile_sans_info);
+      if (!something_deleted && !remove_exactly)
+        {
+          struct spec_entry *entry;
+          for (entry = entries_to_add; entry; entry = entry->next)
+            {
+              /* If the entry came from the info file... */
+              if (entry->entry_sections != NULL)
+                {
+                  char *name = extract_menu_item_name (entry->text);
+                  something_deleted = 
+                    mark_entry_for_deletion (dir_lines, dir_nlines, name);
+                  free (name);
+                }
+            }
+      
+          if (!something_deleted)
+            {
+              struct spec_entry *entry;
+              for (entry = entries_to_add; entry; entry = entry->next)
+                {
+                  /* If the entry came from the command-line... */
+                  if (entry->entry_sections == NULL)
+                    something_deleted = 
+                      mark_entry_for_deletion (dir_lines, dir_nlines, 
+                                               entry->text);
+                }
+            }
+        }
+    }
+    
+  /* Check for sections with zero entries and mark them for deletion. */
+  if (delete_flag && something_deleted && !keep_old_flag)
+    {
+      struct node *node;
+      struct menu_section *section;
+      int section_empty;
+
+      for (node = dir_nodes; node ; node = node->next)
+        for (section = node->sections; section ; section = section->next)
+          {
+            section_empty = 1;
+            for (i = section->end_line; i > section->start_line; i--)
+              {
+                if (dir_lines[i - 1].delete == 0 && 
+                    dir_lines[i - 1].size != 0)
+                  {
+                    section_empty = 0;
+                    break;
+                  }
+              }
+
+            if (section_empty)
+              {
+                /* This gets rid of any trailing empty lines at the end  
+                   of the section, and the title too. */
+                for (i = section->end_line; i >= section->start_line; i--)
+                  dir_lines[i - 1].delete = 1;
+              }
+          }
+    }
+
+  /* Decide where to add the new entries (unless --delete was used).
+     Find the menu sections to add them in.
+     In each section, find the proper alphabetical place to add
+     each of the entries.  */
+  if (!delete_flag)
+    {
+      struct node *node;
+      struct menu_section *section;
+      struct spec_section *spec;
+
+      for (node = dir_nodes; node; node = node->next)
+        for (section = node->sections; section; section = section->next)
+          {
+            for (i = section->end_line; i > section->start_line; i--)
+              if (dir_lines[i - 1].size != 0)
+                break;
+            section->end_line = i;
+
+            for (spec = input_sections; spec; spec = spec->next)
+              if (!strcmp (spec->name, section->name))
+                break;
+            if (spec)
+              {
+                int add_at_line = section->end_line;
+                struct spec_entry *entry;
+                /* Say we have found at least one section with this name,
+                   so we need not add such a section.  */
+                spec->missing = 0;
+                /* For each entry, find the right place in this section
+                   to add it.  */
+                for (entry = entries_to_add; entry; entry = entry->next)
+                  {
+                    /* Did they at all want this entry to be put into
+                       this section?  */
+                    for (spec = entry->entry_sections;
+                         spec && spec != entry->entry_sections_tail;
+                         spec = spec->next)
+                      {
+                        if (!strcmp (spec->name, section->name))
+                          break;
+                      }
+                    if (!spec || spec == entry->entry_sections_tail)
+                      continue;
+
+                    /* Subtract one because dir_lines is zero-based,
+                       but the `end_line' and `start_line' members are
+                       one-based.  */
+                    for (i = section->end_line - 1;
+                         i >= section->start_line - 1; i--)
+                      {
+                        /* If an entry exists with the same name,
+                           and was not marked for deletion
+                           (which means it is for some other file),
+                           we are in trouble.  */
+                        if (dir_lines[i].start[0] == '*'
+                            && menu_line_equal (entry->text, entry->text_len,
+                                                dir_lines[i].start,
+                                                dir_lines[i].size)
+                            && !dir_lines[i].delete)
+                          {
+                            if (keep_old_flag)
+                              {
+                                add_at_line = -1;
+                                break;
+                              }
+                            else
+                              {
+                                int j;
+                                dir_lines[i].delete = 1;
+                                for (j = i + 1; j < section->end_line; j++)
+                                  {
+                                    if (dir_lines[j].start[0] == '*')
+                                      break;
+                                    dir_lines[j].delete = 1;
+                                  }
+                              }
+                          }
+                        if (dir_lines[i].start[0] == '*'
+                            && menu_line_lessp (entry->text, entry->text_len,
+                                                dir_lines[i].start,
+                                                dir_lines[i].size))
+                          add_at_line = i;
+                      }
+                    if (add_at_line < 0)
+                      continue;
+                    insert_entry_here (entry, add_at_line,
+                                       dir_lines, n_entries_to_add);
+                  }
+              }
+          }
+
+    }
+  /* Decide where to add the new sections (unless --delete was used).
+     Alphabetically find the menu sections to add them before.  */
+  if (!delete_flag)
+    {
+      struct node *node;
+      struct node *top = NULL;
+
+      /* Find the `Top' node. */
+      for (node = dir_nodes; node; node = node->next)
+        if (node->name && strcmp (node->name, "Top") == 0)
+          top = node;
+
+      if (top)
+        {
+          struct spec_section *spec;
+          int found = 0;
+          struct line_data *target_line = NULL;
+          for (spec = input_sections; spec; spec = spec->next)
+            {
+              found = 0;
+              target_line = NULL;
+              if (!spec->missing)
+                continue;
+              if (order_new_sections_alphabetically_flag)
+                {
+                  struct menu_section *section;
+                  struct menu_section *prev_section = NULL;
+              
+                  /* Look for the first section name that 
+                     exceeds SPEC->NAME. */
+                  for (section = top->sections; section ; 
+                       section = section->next)
+                    {
+                      found = (mbscasecmp (spec->name, section->name) < 0);
+                      if (found)
+                        {
+                          /* Mark the section for addition at this point. */
+                          if (prev_section)
+                            target_line = &dir_lines[prev_section->end_line];
+                          else
+                            target_line = 
+                              &dir_lines[top->sections->start_line - 2];
+
+                          break;
+                        }
+                      prev_section = section;
+                    }
+                }
+                  
+              /* When we can't put a section anywhere, we put it at the 
+                 bottom of the file. */
+              if (!found)
+                target_line = &dir_lines[top->end_line];
+
+              /* Add the section to our list of sections being added
+                 at this point of the DIR file. */
+              target_line->num_sections_to_add++;
+              target_line->add_sections_before = 
+                (struct spec_section **) xrealloc 
+                (target_line->add_sections_before, 
+                 (target_line->num_sections_to_add *
+                  sizeof (struct spec_section *)));
+              i = target_line->num_sections_to_add - 1;
+              target_line->add_sections_before[i] = spec;
+            }
+        }
+    }
+
+  if (delete_flag && !something_deleted && !quiet_flag)
+    warning (_("no entries found for `%s'; nothing deleted"), infile, 0);
+
+  if (debug_flag)
+    printf ("debug: writing dir file %s\n", opened_dirfilename);
+  if (chicken_flag)
+    printf ("test mode, not updating dir file %s\n", opened_dirfilename);
+  else
+    output_dirfile (opened_dirfilename, dir_nlines, dir_lines,
+                    n_entries_to_add, entries_to_add,
+                    input_sections, compression_program);
+
+  xexit (0);
+  return 0; /* Avoid bogus warnings.  */
+}
+
+/* Divide the text at DATA (of SIZE bytes) into lines.
+   Return a vector of struct line_data describing the lines.
+   Store the length of that vector into *NLINESP.  */
+
+struct line_data *
+findlines (char *data, int size, int *nlinesp)
+{
+  int i;
+  int lineflag = 1;
+  int lines_allocated = 511;
+  int filled = 0;
+  struct line_data *lines
+    = xmalloc ((lines_allocated + 1) * sizeof (struct line_data));
+
+  for (i = 0; i < size; i++)
+    {
+      if (lineflag)
+        {
+          if (filled == lines_allocated)
+            {
+              /* try to keep things somewhat page-aligned */
+              lines_allocated = ((lines_allocated + 1) * 2) - 1;
+              lines = xrealloc (lines, (lines_allocated + 1)
+                                       * sizeof (struct line_data));
+            }
+          lines[filled].start = &data[i];
+          lines[filled].add_entries_before = 0;
+          lines[filled].add_sections_before = NULL;
+          lines[filled].num_sections_to_add = 0;
+          lines[filled].delete = 0;
+          if (filled > 0)
+            lines[filled - 1].size
+              = lines[filled].start - lines[filled - 1].start - 1;
+          filled++;
+        }
+      lineflag = (data[i] == '\n');
+    }
+  if (filled > 0)
+    lines[filled - 1].size = &data[i] - lines[filled - 1].start - lineflag;
+
+  /* Do not leave garbage in the last element.  */
+  lines[filled].start = NULL;
+  lines[filled].add_entries_before = NULL;
+  lines[filled].add_sections_before = NULL;
+  lines[filled].num_sections_to_add = 0;
+  lines[filled].delete = 0;
+  lines[filled].size = 0;
+
+  *nlinesp = filled;
+  return lines;
+}
+
+/* This is the comparison function for qsort for a vector of pointers to
+   struct spec_section.  (Have to use const void * as the parameter type
+   to avoid incompatible-with-qsort warnings.)
+   Compare the section names.  */
+
+int
+compare_section_names (const void *p1, const void *p2)
+{
+  struct spec_section **sec1 = (struct spec_section **) p1;
+  struct spec_section **sec2 = (struct spec_section **) p2;
+  char *name1 = (*sec1)->name;
+  char *name2 = (*sec2)->name;
+  return strcmp (name1, name2);
+}
+
+/* This is the comparison function for qsort
+   for a vector of pointers to struct spec_entry.
+   Compare the entries' text.  */
+
+int
+compare_entries_text (const void *p1, const void *p2)
+{
+  struct spec_entry **entry1 = (struct spec_entry **) p1;
+  struct spec_entry **entry2 = (struct spec_entry **) p2;
+  char *text1 = (*entry1)->text;
+  char *text2 = (*entry2)->text;
+  char *colon1 = strchr (text1, ':');
+  char *colon2 = strchr (text2, ':');
+  int len1, len2;
+
+  if (!colon1)
+    len1 = strlen (text1);
+  else
+    len1 = colon1 - text1;
+  if (!colon2)
+    len2 = strlen (text2);
+  else
+    len2 = colon2 - text2;
+  return mbsncasecmp (text1, text2, len1 <= len2 ? len1 : len2);
+}
+
+/* Insert ENTRY into the add_entries_before vector
+   for line number LINE_NUMBER of the dir file.
+   DIR_LINES and N_ENTRIES carry information from like-named variables
+   in main.  */
+
+void
+insert_entry_here (struct spec_entry *entry, int line_number,
+                   struct line_data *dir_lines, int n_entries)
+{
+  int i, j;
+
+  if (dir_lines[line_number].add_entries_before == 0)
+    {
+      dir_lines[line_number].add_entries_before
+        = (struct spec_entry **) xmalloc (n_entries * sizeof (struct spec_entry *));
+      for (i = 0; i < n_entries; i++)
+        dir_lines[line_number].add_entries_before[i] = 0;
+    }
+
+  /* Find the place where this entry belongs.  If there are already
+     several entries to add before LINE_NUMBER, make sure they are in
+     alphabetical order.  */
+  for (i = 0; i < n_entries; i++)
+    if (dir_lines[line_number].add_entries_before[i] == 0
+        || menu_line_lessp (entry->text, strlen (entry->text),
+                            dir_lines[line_number].add_entries_before[i]->text,
+                            strlen (dir_lines[line_number].add_entries_before[i]->text)))
+      break;
+
+  if (i == n_entries)
+    abort ();
+
+  /* If we need to plug ENTRY into the middle of the
+     ADD_ENTRIES_BEFORE array, move the entries which should be output
+     after this one down one notch, before adding a new one.  */
+  if (dir_lines[line_number].add_entries_before[i] != 0)
+    for (j = n_entries - 1; j > i; j--)
+      dir_lines[line_number].add_entries_before[j]
+        = dir_lines[line_number].add_entries_before[j - 1];
+
+  dir_lines[line_number].add_entries_before[i] = entry;
+}
diff --git a/Build/source/utils/texinfo/install-info/tests/Makefile.am b/Build/source/utils/texinfo/install-info/tests/Makefile.am
new file mode 100644
index 00000000000..cddf2f92e25
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/Makefile.am
@@ -0,0 +1,224 @@
+# $Id: Makefile.am,v 1.2 2008/04/17 17:54:17 karl Exp $
+# Makefile.am for texinfo/util/tests/install-info.
+# Run automake in ../../../ to produce Makefile.in from this.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+TESTS=ii-0001-test ii-0002-test ii-0003-test ii-0004-test ii-0005-test \
+ii-0006-test ii-0007-test ii-0008-test ii-0009-test ii-0010-test \
+ii-0011-test ii-0012-test ii-0013-test ii-0014-test ii-0015-test \
+ii-0016-test ii-0017-test ii-0018-test ii-0019-test ii-0020-test \
+ii-0021-test ii-0022-test ii-0023-test ii-0024-test ii-0025-test \
+ii-0026-test ii-0027-test ii-0028-test ii-0029-test ii-0030-test \
+ii-0031-test ii-0032-test ii-0033-test ii-0034-test ii-0035-test \
+ii-0036-test ii-0037-test ii-0038-test ii-0039-test ii-0040-test \
+ii-0041-test ii-0042-test ii-0043-test ii-0044-test ii-0045-test \
+ii-0046-test ii-0047-test ii-0048-test ii-0049-test ii-0050-test
+
+noinst_SCRIPTS=$(TESTS)
+
+EXTRA_DIST=\
+ii-0001-input-dir-file \
+ii-0001-input-info-file \
+ii-0001-expected-dir-file \
+ii-0001-test \
+ii-0002-input-dir-file \
+ii-0002-input-info-file \
+ii-0002-expected-dir-file \
+ii-0002-test \
+ii-0003-input-dir-file \
+ii-0003-input-info-file \
+ii-0003-expected-dir-file \
+ii-0003-test \
+ii-0004-input-dir-file \
+ii-0004-input-info-file \
+ii-0004-expected-dir-file \
+ii-0004-test \
+ii-0005-input-dir-file \
+ii-0005-input-info-file \
+ii-0005-expected-dir-file \
+ii-0005-test \
+ii-0006-input-dir-file \
+ii-0006-input-info-file \
+ii-0006-expected-dir-file \
+ii-0006-test \
+ii-0007-input-dir-file \
+ii-0007-input-info-file \
+ii-0007-expected-dir-file \
+ii-0007-test \
+ii-0008-input-dir-file \
+ii-0008-input-info-file \
+ii-0008-expected-dir-file \
+ii-0008-test \
+ii-0009-input-dir-file \
+ii-0009-input-info-file \
+ii-0009-expected-dir-file \
+ii-0009-test \
+ii-0010-input-dir-file \
+ii-0010-input-info-file \
+ii-0010-expected-dir-file \
+ii-0010-test \
+ii-0011-input-dir-file \
+ii-0011-input-info-file \
+ii-0011-expected-dir-file \
+ii-0011-test \
+ii-0012-input-dir-file \
+ii-0012-input-info-file \
+ii-0012-expected-dir-file \
+ii-0012-test \
+ii-0013-input-dir-file \
+ii-0013-input-info-file \
+ii-0013-expected-dir-file \
+ii-0013-test \
+ii-0014-input-dir-file \
+ii-0014-input-info-file \
+ii-0014-expected-dir-file \
+ii-0014-test \
+ii-0015-input-dir-file \
+ii-0015-input-info-file \
+ii-0015-expected-dir-file \
+ii-0015-test \
+ii-0016-input-dir-file \
+ii-0016-input-info-file \
+ii-0016-expected-dir-file \
+ii-0016-test \
+ii-0017-input-dir-file \
+ii-0017-input-info-file \
+ii-0017-expected-dir-file \
+ii-0017-test \
+ii-0018-input-dir-file \
+ii-0018-input-info-file \
+ii-0018-test \
+ii-0019-input-dir-file \
+ii-0019-input-info-file \
+ii-0019-test \
+ii-0020-input-dir-file \
+ii-0020-input-info-file \
+ii-0020-expected-dir-file \
+ii-0020-test \
+ii-0021-input-dir-file \
+ii-0021-input-info-file \
+ii-0021-expected-dir-file \
+ii-0021-test \
+ii-0022-input-dir-file \
+ii-0022-input-info-file \
+ii-0022-expected-dir-file \
+ii-0022-test \
+ii-0023-input-dir-file \
+ii-0023-input-info-file \
+ii-0023-expected-dir-file \
+ii-0023-test \
+ii-0024-input-dir-file \
+ii-0024-input-info-file \
+ii-0024-expected-dir-file \
+ii-0024-test \
+ii-0025-input-dir-file \
+ii-0025-input-info-file \
+ii-0025-expected-dir-file \
+ii-0025-test \
+ii-0026-input-dir-file \
+ii-0026-input-info-file \
+ii-0026-expected-dir-file \
+ii-0026-test \
+ii-0027-input-dir-file \
+ii-0027-input-info-file \
+ii-0027-expected-dir-file \
+ii-0027-test \
+ii-0028-input-dir-file \
+ii-0028-input-info-file \
+ii-0028-expected-dir-file \
+ii-0028-test \
+ii-0029-input-dir-file \
+ii-0029-input-info-file \
+ii-0029-expected-dir-file \
+ii-0029-test \
+ii-0030-input-dir-file \
+ii-0030-input-info-file \
+ii-0030-expected-dir-file \
+ii-0030-test \
+ii-0031-input-dir-file \
+ii-0031-input-info-file \
+ii-0031-expected-dir-file \
+ii-0031-test \
+ii-0032-input-dir-file \
+ii-0032-input-info-file \
+ii-0032-expected-dir-file \
+ii-0032-test \
+ii-0033-input-dir-file \
+ii-0033-input-info-file \
+ii-0033-expected-dir-file \
+ii-0033-test \
+ii-0034-input-dir-file \
+ii-0034-input-info-file \
+ii-0034-expected-dir-file \
+ii-0034-test \
+ii-0035-input-dir-file \
+ii-0035-input-info-file \
+ii-0035-expected-dir-file \
+ii-0035-test \
+ii-0036-input-dir-file \
+ii-0036-input-info-file \
+ii-0036-expected-dir-file \
+ii-0036-test \
+ii-0037-input-dir-file \
+ii-0037-input-info-file \
+ii-0037-expected-dir-file \
+ii-0037-test \
+ii-0038-input-dir-file \
+ii-0038-input-info-file \
+ii-0038-expected-dir-file \
+ii-0038-test \
+ii-0039-input-dir-file \
+ii-0039-input-info-file \
+ii-0039-expected-dir-file \
+ii-0039-test \
+ii-0040-input-dir-file \
+ii-0040-input-info-file \
+ii-0040-expected-dir-file \
+ii-0040-test \
+ii-0041-input-dir-file.gz \
+ii-0041-input-info-file \
+ii-0041-expected-dir-file.gz \
+ii-0041-test \
+ii-0042-input-dir-file \
+ii-0042-input-info-file \
+ii-0042-expected-dir-file \
+ii-0042-test \
+ii-0043-input-dir-file \
+ii-0043-input-info-file \
+ii-0043-expected-dir-file \
+ii-0043-test \
+ii-0044-input-dir-file \
+ii-0044-input-info-file \
+ii-0044-expected-dir-file \
+ii-0044-test \
+ii-0045-input-dir-file \
+ii-0045-input-info-file \
+ii-0045-expected-dir-file \
+ii-0045-test \
+ii-0046-input-dir-file \
+ii-0046-expected-dir-file \
+ii-0046-test \
+ii-0047-input-dir-file \
+ii-0047-input-info-file \
+ii-0047-expected-dir-file \
+ii-0047-test \
+ii-0048-input-dir-file \
+ii-0048-input-info-file \
+ii-0048-expected-dir-file \
+ii-0048-test \
+ii-0049-input-dir-file \
+ii-0049-input-info-file \
+ii-0049-expected-dir-file \
+ii-0049-test \
+ii-0050-input-dir-file.gz \
+ii-0050-input-info-file \
+ii-0050-expected-dir-file.gz \
+ii-0050-test \
+README
diff --git a/Build/source/utils/texinfo/install-info/tests/Makefile.in b/Build/source/utils/texinfo/install-info/tests/Makefile.in
new file mode 100644
index 00000000000..99e47301d54
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/Makefile.in
@@ -0,0 +1,846 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# $Id: Makefile.am,v 1.2 2008/04/17 17:54:17 karl Exp $
+# Makefile.am for texinfo/util/tests/install-info.
+# Run automake in ../../../ to produce Makefile.in from this.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = install-info/tests
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/defs.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
+	$(top_srcdir)/gnulib/m4/argz.m4 \
+	$(top_srcdir)/gnulib/m4/codeset.m4 \
+	$(top_srcdir)/gnulib/m4/eealloc.m4 \
+	$(top_srcdir)/gnulib/m4/environ.m4 \
+	$(top_srcdir)/gnulib/m4/error.m4 \
+	$(top_srcdir)/gnulib/m4/exitfail.m4 \
+	$(top_srcdir)/gnulib/m4/extensions.m4 \
+	$(top_srcdir)/gnulib/m4/getopt.m4 \
+	$(top_srcdir)/gnulib/m4/gettext.m4 \
+	$(top_srcdir)/gnulib/m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib/m4/glibc21.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib/m4/iconv.m4 \
+	$(top_srcdir)/gnulib/m4/include_next.m4 \
+	$(top_srcdir)/gnulib/m4/inline.m4 \
+	$(top_srcdir)/gnulib/m4/intlmacosx.m4 \
+	$(top_srcdir)/gnulib/m4/lib-ld.m4 \
+	$(top_srcdir)/gnulib/m4/lib-link.m4 \
+	$(top_srcdir)/gnulib/m4/lib-prefix.m4 \
+	$(top_srcdir)/gnulib/m4/localcharset.m4 \
+	$(top_srcdir)/gnulib/m4/longlong.m4 \
+	$(top_srcdir)/gnulib/m4/malloc.m4 \
+	$(top_srcdir)/gnulib/m4/malloca.m4 \
+	$(top_srcdir)/gnulib/m4/mbchar.m4 \
+	$(top_srcdir)/gnulib/m4/mbiter.m4 \
+	$(top_srcdir)/gnulib/m4/mbrtowc.m4 \
+	$(top_srcdir)/gnulib/m4/mbscasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbsncasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbstate_t.m4 \
+	$(top_srcdir)/gnulib/m4/mbswidth.m4 \
+	$(top_srcdir)/gnulib/m4/memchr.m4 \
+	$(top_srcdir)/gnulib/m4/memcpy.m4 \
+	$(top_srcdir)/gnulib/m4/memmove.m4 \
+	$(top_srcdir)/gnulib/m4/mkstemp.m4 \
+	$(top_srcdir)/gnulib/m4/nls.m4 \
+	$(top_srcdir)/gnulib/m4/onceonly.m4 \
+	$(top_srcdir)/gnulib/m4/po.m4 \
+	$(top_srcdir)/gnulib/m4/progtest.m4 \
+	$(top_srcdir)/gnulib/m4/setenv.m4 \
+	$(top_srcdir)/gnulib/m4/stdbool.m4 \
+	$(top_srcdir)/gnulib/m4/stdint.m4 \
+	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
+	$(top_srcdir)/gnulib/m4/strdup.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
+	$(top_srcdir)/gnulib/m4/string_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_time_h.m4 \
+	$(top_srcdir)/gnulib/m4/tempname.m4 \
+	$(top_srcdir)/gnulib/m4/unistd_h.m4 \
+	$(top_srcdir)/gnulib/m4/wchar.m4 \
+	$(top_srcdir)/gnulib/m4/wchar_t.m4 \
+	$(top_srcdir)/gnulib/m4/wctype.m4 \
+	$(top_srcdir)/gnulib/m4/wcwidth.m4 \
+	$(top_srcdir)/gnulib/m4/wint_t.m4 \
+	$(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = defs
+SCRIPTS = $(noinst_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H = @ALLOCA_H@
+AMTAR = @AMTAR@
+ARGZ_H = @ARGZ_H@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETOPT_H = @GETOPT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GREP = @GREP@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_IO_H = @HAVE_IO_H@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRNDUP = @HAVE_STRNDUP@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRSEP = @HAVE_STRSEP@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNSETENV = @HAVE_UNSETENV@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE__BOOL = @HAVE__BOOL@
+HELP2MAN = @HELP2MAN@
+HEVEA = @HEVEA@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POSUB = @POSUB@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+SYS_STAT_H = @SYS_STAT_H@
+SYS_TIME_H = @SYS_TIME_H@
+TERMLIBS = @TERMLIBS@
+TEX = @TEX@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VOID_UNSETENV = @VOID_UNSETENV@
+WCHAR_H = @WCHAR_H@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WCTYPE_H = @WCTYPE_H@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+native_tools = @native_tools@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+TESTS = ii-0001-test ii-0002-test ii-0003-test ii-0004-test ii-0005-test \
+ii-0006-test ii-0007-test ii-0008-test ii-0009-test ii-0010-test \
+ii-0011-test ii-0012-test ii-0013-test ii-0014-test ii-0015-test \
+ii-0016-test ii-0017-test ii-0018-test ii-0019-test ii-0020-test \
+ii-0021-test ii-0022-test ii-0023-test ii-0024-test ii-0025-test \
+ii-0026-test ii-0027-test ii-0028-test ii-0029-test ii-0030-test \
+ii-0031-test ii-0032-test ii-0033-test ii-0034-test ii-0035-test \
+ii-0036-test ii-0037-test ii-0038-test ii-0039-test ii-0040-test \
+ii-0041-test ii-0042-test ii-0043-test ii-0044-test ii-0045-test \
+ii-0046-test ii-0047-test ii-0048-test ii-0049-test ii-0050-test
+
+noinst_SCRIPTS = $(TESTS)
+EXTRA_DIST = \
+ii-0001-input-dir-file \
+ii-0001-input-info-file \
+ii-0001-expected-dir-file \
+ii-0001-test \
+ii-0002-input-dir-file \
+ii-0002-input-info-file \
+ii-0002-expected-dir-file \
+ii-0002-test \
+ii-0003-input-dir-file \
+ii-0003-input-info-file \
+ii-0003-expected-dir-file \
+ii-0003-test \
+ii-0004-input-dir-file \
+ii-0004-input-info-file \
+ii-0004-expected-dir-file \
+ii-0004-test \
+ii-0005-input-dir-file \
+ii-0005-input-info-file \
+ii-0005-expected-dir-file \
+ii-0005-test \
+ii-0006-input-dir-file \
+ii-0006-input-info-file \
+ii-0006-expected-dir-file \
+ii-0006-test \
+ii-0007-input-dir-file \
+ii-0007-input-info-file \
+ii-0007-expected-dir-file \
+ii-0007-test \
+ii-0008-input-dir-file \
+ii-0008-input-info-file \
+ii-0008-expected-dir-file \
+ii-0008-test \
+ii-0009-input-dir-file \
+ii-0009-input-info-file \
+ii-0009-expected-dir-file \
+ii-0009-test \
+ii-0010-input-dir-file \
+ii-0010-input-info-file \
+ii-0010-expected-dir-file \
+ii-0010-test \
+ii-0011-input-dir-file \
+ii-0011-input-info-file \
+ii-0011-expected-dir-file \
+ii-0011-test \
+ii-0012-input-dir-file \
+ii-0012-input-info-file \
+ii-0012-expected-dir-file \
+ii-0012-test \
+ii-0013-input-dir-file \
+ii-0013-input-info-file \
+ii-0013-expected-dir-file \
+ii-0013-test \
+ii-0014-input-dir-file \
+ii-0014-input-info-file \
+ii-0014-expected-dir-file \
+ii-0014-test \
+ii-0015-input-dir-file \
+ii-0015-input-info-file \
+ii-0015-expected-dir-file \
+ii-0015-test \
+ii-0016-input-dir-file \
+ii-0016-input-info-file \
+ii-0016-expected-dir-file \
+ii-0016-test \
+ii-0017-input-dir-file \
+ii-0017-input-info-file \
+ii-0017-expected-dir-file \
+ii-0017-test \
+ii-0018-input-dir-file \
+ii-0018-input-info-file \
+ii-0018-test \
+ii-0019-input-dir-file \
+ii-0019-input-info-file \
+ii-0019-test \
+ii-0020-input-dir-file \
+ii-0020-input-info-file \
+ii-0020-expected-dir-file \
+ii-0020-test \
+ii-0021-input-dir-file \
+ii-0021-input-info-file \
+ii-0021-expected-dir-file \
+ii-0021-test \
+ii-0022-input-dir-file \
+ii-0022-input-info-file \
+ii-0022-expected-dir-file \
+ii-0022-test \
+ii-0023-input-dir-file \
+ii-0023-input-info-file \
+ii-0023-expected-dir-file \
+ii-0023-test \
+ii-0024-input-dir-file \
+ii-0024-input-info-file \
+ii-0024-expected-dir-file \
+ii-0024-test \
+ii-0025-input-dir-file \
+ii-0025-input-info-file \
+ii-0025-expected-dir-file \
+ii-0025-test \
+ii-0026-input-dir-file \
+ii-0026-input-info-file \
+ii-0026-expected-dir-file \
+ii-0026-test \
+ii-0027-input-dir-file \
+ii-0027-input-info-file \
+ii-0027-expected-dir-file \
+ii-0027-test \
+ii-0028-input-dir-file \
+ii-0028-input-info-file \
+ii-0028-expected-dir-file \
+ii-0028-test \
+ii-0029-input-dir-file \
+ii-0029-input-info-file \
+ii-0029-expected-dir-file \
+ii-0029-test \
+ii-0030-input-dir-file \
+ii-0030-input-info-file \
+ii-0030-expected-dir-file \
+ii-0030-test \
+ii-0031-input-dir-file \
+ii-0031-input-info-file \
+ii-0031-expected-dir-file \
+ii-0031-test \
+ii-0032-input-dir-file \
+ii-0032-input-info-file \
+ii-0032-expected-dir-file \
+ii-0032-test \
+ii-0033-input-dir-file \
+ii-0033-input-info-file \
+ii-0033-expected-dir-file \
+ii-0033-test \
+ii-0034-input-dir-file \
+ii-0034-input-info-file \
+ii-0034-expected-dir-file \
+ii-0034-test \
+ii-0035-input-dir-file \
+ii-0035-input-info-file \
+ii-0035-expected-dir-file \
+ii-0035-test \
+ii-0036-input-dir-file \
+ii-0036-input-info-file \
+ii-0036-expected-dir-file \
+ii-0036-test \
+ii-0037-input-dir-file \
+ii-0037-input-info-file \
+ii-0037-expected-dir-file \
+ii-0037-test \
+ii-0038-input-dir-file \
+ii-0038-input-info-file \
+ii-0038-expected-dir-file \
+ii-0038-test \
+ii-0039-input-dir-file \
+ii-0039-input-info-file \
+ii-0039-expected-dir-file \
+ii-0039-test \
+ii-0040-input-dir-file \
+ii-0040-input-info-file \
+ii-0040-expected-dir-file \
+ii-0040-test \
+ii-0041-input-dir-file.gz \
+ii-0041-input-info-file \
+ii-0041-expected-dir-file.gz \
+ii-0041-test \
+ii-0042-input-dir-file \
+ii-0042-input-info-file \
+ii-0042-expected-dir-file \
+ii-0042-test \
+ii-0043-input-dir-file \
+ii-0043-input-info-file \
+ii-0043-expected-dir-file \
+ii-0043-test \
+ii-0044-input-dir-file \
+ii-0044-input-info-file \
+ii-0044-expected-dir-file \
+ii-0044-test \
+ii-0045-input-dir-file \
+ii-0045-input-info-file \
+ii-0045-expected-dir-file \
+ii-0045-test \
+ii-0046-input-dir-file \
+ii-0046-expected-dir-file \
+ii-0046-test \
+ii-0047-input-dir-file \
+ii-0047-input-info-file \
+ii-0047-expected-dir-file \
+ii-0047-test \
+ii-0048-input-dir-file \
+ii-0048-input-info-file \
+ii-0048-expected-dir-file \
+ii-0048-test \
+ii-0049-input-dir-file \
+ii-0049-input-info-file \
+ii-0049-expected-dir-file \
+ii-0049-test \
+ii-0050-input-dir-file.gz \
+ii-0050-input-info-file \
+ii-0050-expected-dir-file.gz \
+ii-0050-test \
+README
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  install-info/tests/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  install-info/tests/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+defs: $(top_builddir)/config.status $(srcdir)/defs.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+	srcdir=$(srcdir); export srcdir; \
+	list=' $(TESTS) '; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *$$ws$$tst$$ws*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+		echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *$$ws$$tst$$ws*) \
+		xfail=`expr $$xfail + 1`; \
+		echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      echo "SKIP: $$tst"; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    skipped="($$skip tests were not run)"; \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am html html-am \
+	info info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/Build/source/utils/texinfo/install-info/tests/README b/Build/source/utils/texinfo/install-info/tests/README
new file mode 100644
index 00000000000..c42ecc9d4c2
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/README
@@ -0,0 +1,172 @@
+$Id: README,v 1.1 2008/01/02 01:36:16 karl Exp $
+install-info/tests/README
+
+  Copyright (C) 2008 Free Software Foundation, Inc.
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
+This file describes each of the numbered install-info tests.
+
+0001: The 99% case. Installing an Info file.  Take a single entry from the 
+      Info file and put it into a pre-existing section in the DIR file.
+0002: Installing an Info file.  Take two entries from the Info file and put 
+      it into a pre-existing section in the DIR file.
+0003: Installing an Info file.  Take two entries from the Info file and put 
+      it into a pre-existing section in the DIR file.  The entries are 
+      described in two different `START-INFO-DIR-ENTRY' declarations.
+0004: Installing an Info file.  Take two entries from the Info file and put 
+      it into two pre-existing sections in the DIR file.  The entries are 
+      described in two different `INFO-DIR-SECTION' and `START-INFO-DIR-ENTRY' 
+      declarations.
+0005: Installing an Info file.  Take two entries from the Info file and put 
+      it into one pre-existing section and one non-existing section in the 
+      DIR file.  The entries are described in two different `INFO-DIR-SECTION' 
+      and `START-INFO-DIR-ENTRY' declarations.
+0006: The 99% case, try 2.  Installing an Info file.  Take a single entry 
+      from the Info file and put it into a pre-existing section in the DIR 
+      file, but this time the name is not capitalized.
+0007: The 99% case, try 3.  Installing an Info file.  Take a single entry 
+      from the Info file and put it into a pre-existing section in the DIR 
+      file, but this time the entry is not the final entry in the section.
+0008: The 99% case, try 4.  Installing an Info file.  Take a single entry 
+      from the Info file and put it into a pre-existing section in the DIR 
+      file, but this time the entry's description spans more than one line.
+0009: The 99% case, try 5.  Installing an Info file.  Take a single entry 
+      from the Info file and put it into a pre-existing section in the DIR 
+      file, but this time the entry's description does not start on the 
+      33rd column and requires indentation.
+0010: The 99% case, try 6.  Installing an Info file.  Take a single entry 
+      from the Info file and put it into a pre-existing section in the DIR 
+      file, but this time the entry's one line description requires 
+      multi-line indentation.
+0011: Installing an Info file.  Take a single entry from the Info file and 
+      put it into a pre-existing section in the DIR file, but this time do 
+      not indent the description.
+0012: Installing an Info file.  Take a single entry from the Info file and 
+      put it into a pre-existing section in the DIR file, but this time the 
+      entry already exists and will be replaced.
+0013: Installing an Info file.  Take a single entry from the Info file and 
+      put it into a pre-existing section in the DIR file, but this time the 
+      entry already exists and the --keep-old option is used to override the 
+      replacement.
+0014: Installing an Info file.  Take a single entry from the Info file and 
+      put it into a pre-existing section in the DIR file, but this time the 
+      entry already exists with a multi-line description and will be 
+      replaced with a single-line description.
+0015: Installing an Info file.  Take a single entry from the Info file and 
+      put it into a pre-existing section in the DIR file, but this time the 
+      entry already exists with a single-line description and will be 
+      replaced with a multi-line description.
+0016: Installing an Info file.  The Info file does not contain section or
+      entry hints, and neither a section nor an entry is specified on the 
+      command-line.  Installation does not occur, but is not an error.
+0017: Installing an initial Info file into a minimal DIR file.
+0018: Installing an initial Info file into an empty (0 byte) DIR file.  
+      Installation does not occur, and is an error.
+0019: Installing an initial Info file into an empty (2 byte) DIR file.  
+      Installation does not occur, and is an error.
+0020: Installing an Info file.  The Info file does not contain section or
+      entry hints, and a section is not specified on the command-line, but
+      a --description is.
+0021: Installing an Info file.  The Info file does not contain section or
+      entry hints, and a pre-existing --section is stated on the command-line
+      along with a --description.
+0022: Installing an Info file.  The Info file does not contain section or
+      entry hints, and a --name is specified on the command-line.  The NAME
+      starts with *, so the whole name (up to the period) is replaced.
+0023: Installing an Info file.  The Info file does not contain section or
+      entry hints, and a --name is specified on the command-line.  The NAME
+      does not start with a *, so just the name (up to the colon) is replaced.
+0024: Installing an Info file.  The Info file contains section and entry
+      hints, but we override the section with a non-existing one from the 
+      command-line.
+0025: Installing an Info file.  The Info file contains section and entry
+      hints, but we override the section with an existing one from the 
+      command-line.
+0026: Installing an Info file.  The Info file contains section and entry
+      hints, but we override the entry with an --entry on the command-line.
+0027: Installing an Info file.  The Info file contains section and entry
+      hints, but we override the entry with an --entry on the command-line,
+      and we also override the section with a --section on the command-line.
+0028: Installing an Info file.  The Info file contains section and entry
+      hints, but we override the name portion of the entry with a --name 
+      on the command-line.  The NAME starts with a `*' so it replaces the
+      entire name, up to the period.
+0029: Installing an Info file.  The Info file contains section and entry
+      hints, but we override the name portion of the entry with a --name 
+      on the command-line.  The NAME does not start with a `*' so it 
+      replaces the name, up to the colon and presumes the basename.
+0030: Installing an Info file.  The Info file contains section and entry
+      hints, but we override the description portion of the entry with a
+      --description on the command-line.
+0031: Installing an Info file.  The Info file contains section and entry
+      hints, but we override the description and the name with
+      --description and --name options on the command-line.  The NAME starts
+      with a `*' so it replaces the entire name, up to the period.
+0032: Installing an Info file.  The Info file contains section and entry
+      hints, but we try to override the section with a regular expression 
+      that does not match any existing sections in the DIR file.  The 
+      overriding cannot take place, and the entry is installed in the section
+      specified in the Info file.
+0033: Installing an Info file.  The Info file contains an entry hint, but no
+      section hint.  We try to specify the section with a --regex option on
+      the command-line, but the regular expression does not match any 
+      existing sections in the DIR file.
+0034: Installing an Info file.  The Info file contains an entry hint, but
+      no section hint, and we try to specify the section with a regular 
+      expression that does not match any existing sections in the DIR file.  
+      We also specify a --section on the command-line to ensure that the 
+      entry will be installed in a section that we explicitly name.
+0035: Installing an Info file.  The Info file contains section and entry 
+      hints, but we try to specify the section with a regular expression 
+      that does not match any existing sections in the DIR file.  We also 
+      specify a --section on the command-line to ensure that the entry will 
+      be installed in a section that we explicitly name.
+0036: Installing an Info file.  The Info file contains entry and section
+      hints, but try to specify the section with a --regex option on
+      the command-line, and the regular expression matches an existing 
+      section in the DIR file.
+0037: Installing an Info file.  The Info file contains section and entry 
+      hints, but we try to specify the section with a regular expression 
+      that does not match any existing sections in the DIR file.  We also 
+      specify a --section on the command-line to ensure that the entry will 
+      be installed in a section that we explicitly name.  We use the 
+      alternative Debian --section REGEX TITLE syntax instead of the normal
+      GNU syntax.
+0038: Installing an Info file.  The Info file does not contain section or
+      entry hints, and we specify that two entries go into two sections on
+      the command-line.  One section already exists, and the other doesn't.
+0039: Installing an Info file.  The Info file contains section and entry
+      hints, but we override the entry with an --entry option on the 
+      command-line.  The entry has a multi-line description and is not 
+      indented.
+0040: Installing an Info file.  The Info file contains section and entry
+      hints, but we override the entry with --name and --description options
+      on the command-line.  The entry is not indented.
+0041: Installing an Info file.  The Info file contains section and entry
+      hints, and we're installing the entry into a gzipped DIR file.
+0042: Installing an Info file.  The Info file contains section and entry
+      hints for two entries in two sections.  Both of the sections do not 
+      already exist in the DIR file.  The sections will be added prior to 
+      all other sections due to the alphabetic ordering of section names.
+0043: Installing an Info file.  The Info file contains section and entry 
+      hints, and we're going to install the new section admist many other 
+      sections.  E.g. instead of always at the very bottom or at the very 
+      top.
+0044: The 99% case.  Removing an Info file.  The Info file is responsible
+      for a single entry in the DIR file.
+0045: Removing an Info file.  The Info file is responsible for many entries 
+      in the DIR file.
+0046: Removing an Info file.  We no longer have the Info file, so we 
+      specify --remove-exactly to remove it instead.
+0047: Removing an Info file.  The Info file is responsible for the final
+      entry in the DIR file.  The section also gets removed.
+0048: Removing an Info file.  The Info file is responsible for the final
+      entry in the DIR file, but we want to keep the section heading, so
+      we specify --keep-old.
+0049: Removing an Info file.  The Info file is not responsible for any
+      entries in the DIR file.  A warning is issued, but it isn't an error.
+0050: Removing an Info file.  The Info file is responsible for a single
+      entry in the gzipped DIR file.
diff --git a/Build/source/utils/texinfo/install-info/tests/defs.in b/Build/source/utils/texinfo/install-info/tests/defs.in
new file mode 100644
index 00000000000..815ee5f3c4c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/defs.in
@@ -0,0 +1,48 @@
+# @configure_input@
+# $Id: defs.in,v 1.1 2008/04/17 17:54:17 karl Exp $
+# 
+# Copyright 2008 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# (Some snippets copied from Autoconf and/or util/defs.in.)
+# Make sure we override the user shell.
+SHELL='@SHELL@'
+export SHELL
+
+unset CDPATH
+
+# Ensure we are running from the right directory.
+if test ! -f ./defs; then
+   echo "defs: not found in current directory" 1>&2
+   exit 1
+fi
+
+# If srcdir is not set, then we are not running from `make check'.
+if test -z "$srcdir"; then
+   VERBOSE=x
+   # compute $srcdir.
+   srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'`
+   test $srcdir = $0 && srcdir=.
+fi
+
+# The two variables we use in the test scripts.
+
+top_builddir=@top_builddir@
+install_info=${top_builddir}/install-info/ginstall-info
+export install_info
+
+top_srcdir=@top_srcdir@
+testdir=${top_srcdir}/install-info/tests
+export testdir
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0001-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0001-expected-dir-file
new file mode 100644
index 00000000000..bdcca6dd66d
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0001-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0001-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0001-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0001-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0001-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0001-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0001-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0001-test b/Build/source/utils/texinfo/install-info/tests/ii-0001-test
new file mode 100755
index 00000000000..37a4a6df902
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0001-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0001-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0001-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0001-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0002-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0002-expected-dir-file
new file mode 100644
index 00000000000..f233228935b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0002-expected-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
+* Wildebeest: (gnu).            Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0002-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0002-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0002-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0002-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0002-input-info-file
new file mode 100644
index 00000000000..3d08adeb584
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0002-input-info-file
@@ -0,0 +1,12 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Wildebeest: (gnu).             Wildebeest native to Africa.
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0002-test b/Build/source/utils/texinfo/install-info/tests/ii-0002-test
new file mode 100755
index 00000000000..1c0ff753090
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0002-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0002-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0002-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0002-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0003-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0003-expected-dir-file
new file mode 100644
index 00000000000..f233228935b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0003-expected-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
+* Wildebeest: (gnu).            Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0003-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0003-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0003-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0003-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0003-input-info-file
new file mode 100644
index 00000000000..d782c1875c6
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0003-input-info-file
@@ -0,0 +1,15 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+START-INFO-DIR-ENTRY
+* Wildebeest: (gnu).             Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0003-test b/Build/source/utils/texinfo/install-info/tests/ii-0003-test
new file mode 100755
index 00000000000..7940f1e3342
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0003-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0003-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0003-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0003-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0004-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0004-expected-dir-file
new file mode 100644
index 00000000000..09fa8de1fd4
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0004-expected-dir-file
@@ -0,0 +1,28 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
+
+Antlered Animals
+* Deer: (deer).                 Ruminent antlered mammal.
+* Wildebeest: (gnu).            Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0004-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0004-input-dir-file
new file mode 100644
index 00000000000..42590ac46d5
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0004-input-dir-file
@@ -0,0 +1,26 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+
+Antlered Animals
+* Deer: (deer).                 Ruminent antlered mammal.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0004-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0004-input-info-file
new file mode 100644
index 00000000000..10b3896e2ea
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0004-input-info-file
@@ -0,0 +1,16 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+INFO-DIR-SECTION Antlered Animals
+START-INFO-DIR-ENTRY
+* Wildebeest: (gnu).             Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0004-test b/Build/source/utils/texinfo/install-info/tests/ii-0004-test
new file mode 100755
index 00000000000..355482674d6
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0004-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0004-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0004-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0004-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0005-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0005-expected-dir-file
new file mode 100644
index 00000000000..dcb6f46773e
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0005-expected-dir-file
@@ -0,0 +1,27 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
+
+Antlered Animals
+* Wildebeest: (gnu).            Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0005-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0005-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0005-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0005-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0005-input-info-file
new file mode 100644
index 00000000000..10b3896e2ea
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0005-input-info-file
@@ -0,0 +1,16 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+INFO-DIR-SECTION Antlered Animals
+START-INFO-DIR-ENTRY
+* Wildebeest: (gnu).             Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0005-test b/Build/source/utils/texinfo/install-info/tests/ii-0005-test
new file mode 100755
index 00000000000..6eb15f4341c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0005-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0005-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0005-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0005-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0006-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0006-expected-dir-file
new file mode 100644
index 00000000000..50245935c29
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0006-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0006-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0006-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0006-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0006-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0006-input-info-file
new file mode 100644
index 00000000000..bf984365b52
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0006-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0006-test b/Build/source/utils/texinfo/install-info/tests/ii-0006-test
new file mode 100755
index 00000000000..2efcf3e4bc4
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0006-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0006-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0006-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0006-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0007-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0007-expected-dir-file
new file mode 100644
index 00000000000..f944e818896
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0007-expected-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
+* Hippopotamus: (hippo).        A large semi-aquatic African mammal.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0007-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0007-input-dir-file
new file mode 100644
index 00000000000..a23460e013c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0007-input-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Hippopotamus: (hippo).        A large semi-aquatic African mammal.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0007-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0007-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0007-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0007-test b/Build/source/utils/texinfo/install-info/tests/ii-0007-test
new file mode 100755
index 00000000000..544b6f76ede
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0007-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0007-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0007-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0007-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0008-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0008-expected-dir-file
new file mode 100644
index 00000000000..dbb0b24815c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0008-expected-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Large hooved animal native to the African 
+                                  savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0008-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0008-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0008-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0008-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0008-input-info-file
new file mode 100644
index 00000000000..053a7741e03
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0008-input-info-file
@@ -0,0 +1,12 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                   Large hooved animal native to the African 
+                                  savannah.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0008-test b/Build/source/utils/texinfo/install-info/tests/ii-0008-test
new file mode 100755
index 00000000000..8153282933e
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0008-test
@@ -0,0 +1,32 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0008-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0008-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0008-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0009-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0009-expected-dir-file
new file mode 100644
index 00000000000..bdcca6dd66d
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0009-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0009-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0009-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0009-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0009-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0009-input-info-file
new file mode 100644
index 00000000000..bbcf82474c1
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0009-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).  Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0009-test b/Build/source/utils/texinfo/install-info/tests/ii-0009-test
new file mode 100755
index 00000000000..7b82895ff35
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0009-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0009-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0009-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0009-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0010-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0010-expected-dir-file
new file mode 100644
index 00000000000..dbb0b24815c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0010-expected-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Large hooved animal native to the African 
+                                  savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0010-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0010-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0010-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0010-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0010-input-info-file
new file mode 100644
index 00000000000..417a763222a
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0010-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).              Large hooved animal native to the African savannah.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0010-test b/Build/source/utils/texinfo/install-info/tests/ii-0010-test
new file mode 100755
index 00000000000..690f5bfdabe
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0010-test
@@ -0,0 +1,32 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0010-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0010-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0010-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0011-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0011-expected-dir-file
new file mode 100644
index 00000000000..4a5fa11befe
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0011-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).              Large hooved animal native to the African savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0011-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0011-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0011-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0011-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0011-input-info-file
new file mode 100644
index 00000000000..417a763222a
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0011-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).              Large hooved animal native to the African savannah.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0011-test b/Build/source/utils/texinfo/install-info/tests/ii-0011-test
new file mode 100755
index 00000000000..a3c445e3379
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0011-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0011-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --no-indent ${testdir}/ii-0011-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0011-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0012-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0012-expected-dir-file
new file mode 100644
index 00000000000..dbb0b24815c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0012-expected-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Large hooved animal native to the African 
+                                  savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0012-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0012-input-dir-file
new file mode 100644
index 00000000000..92b0058c720
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0012-input-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Large hooved Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0012-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0012-input-info-file
new file mode 100644
index 00000000000..417a763222a
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0012-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).              Large hooved animal native to the African savannah.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0012-test b/Build/source/utils/texinfo/install-info/tests/ii-0012-test
new file mode 100755
index 00000000000..6a5f0fcd9ec
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0012-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0012-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0012-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0012-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0013-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0013-expected-dir-file
new file mode 100644
index 00000000000..92b0058c720
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0013-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Large hooved Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0013-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0013-input-dir-file
new file mode 100644
index 00000000000..92b0058c720
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0013-input-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Large hooved Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0013-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0013-input-info-file
new file mode 100644
index 00000000000..6a3c6fccbde
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0013-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                   Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0013-test b/Build/source/utils/texinfo/install-info/tests/ii-0013-test
new file mode 100755
index 00000000000..67bd46d21ee
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0013-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0013-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --keep-old ${testdir}/ii-0013-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0013-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0014-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0014-expected-dir-file
new file mode 100644
index 00000000000..8d609465bdb
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0014-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Large hooved animal native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0014-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0014-input-dir-file
new file mode 100644
index 00000000000..80a498db7e5
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0014-input-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   A large hooved Wildebeest native to the 
+                                  African savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0014-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0014-input-info-file
new file mode 100644
index 00000000000..66689fc6091
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0014-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                   Large hooved animal native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0014-test b/Build/source/utils/texinfo/install-info/tests/ii-0014-test
new file mode 100755
index 00000000000..d19f18ef5d3
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0014-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0014-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0014-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0014-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0015-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0015-expected-dir-file
new file mode 100644
index 00000000000..dbb0b24815c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0015-expected-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Large hooved animal native to the African 
+                                  savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0015-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0015-input-dir-file
new file mode 100644
index 00000000000..bdcca6dd66d
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0015-input-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0015-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0015-input-info-file
new file mode 100644
index 00000000000..36255043515
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0015-input-info-file
@@ -0,0 +1,12 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                   Large hooved animal native to the African
+                                  savannah.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0015-test b/Build/source/utils/texinfo/install-info/tests/ii-0015-test
new file mode 100755
index 00000000000..0b0fde541f5
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0015-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0015-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0015-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0015-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0016-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0016-expected-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0016-expected-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0016-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0016-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0016-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0016-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0016-input-info-file
new file mode 100644
index 00000000000..57f05a68d6b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0016-input-info-file
@@ -0,0 +1,7 @@
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0016-test b/Build/source/utils/texinfo/install-info/tests/ii-0016-test
new file mode 100755
index 00000000000..496b1d81110
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0016-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0016-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --silent ${testdir}/ii-0016-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0016-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0017-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0017-expected-dir-file
new file mode 100644
index 00000000000..60d56da548a
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0017-expected-dir-file
@@ -0,0 +1,18 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0017-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0017-input-dir-file
new file mode 100644
index 00000000000..d2f31fd554f
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0017-input-dir-file
@@ -0,0 +1,15 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0017-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0017-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0017-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0017-test b/Build/source/utils/texinfo/install-info/tests/ii-0017-test
new file mode 100755
index 00000000000..42a24368c7a
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0017-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0017-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0017-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0017-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0018-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0018-input-dir-file
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0018-input-dir-file
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0018-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0018-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0018-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0018-test b/Build/source/utils/texinfo/install-info/tests/ii-0018-test
new file mode 100755
index 00000000000..1fa51c1622a
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0018-test
@@ -0,0 +1,28 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0018-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0018-input-info-file $outputdirfile 2>/dev/null
+retval=$?
+if [ "x$retval" != "x1" ]; then
+  exit $retval
+fi
+
+rm -f $outputdirfile
+exit 0
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0019-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0019-input-dir-file
new file mode 100644
index 00000000000..139597f9cb0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0019-input-dir-file
@@ -0,0 +1,2 @@
+
+
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0019-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0019-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0019-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0019-test b/Build/source/utils/texinfo/install-info/tests/ii-0019-test
new file mode 100755
index 00000000000..66d1697a6bf
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0019-test
@@ -0,0 +1,28 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0019-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0019-input-info-file $outputdirfile 2>/dev/null
+retval=$?
+if [ "x$retval" != "x1" ]; then
+  exit $retval
+fi
+
+rm -f $outputdirfile
+exit 0
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0020-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0020-expected-dir-file
new file mode 100644
index 00000000000..a621b56304f
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0020-expected-dir-file
@@ -0,0 +1,27 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+
+Miscellaneous
+* ii-0020-input-info-file: (ii-0020-input-info-file).
+                                Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0020-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0020-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0020-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0020-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0020-input-info-file
new file mode 100644
index 00000000000..57f05a68d6b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0020-input-info-file
@@ -0,0 +1,7 @@
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0020-test b/Build/source/utils/texinfo/install-info/tests/ii-0020-test
new file mode 100755
index 00000000000..18aaf1a95bf
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0020-test
@@ -0,0 +1,30 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0020-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+${install_info} --description='Wildebeest native to Africa.' ${testdir}/ii-0020-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0020-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0021-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0021-expected-dir-file
new file mode 100644
index 00000000000..bdf71bc14f7
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0021-expected-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* ii-0021-input-info-file: (ii-0021-input-info-file).
+                                Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0021-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0021-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0021-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0021-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0021-input-info-file
new file mode 100644
index 00000000000..57f05a68d6b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0021-input-info-file
@@ -0,0 +1,7 @@
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0021-test b/Build/source/utils/texinfo/install-info/tests/ii-0021-test
new file mode 100755
index 00000000000..e9d984aa2bc
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0021-test
@@ -0,0 +1,30 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0021-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+${install_info} --section="Animals" --description='Wildebeest native to Africa.' ${testdir}/ii-0021-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0021-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0022-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0022-expected-dir-file
new file mode 100644
index 00000000000..60e2c2de16e
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0022-expected-dir-file
@@ -0,0 +1,27 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Hippopotamus: (hippo).        A large semi-aquatic African mammal.
+
+Miscellaneous
+* Gnu: (gnu).
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0022-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0022-input-dir-file
new file mode 100644
index 00000000000..a23460e013c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0022-input-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Hippopotamus: (hippo).        A large semi-aquatic African mammal.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0022-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0022-input-info-file
new file mode 100644
index 00000000000..57f05a68d6b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0022-input-info-file
@@ -0,0 +1,7 @@
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0022-test b/Build/source/utils/texinfo/install-info/tests/ii-0022-test
new file mode 100755
index 00000000000..5ef3882affc
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0022-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0022-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --name='* Gnu: (gnu).' ${testdir}/ii-0022-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0022-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0023-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0023-expected-dir-file
new file mode 100644
index 00000000000..6b21b0c8d1f
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0023-expected-dir-file
@@ -0,0 +1,26 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+
+Miscellaneous
+* Gnu: (ii-0023-input-info-file).
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0023-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0023-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0023-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0023-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0023-input-info-file
new file mode 100644
index 00000000000..57f05a68d6b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0023-input-info-file
@@ -0,0 +1,7 @@
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0023-test b/Build/source/utils/texinfo/install-info/tests/ii-0023-test
new file mode 100755
index 00000000000..b9a24d5c940
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0023-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0023-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --name="Gnu" ${testdir}/ii-0023-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0023-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0024-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0024-expected-dir-file
new file mode 100644
index 00000000000..84cecbfda36
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0024-expected-dir-file
@@ -0,0 +1,26 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+
+Antlered Animals
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0024-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0024-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0024-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0024-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0024-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0024-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0024-test b/Build/source/utils/texinfo/install-info/tests/ii-0024-test
new file mode 100755
index 00000000000..1899bc34593
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0024-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0024-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --section="Antlered Animals" ${testdir}/ii-0024-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0024-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0025-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0025-expected-dir-file
new file mode 100644
index 00000000000..bdcca6dd66d
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0025-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0025-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0025-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0025-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0025-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0025-input-info-file
new file mode 100644
index 00000000000..af26df91aa9
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0025-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Antlered Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0025-test b/Build/source/utils/texinfo/install-info/tests/ii-0025-test
new file mode 100755
index 00000000000..49817087658
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0025-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0025-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --section="Animals" ${testdir}/ii-0025-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0025-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0026-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0026-expected-dir-file
new file mode 100644
index 00000000000..705b840558f
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0026-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to the African savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0026-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0026-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0026-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0026-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0026-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0026-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0026-test b/Build/source/utils/texinfo/install-info/tests/ii-0026-test
new file mode 100755
index 00000000000..88c40879d41
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0026-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0026-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --entry="* Gnu: (gnu).             Wildebeest native to the African savannah." ${testdir}/ii-0026-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0026-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0027-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0027-expected-dir-file
new file mode 100644
index 00000000000..0e8dc7fd905
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0027-expected-dir-file
@@ -0,0 +1,26 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+
+Antlered Animals
+* Gnu: (gnu).                   Wildebeest native to the African savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0027-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0027-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0027-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0027-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0027-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0027-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0027-test b/Build/source/utils/texinfo/install-info/tests/ii-0027-test
new file mode 100755
index 00000000000..8e1d362ada6
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0027-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0027-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --entry="* Gnu: (gnu).             Wildebeest native to the African savannah." --section="Antlered Animals" ${testdir}/ii-0027-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0027-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0028-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0028-expected-dir-file
new file mode 100644
index 00000000000..b08ed9e5532
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0028-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Wildebeest: (gnu).            Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0028-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0028-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0028-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0028-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0028-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0028-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0028-test b/Build/source/utils/texinfo/install-info/tests/ii-0028-test
new file mode 100755
index 00000000000..4294c9abe37
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0028-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0028-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --name="* Wildebeest: (gnu)." ${testdir}/ii-0028-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0028-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0029-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0029-expected-dir-file
new file mode 100644
index 00000000000..3321a97c1f2
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0029-expected-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Wildebeest: (ii-0029-input-info-file).
+                                Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0029-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0029-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0029-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0029-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0029-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0029-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0029-test b/Build/source/utils/texinfo/install-info/tests/ii-0029-test
new file mode 100755
index 00000000000..ed518c26c6f
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0029-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0029-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --name="Wildebeest" ${testdir}/ii-0029-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0029-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0030-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0030-expected-dir-file
new file mode 100644
index 00000000000..705b840558f
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0030-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to the African savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0030-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0030-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0030-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0030-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0030-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0030-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0030-test b/Build/source/utils/texinfo/install-info/tests/ii-0030-test
new file mode 100755
index 00000000000..56544a70d7e
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0030-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0030-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --description="Wildebeest native to the African savannah." ${testdir}/ii-0030-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0030-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0031-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0031-expected-dir-file
new file mode 100644
index 00000000000..272fc0e61f6
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0031-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Wildebeest: (gnu).            Wildebeest native to the African savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0031-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0031-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0031-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0031-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0031-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0031-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0031-test b/Build/source/utils/texinfo/install-info/tests/ii-0031-test
new file mode 100755
index 00000000000..35c01ab2b5b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0031-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0031-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --name="* Wildebeest: (gnu)." --description="Wildebeest native to the African savannah." ${testdir}/ii-0031-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0031-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0032-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0032-expected-dir-file
new file mode 100644
index 00000000000..bdcca6dd66d
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0032-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0032-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0032-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0032-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0032-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0032-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0032-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0032-test b/Build/source/utils/texinfo/install-info/tests/ii-0032-test
new file mode 100755
index 00000000000..f52b173473a
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0032-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0032-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --regex='^Antlered Animals$' ${testdir}/ii-0032-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0032-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0033-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0033-expected-dir-file
new file mode 100644
index 00000000000..cee1fc11b15
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0033-expected-dir-file
@@ -0,0 +1,26 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+
+Miscellaneous
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0033-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0033-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0033-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0033-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0033-input-info-file
new file mode 100644
index 00000000000..1be6381d0c9
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0033-input-info-file
@@ -0,0 +1,10 @@
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0033-test b/Build/source/utils/texinfo/install-info/tests/ii-0033-test
new file mode 100755
index 00000000000..badb6448d41
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0033-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0033-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --regex='^Antlered Animals$' ${testdir}/ii-0033-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0033-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0034-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0034-expected-dir-file
new file mode 100644
index 00000000000..bdcca6dd66d
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0034-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0034-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0034-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0034-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0034-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0034-input-info-file
new file mode 100644
index 00000000000..1be6381d0c9
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0034-input-info-file
@@ -0,0 +1,10 @@
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0034-test b/Build/source/utils/texinfo/install-info/tests/ii-0034-test
new file mode 100755
index 00000000000..64a12469d4c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0034-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0034-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --regex='^Antlered Animals$' --section="Animals" ${testdir}/ii-0034-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0034-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0035-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0035-expected-dir-file
new file mode 100644
index 00000000000..bdcca6dd66d
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0035-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0035-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0035-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0035-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0035-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0035-input-info-file
new file mode 100644
index 00000000000..af26df91aa9
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0035-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Antlered Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0035-test b/Build/source/utils/texinfo/install-info/tests/ii-0035-test
new file mode 100755
index 00000000000..1ccc26ce933
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0035-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0035-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --regex='^Antlered Animals$' --section="Animals" ${testdir}/ii-0035-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0035-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0036-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0036-expected-dir-file
new file mode 100644
index 00000000000..bdcca6dd66d
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0036-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0036-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0036-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0036-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0036-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0036-input-info-file
new file mode 100644
index 00000000000..af26df91aa9
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0036-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Antlered Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0036-test b/Build/source/utils/texinfo/install-info/tests/ii-0036-test
new file mode 100755
index 00000000000..7ba9e8eb3e4
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0036-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0036-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --regex='[Aa]nimal[s]' ${testdir}/ii-0036-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0036-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0037-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0037-expected-dir-file
new file mode 100644
index 00000000000..bdcca6dd66d
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0037-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0037-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0037-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0037-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0037-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0037-input-info-file
new file mode 100644
index 00000000000..af26df91aa9
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0037-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Antlered Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0037-test b/Build/source/utils/texinfo/install-info/tests/ii-0037-test
new file mode 100755
index 00000000000..1c37ce46cc0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0037-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0037-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --section '^Antlered Animals$' Animals ${testdir}/ii-0037-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0037-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0038-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0038-expected-dir-file
new file mode 100644
index 00000000000..890384833fd
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0038-expected-dir-file
@@ -0,0 +1,29 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
+* Wildebeest: (gnu).            Wildebeest native to the African savannah.
+
+Antlered Animals
+* Gnu: (gnu).                   Wildebeest native to Africa.
+* Wildebeest: (gnu).            Wildebeest native to the African savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0038-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0038-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0038-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0038-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0038-input-info-file
new file mode 100644
index 00000000000..57f05a68d6b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0038-input-info-file
@@ -0,0 +1,7 @@
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0038-test b/Build/source/utils/texinfo/install-info/tests/ii-0038-test
new file mode 100755
index 00000000000..6a5a5e2eca6
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0038-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0038-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --section="Animals" --section="Antlered Animals" --entry="* Gnu: (gnu).  Wildebeest native to Africa." --entry="* Wildebeest: (gnu).  Wildebeest native to the African savannah." ${testdir}/ii-0038-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0038-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0039-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0039-expected-dir-file
new file mode 100644
index 00000000000..b4bfcaf2bfa
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0039-expected-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).  Wildebeest native to the African continent.
+               (this item contains disputed material).
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0039-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0039-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0039-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0039-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0039-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0039-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0039-test b/Build/source/utils/texinfo/install-info/tests/ii-0039-test
new file mode 100755
index 00000000000..02d729210f4
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0039-test
@@ -0,0 +1,32 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0039-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --entry="* Gnu: (gnu).  Wildebeest native to the African continent.
+               (this item contains disputed material)."  --no-indent ${testdir}/ii-0039-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0039-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0040-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0040-expected-dir-file
new file mode 100644
index 00000000000..05e52c181b0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0040-expected-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).A wildebeest native to the African savannah.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0040-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0040-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0040-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0040-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0040-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0040-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0040-test b/Build/source/utils/texinfo/install-info/tests/ii-0040-test
new file mode 100755
index 00000000000..b9a1a08451c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0040-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0040-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --name="* Gnu: (gnu)." --description="A wildebeest native to the African savannah." --no-indent ${testdir}/ii-0040-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0040-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0041-expected-dir-file.gz b/Build/source/utils/texinfo/install-info/tests/ii-0041-expected-dir-file.gz
new file mode 100644
index 00000000000..839b0f61256
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0041-expected-dir-file.gz
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0041-input-dir-file.gz b/Build/source/utils/texinfo/install-info/tests/ii-0041-input-dir-file.gz
new file mode 100644
index 00000000000..4292ea17969
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0041-input-dir-file.gz
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0041-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0041-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0041-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0041-test b/Build/source/utils/texinfo/install-info/tests/ii-0041-test
new file mode 100755
index 00000000000..76e652eaea7
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0041-test
@@ -0,0 +1,34 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `zdiff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`.gz
+cp ${testdir}/ii-0041-input-dir-file.gz $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+# when copying in distcheck, source will be readonly.
+chmod u+rw $outputdirfile || exit $?
+
+${install_info} ${testdir}/ii-0041-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+zdiff ${testdir}/ii-0041-expected-dir-file.gz $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0042-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0042-expected-dir-file
new file mode 100644
index 00000000000..56da8a63a96
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0042-expected-dir-file
@@ -0,0 +1,29 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animal Kingdom
+* Gnu: (gnu).                   Wildebeest native to Africa.
+
+Animalia
+* Gnu: (gnu).                   Wildebeest native to Africa.
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0042-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0042-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0042-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0042-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0042-input-info-file
new file mode 100644
index 00000000000..fddf82e55fa
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0042-input-info-file
@@ -0,0 +1,15 @@
+INFO-DIR-SECTION Animalia
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+INFO-DIR-SECTION Animal Kingdom
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0042-test b/Build/source/utils/texinfo/install-info/tests/ii-0042-test
new file mode 100755
index 00000000000..e7d5d01166f
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0042-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0042-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0042-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0042-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0043-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0043-expected-dir-file
new file mode 100644
index 00000000000..9e98e058623
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0043-expected-dir-file
@@ -0,0 +1,46 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Astronomy
+* Mars: (mars).                 Postcards from the Red Planet.
+
+Biology
+* Alien Autopsy: (mars).        A biological account of an alien autopsy.
+
+Chemistry
+* Making Gold: (gold).          How to turn lead into gold.
+
+Dentistry
+* On the Cheap: (dentistry).    Do it yourself dentistry made easy.
+
+Education
+* Dog Training: (dogs).         Teaching old dogs new tricks.
+
+Forestry
+* The Last Tree: (forest).      Clear cutting practises in North America.
+
+Geography
+* The Dark Continent (africa).  A complete and total history.
+
+History
+* The Fall of Proprietary Software: (gnu).
+                                How the world came to reject slavery.
+
+Immunology
+* Beating the flu: (flu).       Three simple steps to beating influenza.
+
+Jekyllism
+* Science Gone Mad (hyde).      A personal account of self-medication.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0043-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0043-input-dir-file
new file mode 100644
index 00000000000..730e5fd7e8c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0043-input-dir-file
@@ -0,0 +1,43 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Astronomy
+* Mars: (mars).                 Postcards from the Red Planet.
+
+Biology
+* Alien Autopsy: (mars).        A biological account of an alien autopsy.
+
+Chemistry
+* Making Gold: (gold).          How to turn lead into gold.
+
+Dentistry
+* On the Cheap: (dentistry).    Do it yourself dentistry made easy.
+
+Education
+* Dog Training: (dogs).         Teaching old dogs new tricks.
+
+Forestry
+* The Last Tree: (forest).      Clear cutting practises in North America.
+
+History
+* The Fall of Proprietary Software: (gnu).
+                                How the world came to reject slavery.
+
+Immunology
+* Beating the flu: (flu).       Three simple steps to beating influenza.
+
+Jekyllism
+* Science Gone Mad (hyde).      A personal account of self-medication.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0043-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0043-input-info-file
new file mode 100644
index 00000000000..7ca1774c039
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0043-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Geography
+START-INFO-DIR-ENTRY
+* The Dark Continent (africa).   A complete and total history.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0043-test b/Build/source/utils/texinfo/install-info/tests/ii-0043-test
new file mode 100755
index 00000000000..e4e375c327a
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0043-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0043-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} ${testdir}/ii-0043-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0043-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0044-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0044-expected-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0044-expected-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0044-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0044-input-dir-file
new file mode 100644
index 00000000000..e059420aac9
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0044-input-dir-file
@@ -0,0 +1,25 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (ii-0044-input-info-file).
+                                Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0044-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0044-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0044-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0044-test b/Build/source/utils/texinfo/install-info/tests/ii-0044-test
new file mode 100755
index 00000000000..a15ab01b458
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0044-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0044-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --remove ${testdir}/ii-0044-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0044-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0045-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0045-expected-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0045-expected-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0045-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0045-input-dir-file
new file mode 100644
index 00000000000..97945161161
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0045-input-dir-file
@@ -0,0 +1,27 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (ii-0045-input-info-file).
+                                Wildebeest native to Africa.
+* Wildebesst: (ii-0045-input-info-file).
+                                Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0045-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0045-input-info-file
new file mode 100644
index 00000000000..a85a30ba712
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0045-input-info-file
@@ -0,0 +1,12 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+* Wildebeest: (gnu).             Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0045-test b/Build/source/utils/texinfo/install-info/tests/ii-0045-test
new file mode 100755
index 00000000000..f168462f9ce
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0045-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0045-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --remove ${testdir}/ii-0045-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0045-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0046-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0046-expected-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0046-expected-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0046-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0046-input-dir-file
new file mode 100644
index 00000000000..bdcca6dd66d
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0046-input-dir-file
@@ -0,0 +1,24 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
+* Gnu: (gnu).                   Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0046-test b/Build/source/utils/texinfo/install-info/tests/ii-0046-test
new file mode 100755
index 00000000000..43a7a69872f
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0046-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0046-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --remove-exactly gnu $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0046-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0047-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0047-expected-dir-file
new file mode 100644
index 00000000000..9615d7528f8
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0047-expected-dir-file
@@ -0,0 +1,16 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0047-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0047-input-dir-file
new file mode 100644
index 00000000000..d64698c470c
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0047-input-dir-file
@@ -0,0 +1,19 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Gnu: (ii-0047-input-info-file).
+                                Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0047-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0047-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0047-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0047-test b/Build/source/utils/texinfo/install-info/tests/ii-0047-test
new file mode 100755
index 00000000000..ad4f11afc93
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0047-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0047-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --remove ${testdir}/ii-0047-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0047-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0048-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0048-expected-dir-file
new file mode 100644
index 00000000000..60aed1d2083
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0048-expected-dir-file
@@ -0,0 +1,17 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0048-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0048-input-dir-file
new file mode 100644
index 00000000000..0fe0ae65905
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0048-input-dir-file
@@ -0,0 +1,19 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Gnu: (ii-0048-input-info-file).
+                                Wildebeest native to Africa.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0048-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0048-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0048-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0048-test b/Build/source/utils/texinfo/install-info/tests/ii-0048-test
new file mode 100755
index 00000000000..d98e917a8ff
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0048-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0048-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --remove --keep-old ${testdir}/ii-0048-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0048-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0049-expected-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0049-expected-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0049-expected-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0049-input-dir-file b/Build/source/utils/texinfo/install-info/tests/ii-0049-input-dir-file
new file mode 100644
index 00000000000..813b548648b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0049-input-dir-file
@@ -0,0 +1,23 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  topmost node of the Info hierarchy.
+
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+This is the Info main menu (aka directory node).
+A few useful Info commands:
+
+  `q' quits;
+  `?' lists all Info commands;
+  `h' starts the Info tutorial;
+  `mTexinfo RET' visits the Texinfo manual, etc.
+
+* Menu:
+
+Animals
+* Aardvark: (aardvark).         Medium-sized African mammal.
+* Baboon: (baboon).             A monkey from Africa.
+* Chameleon: (chameleon).       A lizard from Africa.
+* Deer: (deer).                 Ruminent antlered mammal.
+* Emu: (emu).                   A flightless bird from Australia.
+* Fisher: (fisher).             A marten from North America.
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0049-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0049-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0049-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0049-test b/Build/source/utils/texinfo/install-info/tests/ii-0049-test
new file mode 100755
index 00000000000..1aef02baf2f
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0049-test
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `diff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`
+cp ${testdir}/ii-0049-input-dir-file $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+${install_info} --remove ${testdir}/ii-0049-input-info-file $outputdirfile 2>/dev/null
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+diff ${testdir}/ii-0049-expected-dir-file $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0050-expected-dir-file.gz b/Build/source/utils/texinfo/install-info/tests/ii-0050-expected-dir-file.gz
new file mode 100644
index 00000000000..75e222e1d08
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0050-expected-dir-file.gz
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0050-input-dir-file.gz b/Build/source/utils/texinfo/install-info/tests/ii-0050-input-dir-file.gz
new file mode 100644
index 00000000000..1bbe099456b
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0050-input-dir-file.gz
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0050-input-info-file b/Build/source/utils/texinfo/install-info/tests/ii-0050-input-info-file
new file mode 100644
index 00000000000..993920bd4e0
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0050-input-info-file
@@ -0,0 +1,11 @@
+INFO-DIR-SECTION Animals
+START-INFO-DIR-ENTRY
+* Gnu: (gnu).                    Wildebeest native to Africa.
+END-INFO-DIR-ENTRY
+
+File: gnu,  Node: Top,  Next: Top,  Up: (dir)
+
+Gnu
+***
+
+The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnu�/ or /ˈnju�/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal.  (Taken from wikepedia.)
diff --git a/Build/source/utils/texinfo/install-info/tests/ii-0050-test b/Build/source/utils/texinfo/install-info/tests/ii-0050-test
new file mode 100755
index 00000000000..27c859301f2
--- /dev/null
+++ b/Build/source/utils/texinfo/install-info/tests/ii-0050-test
@@ -0,0 +1,35 @@
+#!/bin/sh
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#This script requires `mktemp' and `zdiff' and is designed to be run from
+#a Makefile.
+
+. ./defs || exit 1
+
+outputdirfile=`mktemp`.gz
+cp ${testdir}/ii-0050-input-dir-file.gz $outputdirfile
+if [ "x$?" != "x0" ]; then
+  exit 1
+fi
+
+
+# when copying in distcheck, source will be readonly.
+chmod u+rw $outputdirfile || exit $?
+
+${install_info} --remove ${testdir}/ii-0050-input-info-file $outputdirfile
+retval=$?
+if [ "x$retval" != "x0" ]; then
+  exit $retval
+fi
+
+zdiff ${testdir}/ii-0050-expected-dir-file.gz $outputdirfile
+retval=$?
+
+rm -f $outputdirfile
+exit $retval
diff --git a/Build/source/utils/texinfo/lib/Makefile.am b/Build/source/utils/texinfo/lib/Makefile.am
index 253adfca880..97110c99ed7 100644
--- a/Build/source/utils/texinfo/lib/Makefile.am
+++ b/Build/source/utils/texinfo/lib/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.7 2004/11/06 22:05:59 karl Exp $
+# $Id: Makefile.am,v 1.11 2007/07/01 18:07:36 karl Exp $
 # Makefile.am for texinfo/lib.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -11,16 +11,12 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 noinst_LIBRARIES = libtxi.a
-INCLUDES = -I../intl
 
-# Don't need to list alloca.c, etc., Automake includes them.
-libtxi_a_SOURCES = getopt.c getopt.h getopt1.c getopt_.h getopt_int.h \
-                   gettext.h \
-                   strcase.h strdup.h substring.c system.h \
-		   xalloc.h xexit.c xmalloc.c xstrdup.c
-libtxi_a_LIBADD = $(LIBOBJS) $(ALLOCA)
-libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD)
+AM_CPPFLAGS = -I$(top_srcdir)			\
+  -I$(top_srcdir)/gnulib/lib			\
+  -I$(top_builddir)/gnulib/lib			\
+  -DLOCALEDIR=\"$(localedir)\"
 
-## xx configure for bzero?, clib, other common stuff
+libtxi_a_SOURCES = substring.c xexit.c
 
 EXTRA_DIST = README
diff --git a/Build/source/utils/texinfo/lib/Makefile.in b/Build/source/utils/texinfo/lib/Makefile.in
index 77d333ea18b..362d59720b2 100644
--- a/Build/source/utils/texinfo/lib/Makefile.in
+++ b/Build/source/utils/texinfo/lib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am,v 1.7 2004/11/06 22:05:59 karl Exp $
+# $Id: Makefile.am,v 1.11 2007/07/01 18:07:36 karl Exp $
 # Makefile.am for texinfo/lib.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -26,15 +26,11 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -49,44 +45,79 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = lib
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	alloca.c memcpy.c memmove.c mkstemp.c strcasecmp.c strdup.c \
-	strerror.c strncasecmp.c tempname.c
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
-	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \
-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mkstemp.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/onceonly_2_57.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
+	$(top_srcdir)/gnulib/m4/argz.m4 \
+	$(top_srcdir)/gnulib/m4/codeset.m4 \
+	$(top_srcdir)/gnulib/m4/eealloc.m4 \
+	$(top_srcdir)/gnulib/m4/environ.m4 \
+	$(top_srcdir)/gnulib/m4/error.m4 \
+	$(top_srcdir)/gnulib/m4/exitfail.m4 \
+	$(top_srcdir)/gnulib/m4/extensions.m4 \
+	$(top_srcdir)/gnulib/m4/getopt.m4 \
+	$(top_srcdir)/gnulib/m4/gettext.m4 \
+	$(top_srcdir)/gnulib/m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib/m4/glibc21.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib/m4/iconv.m4 \
+	$(top_srcdir)/gnulib/m4/include_next.m4 \
+	$(top_srcdir)/gnulib/m4/inline.m4 \
+	$(top_srcdir)/gnulib/m4/intlmacosx.m4 \
+	$(top_srcdir)/gnulib/m4/lib-ld.m4 \
+	$(top_srcdir)/gnulib/m4/lib-link.m4 \
+	$(top_srcdir)/gnulib/m4/lib-prefix.m4 \
+	$(top_srcdir)/gnulib/m4/localcharset.m4 \
+	$(top_srcdir)/gnulib/m4/longlong.m4 \
+	$(top_srcdir)/gnulib/m4/malloc.m4 \
+	$(top_srcdir)/gnulib/m4/malloca.m4 \
+	$(top_srcdir)/gnulib/m4/mbchar.m4 \
+	$(top_srcdir)/gnulib/m4/mbiter.m4 \
+	$(top_srcdir)/gnulib/m4/mbrtowc.m4 \
+	$(top_srcdir)/gnulib/m4/mbscasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbsncasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbstate_t.m4 \
+	$(top_srcdir)/gnulib/m4/mbswidth.m4 \
+	$(top_srcdir)/gnulib/m4/memchr.m4 \
+	$(top_srcdir)/gnulib/m4/memcpy.m4 \
+	$(top_srcdir)/gnulib/m4/memmove.m4 \
+	$(top_srcdir)/gnulib/m4/mkstemp.m4 \
+	$(top_srcdir)/gnulib/m4/nls.m4 \
+	$(top_srcdir)/gnulib/m4/onceonly.m4 \
+	$(top_srcdir)/gnulib/m4/po.m4 \
+	$(top_srcdir)/gnulib/m4/progtest.m4 \
+	$(top_srcdir)/gnulib/m4/setenv.m4 \
+	$(top_srcdir)/gnulib/m4/stdbool.m4 \
+	$(top_srcdir)/gnulib/m4/stdint.m4 \
+	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
+	$(top_srcdir)/gnulib/m4/strdup.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
+	$(top_srcdir)/gnulib/m4/string_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_time_h.m4 \
+	$(top_srcdir)/gnulib/m4/tempname.m4 \
+	$(top_srcdir)/gnulib/m4/unistd_h.m4 \
+	$(top_srcdir)/gnulib/m4/wchar.m4 \
+	$(top_srcdir)/gnulib/m4/wchar_t.m4 \
+	$(top_srcdir)/gnulib/m4/wctype.m4 \
+	$(top_srcdir)/gnulib/m4/wcwidth.m4 \
+	$(top_srcdir)/gnulib/m4/wint_t.m4 \
+	$(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
 ARFLAGS = cru
 libtxi_a_AR = $(AR) $(ARFLAGS)
-am__DEPENDENCIES_1 = @LIBOBJS@
-am__DEPENDENCIES_2 = @ALLOCA@
-am_libtxi_a_OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT) \
-	substring.$(OBJEXT) xexit.$(OBJEXT) xmalloc.$(OBJEXT) \
-	xstrdup.$(OBJEXT)
+libtxi_a_LIBADD =
+am_libtxi_a_OBJECTS = substring.$(OBJEXT) xexit.$(OBJEXT)
 libtxi_a_OBJECTS = $(am_libtxi_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -99,22 +130,24 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+ARGZ_H = @ARGZ_H@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -122,41 +155,155 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
+GETOPT_H = @GETOPT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_IO_H = @HAVE_IO_H@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRNDUP = @HAVE_STRNDUP@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRSEP = @HAVE_STRSEP@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNSETENV = @HAVE_UNSETENV@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
+HEVEA = @HEVEA@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@
-INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -166,20 +313,50 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
 RANLIB = @RANLIB@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDINT_H = @STDINT_H@
 STRIP = @STRIP@
+SYS_STAT_H = @SYS_STAT_H@
+SYS_TIME_H = @SYS_TIME_H@
 TERMLIBS = @TERMLIBS@
-TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@
-TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+TEX = @TEX@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VOID_UNSETENV = @VOID_UNSETENV@
+WCHAR_H = @WCHAR_H@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WCTYPE_H = @WCTYPE_H@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -191,11 +368,16 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -219,19 +401,19 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libtxi.a
-INCLUDES = -I../intl
+AM_CPPFLAGS = -I$(top_srcdir)			\
+  -I$(top_srcdir)/gnulib/lib			\
+  -I$(top_builddir)/gnulib/lib			\
+  -DLOCALEDIR=\"$(localedir)\"
 
-# Don't need to list alloca.c, etc., Automake includes them.
-libtxi_a_SOURCES = getopt.c getopt.h getopt1.c getopt_.h getopt_int.h \
-                   gettext.h \
-                   strcase.h strdup.h substring.c system.h \
-		   xalloc.h xexit.c xmalloc.c xstrdup.c
-
-libtxi_a_LIBADD = $(LIBOBJS) $(ALLOCA)
-libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD)
+libtxi_a_SOURCES = substring.c xexit.c
 EXTRA_DIST = README
 all: all-am
 
@@ -280,44 +462,30 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/alloca.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memcpy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkstemp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strncasecmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempname.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/substring.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xexit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrdup.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -329,8 +497,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -340,13 +508,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -360,22 +527,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -419,7 +585,7 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf $(DEPDIR) ./$(DEPDIR)
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -436,16 +602,24 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf $(DEPDIR) ./$(DEPDIR)
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -461,18 +635,22 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstLIBRARIES ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
+	uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/utils/texinfo/lib/substring.c b/Build/source/utils/texinfo/lib/substring.c
index 9e59fceefea..fa483231bd2 100644
--- a/Build/source/utils/texinfo/lib/substring.c
+++ b/Build/source/utils/texinfo/lib/substring.c
@@ -1,21 +1,20 @@
 /* substring.c -- extract substring.
-   $Id: substring.c,v 1.2 2004/04/11 17:56:46 karl Exp $
+   $Id: substring.c,v 1.5 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1999, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 
diff --git a/Build/source/utils/texinfo/lib/xexit.c b/Build/source/utils/texinfo/lib/xexit.c
index 53eb0fc1d66..a3244d4ab69 100644
--- a/Build/source/utils/texinfo/lib/xexit.c
+++ b/Build/source/utils/texinfo/lib/xexit.c
@@ -1,21 +1,21 @@
 /* xexit.c -- exit with attention to return values and closing stdout.
-   $Id: xexit.c,v 1.5 2004/04/11 17:56:46 karl Exp $
+   $Id: xexit.c,v 1.8 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1999, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
 
 #include "system.h"
 
diff --git a/Build/source/utils/texinfo/makeinfo/Makefile.am b/Build/source/utils/texinfo/makeinfo/Makefile.am
index 5f9f82dfd43..694f915e194 100644
--- a/Build/source/utils/texinfo/makeinfo/Makefile.am
+++ b/Build/source/utils/texinfo/makeinfo/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.5 2004/04/11 17:56:46 karl Exp $
+# $Id: Makefile.am,v 1.9 2006/06/21 08:08:48 akim Exp $
 # Makefile.am for texinfo/makeinfo.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -13,8 +13,12 @@
 bin_PROGRAMS = makeinfo
 
 localedir = $(datadir)/locale
-INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
-LDADD = ../lib/libtxi.a $(LIBINTL)
+AM_CPPFLAGS = 					\
+  -I$(top_srcdir)				\
+  -I$(top_srcdir)/gnulib/lib 			\
+  -I$(top_builddir)/gnulib/lib			\
+  -DLOCALEDIR=\"$(localedir)\"
+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
 
 makeinfo_SOURCES = \
   cmds.c cmds.h defun.c defun.h \
diff --git a/Build/source/utils/texinfo/makeinfo/Makefile.in b/Build/source/utils/texinfo/makeinfo/Makefile.in
index 700f8e5fe2a..fbb15ed8e5e 100644
--- a/Build/source/utils/texinfo/makeinfo/Makefile.in
+++ b/Build/source/utils/texinfo/makeinfo/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am,v 1.5 2004/04/11 17:56:46 karl Exp $
+# $Id: Makefile.am,v 1.9 2006/06/21 08:08:48 akim Exp $
 # Makefile.am for texinfo/makeinfo.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -26,15 +26,11 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -52,26 +48,66 @@ bin_PROGRAMS = makeinfo$(EXEEXT)
 subdir = makeinfo
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
-	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \
-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mkstemp.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/onceonly_2_57.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
+	$(top_srcdir)/gnulib/m4/argz.m4 \
+	$(top_srcdir)/gnulib/m4/codeset.m4 \
+	$(top_srcdir)/gnulib/m4/eealloc.m4 \
+	$(top_srcdir)/gnulib/m4/environ.m4 \
+	$(top_srcdir)/gnulib/m4/error.m4 \
+	$(top_srcdir)/gnulib/m4/exitfail.m4 \
+	$(top_srcdir)/gnulib/m4/extensions.m4 \
+	$(top_srcdir)/gnulib/m4/getopt.m4 \
+	$(top_srcdir)/gnulib/m4/gettext.m4 \
+	$(top_srcdir)/gnulib/m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib/m4/glibc21.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib/m4/iconv.m4 \
+	$(top_srcdir)/gnulib/m4/include_next.m4 \
+	$(top_srcdir)/gnulib/m4/inline.m4 \
+	$(top_srcdir)/gnulib/m4/intlmacosx.m4 \
+	$(top_srcdir)/gnulib/m4/lib-ld.m4 \
+	$(top_srcdir)/gnulib/m4/lib-link.m4 \
+	$(top_srcdir)/gnulib/m4/lib-prefix.m4 \
+	$(top_srcdir)/gnulib/m4/localcharset.m4 \
+	$(top_srcdir)/gnulib/m4/longlong.m4 \
+	$(top_srcdir)/gnulib/m4/malloc.m4 \
+	$(top_srcdir)/gnulib/m4/malloca.m4 \
+	$(top_srcdir)/gnulib/m4/mbchar.m4 \
+	$(top_srcdir)/gnulib/m4/mbiter.m4 \
+	$(top_srcdir)/gnulib/m4/mbrtowc.m4 \
+	$(top_srcdir)/gnulib/m4/mbscasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbsncasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbstate_t.m4 \
+	$(top_srcdir)/gnulib/m4/mbswidth.m4 \
+	$(top_srcdir)/gnulib/m4/memchr.m4 \
+	$(top_srcdir)/gnulib/m4/memcpy.m4 \
+	$(top_srcdir)/gnulib/m4/memmove.m4 \
+	$(top_srcdir)/gnulib/m4/mkstemp.m4 \
+	$(top_srcdir)/gnulib/m4/nls.m4 \
+	$(top_srcdir)/gnulib/m4/onceonly.m4 \
+	$(top_srcdir)/gnulib/m4/po.m4 \
+	$(top_srcdir)/gnulib/m4/progtest.m4 \
+	$(top_srcdir)/gnulib/m4/setenv.m4 \
+	$(top_srcdir)/gnulib/m4/stdbool.m4 \
+	$(top_srcdir)/gnulib/m4/stdint.m4 \
+	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
+	$(top_srcdir)/gnulib/m4/strdup.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
+	$(top_srcdir)/gnulib/m4/string_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_time_h.m4 \
+	$(top_srcdir)/gnulib/m4/tempname.m4 \
+	$(top_srcdir)/gnulib/m4/unistd_h.m4 \
+	$(top_srcdir)/gnulib/m4/wchar.m4 \
+	$(top_srcdir)/gnulib/m4/wchar_t.m4 \
+	$(top_srcdir)/gnulib/m4/wctype.m4 \
+	$(top_srcdir)/gnulib/m4/wcwidth.m4 \
+	$(top_srcdir)/gnulib/m4/wint_t.m4 \
+	$(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
@@ -86,9 +122,10 @@ am_makeinfo_OBJECTS = cmds.$(OBJEXT) defun.$(OBJEXT) files.$(OBJEXT) \
 makeinfo_OBJECTS = $(am_makeinfo_OBJECTS)
 makeinfo_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-makeinfo_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+makeinfo_DEPENDENCIES = ../lib/libtxi.a \
+	$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -98,32 +135,37 @@ SOURCES = $(makeinfo_SOURCES)
 DIST_SOURCES = $(makeinfo_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+ARGZ_H = @ARGZ_H@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -131,41 +173,155 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
+GETOPT_H = @GETOPT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_IO_H = @HAVE_IO_H@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRNDUP = @HAVE_STRNDUP@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRSEP = @HAVE_STRSEP@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNSETENV = @HAVE_UNSETENV@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
+HEVEA = @HEVEA@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@
-INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -175,20 +331,50 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
 RANLIB = @RANLIB@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDINT_H = @STDINT_H@
 STRIP = @STRIP@
+SYS_STAT_H = @SYS_STAT_H@
+SYS_TIME_H = @SYS_TIME_H@
 TERMLIBS = @TERMLIBS@
-TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@
-TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+TEX = @TEX@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VOID_UNSETENV = @VOID_UNSETENV@
+WCHAR_H = @WCHAR_H@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WCTYPE_H = @WCTYPE_H@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -200,11 +386,16 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -228,10 +419,19 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
-LDADD = ../lib/libtxi.a $(LIBINTL)
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+  -I$(top_srcdir)				\
+  -I$(top_srcdir)/gnulib/lib 			\
+  -I$(top_builddir)/gnulib/lib			\
+  -DLOCALEDIR=\"$(localedir)\"
+
+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
 makeinfo_SOURCES = \
   cmds.c cmds.h defun.c defun.h \
   files.c files.h float.c float.h footnote.c footnote.h \
@@ -276,7 +476,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -299,7 +499,7 @@ clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 makeinfo$(EXEEXT): $(makeinfo_OBJECTS) $(makeinfo_DEPENDENCIES) 
 	@rm -f makeinfo$(EXEEXT)
-	$(LINK) $(makeinfo_LDFLAGS) $(makeinfo_OBJECTS) $(makeinfo_LDADD) $(LIBS)
+	$(LINK) $(makeinfo_OBJECTS) $(makeinfo_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -326,19 +526,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xref.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -371,8 +570,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -416,8 +614,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -442,8 +640,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -453,13 +651,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -473,22 +670,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -502,7 +698,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -510,6 +706,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -520,7 +718,7 @@ all-am: Makefile $(PROGRAMS)
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -568,12 +766,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -593,23 +799,25 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-binPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/utils/texinfo/makeinfo/cmds.c b/Build/source/utils/texinfo/makeinfo/cmds.c
index 87ac7bb80de..be7ce455184 100644
--- a/Build/source/utils/texinfo/makeinfo/cmds.c
+++ b/Build/source/utils/texinfo/makeinfo/cmds.c
@@ -1,13 +1,13 @@
 /* cmds.c -- Texinfo commands.
-   $Id: cmds.c,v 1.55 2004/12/14 00:15:36 karl Exp $
+   $Id: cmds.c,v 1.83 2008/04/09 17:07:31 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,15 +15,16 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
+#include "mbswidth.h"
 #include "cmds.h"
 #include "defun.h"
 #include "files.h"
 #include "footnote.h"
 #include "html.h"
+#include "index.h"
 #include "insertion.h"
 #include "lang.h"
 #include "macro.h"
@@ -39,11 +40,16 @@
 #include <time.h>
 #endif
 
-/* Options. */
+/* Simple commands defined and only called here. */
 static void cm_exampleindent (void),
      cm_firstparagraphindent (void),
-     cm_paragraphindent (void),
-     cm_novalidate (void);
+     cm_fonttextsize (void),
+     cm_frenchspacing (void),
+     cm_geq (int arg),
+     cm_leq (int arg),
+     cm_minus (int arg),
+     cm_novalidate (void),
+     cm_paragraphindent (void);
 
 /* Internals. */
 static void cm_obsolete (int arg, int start, int end),
@@ -90,12 +96,14 @@ COMMAND command_table[] = {
   { "afourpaper", cm_ignore_line, NO_BRACE_ARGS },
   { "afourwide", cm_ignore_line, NO_BRACE_ARGS },
   { "alias", cm_alias, NO_BRACE_ARGS },
+  { "allowcodebreaks", cm_ignore_line, NO_BRACE_ARGS },
   { "anchor", cm_anchor, BRACE_ARGS },
   { "appendix", cm_appendix, NO_BRACE_ARGS },
   { "appendixsection", cm_appendixsec, NO_BRACE_ARGS },
   { "appendixsec", cm_appendixsec, NO_BRACE_ARGS },
   { "appendixsubsec", cm_appendixsubsec, NO_BRACE_ARGS },
   { "appendixsubsubsec", cm_appendixsubsubsec, NO_BRACE_ARGS },
+  { "arrow", cm_arrow, BRACE_ARGS },
   { "asis", cm_no_op, BRACE_ARGS },
   { "author", cm_author, NO_BRACE_ARGS },
   { "b", cm_b, BRACE_ARGS },
@@ -111,6 +119,9 @@ COMMAND command_table[] = {
   { "cindex", cm_cindex, NO_BRACE_ARGS },
   { "cite", cm_cite, BRACE_ARGS },
   { "clear", cm_clear, NO_BRACE_ARGS },
+  { "click", cm_click, BRACE_ARGS },
+  { "clicksequence", cm_clicksequence, BRACE_ARGS },
+  { "clickstyle", cm_clickstyle, NO_BRACE_ARGS },
   { "code", cm_code, BRACE_ARGS },
   { "comma", cm_comma, BRACE_ARGS },
   { "command", cm_code, BRACE_ARGS },
@@ -185,9 +196,13 @@ COMMAND command_table[] = {
   { "error", cm_error, BRACE_ARGS },
   { "euro", cm_special_char, BRACE_ARGS },
   { "evenfooting", cm_ignore_line, NO_BRACE_ARGS },
+  { "evenfootingmarks", cm_ignore_line, NO_BRACE_ARGS },
   { "evenheading", cm_ignore_line, NO_BRACE_ARGS },
+  { "evenheadingmarks", cm_ignore_line, NO_BRACE_ARGS },
   { "everyfooting", cm_ignore_line, NO_BRACE_ARGS },
+  { "everyfootingmarks", cm_ignore_line, NO_BRACE_ARGS },
   { "everyheading", cm_ignore_line, NO_BRACE_ARGS },
+  { "everyheadingmarks", cm_ignore_line, NO_BRACE_ARGS },
   { "example", cm_example, NO_BRACE_ARGS },
   { "exampleindent", cm_exampleindent, NO_BRACE_ARGS },
   { "exclamdown", cm_special_char, BRACE_ARGS },
@@ -200,11 +215,20 @@ COMMAND command_table[] = {
   { "float", cm_float, NO_BRACE_ARGS },
   { "flushleft", cm_flushleft, NO_BRACE_ARGS },
   { "flushright", cm_flushright, NO_BRACE_ARGS },
+  { "fonttextsize", cm_fonttextsize, NO_BRACE_ARGS },
   { "footnote", cm_footnote, NO_BRACE_ARGS}, /* self-arg eater */
   { "footnotestyle", cm_footnotestyle, NO_BRACE_ARGS },
   { "format", cm_format, NO_BRACE_ARGS },
+  { "frenchspacing", cm_frenchspacing, NO_BRACE_ARGS },
   { "ftable", cm_ftable, NO_BRACE_ARGS },
+  { "geq", cm_geq, BRACE_ARGS },
   { "group", cm_group, NO_BRACE_ARGS },
+  { "guillemetleft", cm_special_char, BRACE_ARGS },
+  { "guillemetright", cm_special_char, BRACE_ARGS },
+  { "guillemotleft", cm_special_char, BRACE_ARGS },
+  { "guillemotright", cm_special_char, BRACE_ARGS },
+  { "guilsinglleft", cm_guilsinglleft, BRACE_ARGS },
+  { "guilsinglright", cm_guilsinglright, BRACE_ARGS },
   { "heading", cm_heading, NO_BRACE_ARGS },
   { "headings", cm_ignore_line, NO_BRACE_ARGS },
   { "headitem", cm_headitem, NO_BRACE_ARGS },
@@ -241,6 +265,7 @@ COMMAND command_table[] = {
   { "key", cm_key, BRACE_ARGS },
   { "kindex", cm_kindex, NO_BRACE_ARGS },
   { "l", cm_special_char, BRACE_ARGS },
+  { "leq", cm_leq, BRACE_ARGS },
   { "lisp", cm_lisp, NO_BRACE_ARGS },
   { "listoffloats", cm_listoffloats, NO_BRACE_ARGS },
   { "lowersections", cm_lowersections, NO_BRACE_ARGS },
@@ -257,7 +282,9 @@ COMMAND command_table[] = {
   { "nwnode", cm_node, NO_BRACE_ARGS },
   { "o", cm_special_char, BRACE_ARGS },
   { "oddfooting", cm_ignore_line, NO_BRACE_ARGS },
+  { "oddfootingmarks", cm_ignore_line, NO_BRACE_ARGS },
   { "oddheading", cm_ignore_line, NO_BRACE_ARGS },
+  { "oddheadingmarks", cm_ignore_line, NO_BRACE_ARGS },
   { "oe", cm_special_char, BRACE_ARGS },
   { "option", cm_code, BRACE_ARGS },
   { "ordf", cm_special_char, BRACE_ARGS },
@@ -273,6 +300,12 @@ COMMAND command_table[] = {
   { "pxref", cm_pxref, BRACE_ARGS },
   { "questiondown", cm_special_char, BRACE_ARGS },
   { "quotation", cm_quotation, NO_BRACE_ARGS },
+  { "quotedblbase", cm_quotedblbase, BRACE_ARGS },
+  { "quotedblleft", cm_quotedblleft, BRACE_ARGS },
+  { "quotedblright", cm_quotedblright, BRACE_ARGS },
+  { "quoteleft", cm_quoteleft, BRACE_ARGS },
+  { "quoteright", cm_quoteright, BRACE_ARGS },
+  { "quotesinglbase", cm_quotesinglbase, BRACE_ARGS },
   { "r", cm_r, BRACE_ARGS },
   { "raisesections", cm_raisesections, NO_BRACE_ARGS },
   { "ref", cm_ref, BRACE_ARGS },
@@ -316,6 +349,7 @@ COMMAND command_table[] = {
   { "tab", cm_tab, NO_BRACE_ARGS },
   { "table", cm_table, NO_BRACE_ARGS },
   { "tex", cm_tex, NO_BRACE_ARGS },
+  { "textdegree", cm_special_char, BRACE_ARGS },
   { "tie", cm_tie, BRACE_ARGS },
   { "tieaccent", cm_accent, MAYBE_BRACE_ARGS },
   { "tindex", cm_tindex, NO_BRACE_ARGS },
@@ -451,9 +485,9 @@ cm_enddots (int arg)
 	}
       else
 	if (html && !in_fixed_width_font)
-	  insert_string ("<small class=\"enddots\">....</small>");
+	  insert_string ("<small class=\"enddots\">...</small>");
 	else
-	  add_word ("....");
+	  add_word ("...");
     }
 }
 
@@ -473,7 +507,35 @@ cm_bullet (int arg)
     }
 }
 
-void
+static void
+cm_geq (int arg)
+{
+  if (arg == START)
+    {
+      if (xml)
+        xml_insert_entity ("ge");
+      else if (html)
+        add_word ("&ge;");
+      else
+        insert_string (">=");
+    }
+}
+
+static void
+cm_leq (int arg)
+{
+  if (arg == START)
+    {
+      if (xml)
+        xml_insert_entity ("le");
+      else if (html)
+        add_word ("&le;");
+      else
+        insert_string ("<=");
+    }
+}
+
+static void
 cm_minus (int arg)
 {
   if (arg == START)
@@ -578,6 +640,138 @@ cm_registeredsymbol (int arg)
     }
 }
 
+/* Left single guillemet (single left-pointing angle quotation mark). */
+void
+cm_guilsinglleft (int arg)
+{
+  if (arg == START)
+    {
+      if (html)
+        add_word ("&lsaquo;");
+      else if (xml && !docbook)
+        xml_insert_entity ("lsaquo");
+      else
+        add_word ("<");
+    }
+}
+
+/* Right single guillemet (single right-pointing angle quotation mark). */
+void
+cm_guilsinglright (int arg)
+{
+  if (arg == START)
+    {
+      if (html)
+        add_word ("&rsaquo;");
+      else if (xml && !docbook)
+        xml_insert_entity ("rsaquo");
+      else
+        add_word (">");
+    }
+}
+
+/* Double low-9 quotation mark. */
+void
+cm_quotedblbase (int arg)
+{
+  if (arg == START)
+    {
+      if (html)
+        add_word ("&bdquo;");
+      else if (docbook)
+        xml_insert_entity ("ldquor");
+      else if (xml && !docbook)
+        xml_insert_entity ("bdquo");
+      else
+        add_word ("\"");
+    }
+}
+
+/* Left double quotation mark. */
+void
+cm_quotedblleft (int arg)
+{
+  if (arg == START)
+    {
+      if (html)
+        add_word ("&ldquo;");
+      else if (docbook)
+        xml_insert_entity ("ldquo");
+      else if (xml && !docbook)
+        xml_insert_entity ("ldquo");
+      else
+        add_word ("\"");
+    }
+}
+
+/* Right double quotation mark. */
+void
+cm_quotedblright (int arg)
+{
+  if (arg == START)
+    {
+      if (html)
+        add_word ("&rdquo;");
+      else if (docbook)
+        xml_insert_entity ("rdquo");
+      else if (xml && !docbook)
+        xml_insert_entity ("rdquo");
+      else
+        add_word ("\"");
+    }
+}
+
+/* Left single quotation mark. */
+void
+cm_quoteleft (int arg)
+{
+  if (arg == START)
+    {
+      if (html)
+        add_word ("&lsquo;");
+      else if (docbook)
+        xml_insert_entity ("lsquo");
+      else if (xml && !docbook)
+        xml_insert_entity ("lsquo");
+      else
+        add_word ("`");
+    }
+}
+
+/* Right single quotation mark. */
+void
+cm_quoteright (int arg)
+{
+  if (arg == START)
+    {
+      if (html)
+        add_word ("&rsquo;");
+      else if (docbook)
+        xml_insert_entity ("rsquo");
+      else if (xml && !docbook)
+        xml_insert_entity ("rsquo");
+      else
+        add_word ("'");
+    }
+}
+
+/* Single low-9 quotation mark. */
+void
+cm_quotesinglbase (int arg)
+{
+  if (arg == START)
+    {
+      if (html)
+        add_word ("&sbquo;");
+      else if (docbook)
+        xml_insert_entity ("lsquor");
+      else if (xml && !docbook)
+        xml_insert_entity ("sbquo");
+      else
+        add_word (",");
+    }
+}
+
 void
 cm_today (int arg)
 {
@@ -600,7 +794,7 @@ cm_comment (void)
   /* For HTML, do not output comments before HTML header is written,
      otherwise comments before @settitle cause an empty <title> in the
      header.  */
-  if ((html && html_output_head_p) || xml)
+  if ((html && output_head_p) || xml)
     {
       char *line;
       get_rest_of_line (0, &line);
@@ -624,6 +818,7 @@ cm_comment (void)
           /* Use insert for HTML, and XML when indentation is enabled.
              For Docbook, use add_char.  */
           if (xml && xml_indentation_increment > 0
+	      && output_paragraph_offset > 0
               && output_paragraph[output_paragraph_offset-1] != '\n')
             insert ('\n');
 
@@ -829,21 +1024,21 @@ cm_code (int arg)
         { /* Use <samp> tag in general to get typewriter.  */
           if (arg == START)
             { /* If @samp specifically, add quotes a la TeX output.  */
-              if (STREQ (command, "samp")) add_char ('`');
-              add_word ("<samp>");
+              if (STREQ (command, "samp"))
+		add_word ("&lsquo;");
+	      insert_html_tag (arg, "samp");
             }
           insert_html_tag_with_attribute (arg, "span", "class=\"%s\"",command);
           if (arg == END)
             {
-              add_word ("</samp>");
-              if (STREQ (command, "samp")) add_char ('\'');
+	      insert_html_tag (arg, "samp");
+              if (STREQ (command, "samp"))
+		add_word ("&rsquo;");
             }
         }
     }
   else
     {
-      extern int printing_index;
-
       if (!printing_index)
         {
           if (arg == START)
@@ -1100,15 +1295,16 @@ cm_strong (int arg, int start_pos, int end_pos)
     insert_html_tag (arg, "strong");
   else
     add_char ('*');
-  
+
   if (!xml && !html && !docbook && !no_headers
       && arg == END
       && end_pos - start_pos >= 6
       && (STRNCASEEQ ((char *) output_paragraph + start_pos, "*Note:", 6)
-          || STRNCASEEQ ((char *) output_paragraph + start_pos, "*Note ", 6)))
+          || STRNCASEEQ ((char *) output_paragraph + start_pos, "*Note ", 6))
+          )
     {
       /* Translators: "Note:" is literal here and should not be
-         translated.  @strong{Nota}, say, does not cause the problem.  */
+         translated.  A document with @strong{Nota}, say, is fine.  */
       warning (_("@strong{Note...} produces a spurious cross-reference in Info; reword to avoid that"));
       /* Adjust the output to avoid writing the bad xref.  */
       output_paragraph[start_pos + 5] = '_';
@@ -1126,7 +1322,9 @@ cm_cite (int arg, int position)
     {
       if (arg == START)
         add_char ('`');
-      else
+      else if (!looking_at ("}'"))
+        /* In the simple case of, e.g.,  ... @cite{Foo}'s ...
+           don't output a double ''.  */
         add_char ('\'');
     }
 }
@@ -1145,7 +1343,6 @@ cm_i (int arg)
 {
   /* Make use of <lineannotation> of Docbook, if we are
      inside an @example or similar.  */
-  extern int printing_index;
   if (docbook && !filling_enabled && !printing_index)
     xml_insert_element (LINEANNOTATION, arg);
   else if (xml)
@@ -1161,7 +1358,6 @@ cm_slanted (int arg)
 {
   /* Make use of <lineannotation> of Docbook, if we are
      inside an @example or similar.  */
-  extern int printing_index;
   if (docbook && !filling_enabled && !printing_index)
     xml_insert_element (LINEANNOTATION, arg);
   else if (xml)
@@ -1176,7 +1372,6 @@ void
 cm_b (int arg)
 {
   /* See cm_i comments.  */
-  extern int printing_index;
   if (docbook && !filling_enabled && !printing_index)
     xml_insert_element (LINEANNOTATION, arg);
   else if (docbook && arg == START)
@@ -1193,7 +1388,6 @@ void
 cm_r (int arg)
 {
   /* See cm_i comments.  */
-  extern int printing_index;
   if (docbook && !filling_enabled && !printing_index)
     xml_insert_element (LINEANNOTATION, arg);
   else if (xml)
@@ -1208,7 +1402,6 @@ void
 cm_sansserif (int arg)
 {
   /* See cm_i comments.  */
-  extern int printing_index;
   if (docbook && !filling_enabled && !printing_index)
     xml_insert_element (LINEANNOTATION, arg);
   else if (xml)
@@ -1283,17 +1476,23 @@ cm_w (int arg)
 
 /* An unbreakable word space.  Same as @w{ } for makeinfo, but different
    for TeX (the space stretches and stretches, and does not inhibit
-   hyphenation).  */
+   hyphenation).  For XML and HTML, insert the non-breaking-space
+   character and entity, respectively */
 void
 cm_tie (int arg)
 {
   if (arg == START)
+    if (html)
+      insert_string ("&nbsp;");
+    else if (xml)
+      insert_string ("&#xa0;");
+    else
     {
       cm_w (START);
       add_char (' ');
     }
   else
-    cm_w (END);
+    if (!html && !xml) cm_w (END);
 }
 
 /* Explain that this command is obsolete, thus the user shouldn't
@@ -1371,7 +1570,6 @@ cm_settitle (void)
 {
   if (xml)
     {
-      xml_begin_document (current_output_filename);
       xml_insert_element (SETTITLE, START);
       xml_in_book_title = 1;
       get_rest_of_line (0, &title);
@@ -1434,9 +1632,6 @@ cm_sp (void)
           /* close_paragraph generates an extra blank line.  */
           close_single_paragraph ();
 
-          if (lines && html && !executing_string)
-            html_output_head ();
-
           if (html)
             add_html_block_elt ("<pre class=\"sp\">\n");
 
@@ -1474,10 +1669,14 @@ cm_dircategory (void)
 
       if (!no_headers && !html)
         {
+          /* use add_* instead of insert_* because otherwise the
+             file header ("This is ...") will end up inside the
+             dir section markers.  */
           kill_self_indent (-1); /* make sure there's no indentation */
-          insert_string ("INFO-DIR-SECTION ");
-          insert_string (line);
-          insert ('\n');
+          cm_noindent (); /* make sure again */
+          add_word ("INFO-DIR-SECTION ");
+          add_word (line);
+          close_single_paragraph ();  /* newline */
         }
 
       free (line);
@@ -1501,7 +1700,7 @@ cm_center (void)
     }
   else
     {
-      int i, start, length;
+      int i, start, length, width;
       char *line;
       int save_indented_fill = indented_fill;
       int save_filling_enabled = filling_enabled;
@@ -1530,13 +1729,14 @@ cm_center (void)
 
            output_paragraph_offset = ++i;
            length = output_paragraph_offset - start;
+	   width = mbsnwidth ((char *)(output_paragraph + start), length, 0);
 
-           if (length < (fill_column - fudge_factor))
+           if (width < (fill_column - fudge_factor))
              {
                line = xmalloc (1 + length);
                memcpy (line, (char *)(output_paragraph + start), length);
 
-               i = (fill_column - fudge_factor - length) / 2;
+               i = (fill_column - fudge_factor - width) / 2;
                output_paragraph_offset = start;
 
                while (i--)
@@ -1553,17 +1753,65 @@ cm_center (void)
       filling_enabled = save_filling_enabled;
       indented_fill = save_indented_fill;
       close_single_paragraph ();
-      if (looking_at("\n"))
+      if (looking_at ("\n"))
         insert ('\n');
     }
 }
 
+
+/* Define what @click{} does.  */
+static char *click_command = "@arrow";
+
+void
+cm_clickstyle (void)
+{
+  click_command = get_item_function ();
+
+  if (looking_at ("\n"))
+    {
+      input_text_offset++;
+      line_number++;
+    }
+}
+
+/* @clicksequence{File @click{} Open} */
+void
+cm_clicksequence (int arg)
+{
+  if (xml)
+    xml_insert_element (CLICKSEQUENCE, arg);
+}
+
+void
+cm_click (int arg)
+{
+  if (xml)
+    xml_insert_element (CLICK, arg);
+  else if (arg == END)
+    execute_string ("%s{}", click_command);
+}
+
+
+/* Generic right arrow, default clickstyle.  */
+void
+cm_arrow (int arg)
+{
+  if (arg == END)
+    if (html || xml)
+      xml_insert_entity ("rarr");
+    else
+      add_word ("->");
+}
+
 /* Show what an expression returns. */
 void
 cm_result (int arg)
 {
   if (arg == END)
-    add_word (html ? "=&gt;" : "=>");
+    if (html || xml)
+      xml_insert_entity ("rArr");
+    else
+      add_word ("=>");
 }
 
 /* What an expression expands to. */
@@ -1673,15 +1921,27 @@ handle_include (int verbatim_include)
   if (!insertion_stack)
     close_paragraph ();  /* No blank lines etc. if not at outer level.  */
     
+  if (macro_expansion_output_stream && verbatim_include)
+    {
+      me_append_before_this_command ();
+      return;
+    }
+    
   get_rest_of_line (0, &arg);
   /* We really only want to expand @value, but it's easier to just do
      everything.  TeX will only work with @value.  */
-  filename = text_expansion (arg);
-  free (arg);
+  {
+    int save_in_fixed_width_font = in_fixed_width_font;
+    in_fixed_width_font = 1;  /* do not change -- to -, etc.  */
+    filename = text_expansion (arg);
+    in_fixed_width_font = save_in_fixed_width_font;    
+  }
 
+  free (arg);
+  
   if (macro_expansion_output_stream && !executing_string)
     remember_itext (input_text, input_text_offset);
-
+  
   pushfile ();
 
   /* In verbose mode we print info about including another file. */
@@ -1816,7 +2076,7 @@ cm_firstparagraphindent (void)
 
   get_rest_of_line (1, &arg);
   if (set_firstparagraphindent (arg) != 0)
-    line_error (_("Bad argument to %c%s"), COMMAND_PREFIX, command);
+    line_error (_("Bad argument to @%s: %s"), command, arg);
 
   free (arg);
 }
@@ -1834,7 +2094,8 @@ cm_colon (void)
         {
           /* Erase literal character that's there, except `>', which is
              part of the XML tag.  */
-          if (output_paragraph[output_paragraph_offset-1] != '>')
+          if (output_paragraph_offset > 0
+	      && output_paragraph[output_paragraph_offset-1] != '>')
             output_paragraph_offset--;
 
           switch (input_text[input_text_offset-3])
@@ -1861,7 +2122,7 @@ cm_colon (void)
 void
 cm_punct (int arg)
 {
-  if (xml && !docbook)
+  if (xml && !docbook && input_text_offset > 0)
     {
       switch (input_text[input_text_offset-1])
         {
@@ -1881,3 +2142,43 @@ cm_punct (int arg)
       insert_self (arg);
     }
 }
+
+
+/* If @frenchspacing is in effect, avoid outputting extra spaces after
+   sentence-ending periods.  Actually, we explicitly do this only in one
+   tiny case (see add_char in makeinfo.c).  Usually we just output
+   whatever the user gives us.  */
+void
+cm_frenchspacing (void)
+{
+  char *val;
+  get_rest_of_line (1, &val);
+
+  if (STREQ (val, "on")) {
+    french_spacing = 1;
+  } else if (STREQ (val, "off")) {
+    french_spacing = 0;
+  } else {
+    line_error (_("Expected @%s on or off, not `%s'"), command, val);
+  }
+  
+  if (xml && !docbook) {
+    xml_insert_element_with_attribute (FRENCHSPACING, START,
+                                       "val=\"%s\"", val);
+    xml_insert_element (FRENCHSPACING, END);
+  }
+}
+
+
+/* Body font size.  This is only for TeX, so we're just checking
+   validity here.  Don't think we should even pass it on to XML.  */
+void
+cm_fonttextsize (void)
+{
+  char *val;
+  get_rest_of_line (1, &val);
+
+  if (! (STREQ (val, "10") || STREQ (val, "off"))) {
+    line_error (_("Only @%s 10 or 11 is supported, not `%s'"), command, val);
+  }
+}
diff --git a/Build/source/utils/texinfo/makeinfo/cmds.h b/Build/source/utils/texinfo/makeinfo/cmds.h
index 68245505b51..50097a78f50 100644
--- a/Build/source/utils/texinfo/makeinfo/cmds.h
+++ b/Build/source/utils/texinfo/makeinfo/cmds.h
@@ -1,22 +1,21 @@
 /* cmds.h -- declarations for cmds.c.
-   $Id: cmds.h,v 1.9 2004/11/26 00:48:35 karl Exp $
+   $Id: cmds.h,v 1.15 2008/04/09 17:07:31 karl Exp $
 
-   Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
-   Inc.
+   Copyright (C) 1998, 1999, 2002, 2003, 2004, 2007, 2008
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef CMDS_H
 #define CMDS_H
@@ -89,7 +88,11 @@ extern void cm_anchor (int arg),
 /* Special insertions.  */
 extern void cm_LaTeX (int arg),
   cm_TeX (int arg),
+  cm_arrow (int arg),
   cm_bullet (int arg),
+  cm_click (int arg),
+  cm_clicksequence (int arg),
+  cm_clickstyle (void),
   cm_colon (void),
   cm_comma (int arg),
   cm_copyright (int arg),
@@ -100,10 +103,17 @@ extern void cm_LaTeX (int arg),
   cm_expansion (int arg),
   cm_image (int arg),
   cm_insert_copying (void),
-  cm_minus (int arg),
+  cm_guilsinglleft (int arg),
+  cm_guilsinglright (int arg),
   cm_point (int arg),
   cm_print (int arg),
   cm_punct (int arg),
+  cm_quotedblbase (int arg),
+  cm_quotedblleft (int arg),
+  cm_quotedblright (int arg),
+  cm_quoteleft (int arg),
+  cm_quoteright (int arg),
+  cm_quotesinglbase (int arg),
   cm_registeredsymbol (int arg),
   cm_result (int arg);
 
diff --git a/Build/source/utils/texinfo/makeinfo/defun.c b/Build/source/utils/texinfo/makeinfo/defun.c
index 0323353edf5..d1218a0d5cb 100644
--- a/Build/source/utils/texinfo/makeinfo/defun.c
+++ b/Build/source/utils/texinfo/makeinfo/defun.c
@@ -1,13 +1,13 @@
 /* defun.c -- @defun and friends.
-   $Id: defun.c,v 1.11 2004/04/11 17:56:46 karl Exp $
+   $Id: defun.c,v 1.18 2007/09/15 23:48:45 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "defun.h"
@@ -299,9 +298,9 @@ next_nonwhite_defun_arg (char ***arg_pointer)
 /* This is needed also in insertion.c.  */
 
 enum insertion_type
-get_base_type (int type)
+get_base_type (enum insertion_type type)
 {
-  int base_type;
+  enum insertion_type base_type;
   switch (type)
     {
     case defivar:	base_type = defcv; break;
@@ -329,9 +328,9 @@ get_base_type (int type)
    TYPE says which insertion this is.
    X_P, if nonzero, says not to start a new insertion. */
 static void
-defun_internal (int type, int x_p)
+defun_internal (enum insertion_type type, int x_p)
 {
-  int base_type;
+  enum insertion_type base_type;
   char **defun_args, **scan_args;
   const char *category;
   char *defined_name;
@@ -368,7 +367,7 @@ defun_internal (int type, int x_p)
       line_continuation:
         i = strlen (line) - 1;
 
-        if (line[i] == '@' && line[i-1] != '@')
+        if (i > 0 && line[i] == '@' && line[i-1] != '@')
           {
             get_rest_of_line (0, &next_line);
             new_line = (char *) xmalloc (i + strlen (next_line) + 2);
@@ -400,28 +399,28 @@ defun_internal (int type, int x_p)
     {
     case defun:
     case deftypefun:
-      category = _("Function");
+      category = gdt("Function");
       break;
     case defmac:
-      category = _("Macro");
+      category = gdt("Macro");
       break;
     case defspec:
-      category = _("Special Form");
+      category = gdt("Special Form");
       break;
     case defvar:
     case deftypevar:
-      category = _("Variable");
+      category = gdt("Variable");
       break;
     case defopt:
-      category = _("User Option");
+      category = gdt("User Option");
       break;
     case defivar:
     case deftypeivar:
-      category = _("Instance Variable");
+      category = gdt("Instance Variable");
       break;
     case defmethod:
     case deftypemethod:
-      category = _("Method");
+      category = gdt("Method");
       break;
     default:
       category = next_nonwhite_defun_arg (&scan_args);
@@ -497,24 +496,24 @@ defun_internal (int type, int x_p)
         execute_string (" --- %s: %s %s", category, type_name, defined_name);
         break;
       case defcv:
-        execute_string (" --- %s %s %s: %s", category, _("of"), type_name,
+        execute_string (" --- %s %s %s: %s", category, gdt("of"), type_name,
                         defined_name);
         break;
       case deftypecv:
       case deftypeivar:
-        execute_string (" --- %s %s %s: %s %s", category, _("of"), type_name,
+        execute_string (" --- %s %s %s: %s %s", category, gdt("of"), type_name,
                         type_name2, defined_name);
         break;
       case defop:
-        execute_string (" --- %s %s %s: %s", category, _("on"), type_name,
+        execute_string (" --- %s %s %s: %s", category, gdt("on"), type_name,
                         defined_name);
         break;
       case deftypeop:
-        execute_string (" --- %s %s %s: %s %s", category, _("on"), type_name,
+        execute_string (" --- %s %s %s: %s %s", category, gdt("on"), type_name,
                         type_name2, defined_name);
         break;
       case deftypemethod:
-        execute_string (" --- %s %s %s: %s %s", category, _("on"), type_name,
+        execute_string (" --- %s %s %s: %s %s", category, gdt("on"), type_name,
                         type_name2, defined_name);
         break;
       }
@@ -542,13 +541,13 @@ defun_internal (int type, int x_p)
         case defcv:
         case deftypecv:
         case deftypeivar:
-	  execute_string ("--- %s %s %s: ", category, _("of"), type_name);
+	  execute_string ("--- %s %s %s: ", category, gdt("of"), type_name);
 	  break;
 
         case defop:
         case deftypemethod:
         case deftypeop:
-	  execute_string ("--- %s %s %s: ", category, _("on"), type_name);
+	  execute_string ("--- %s %s %s: ", category, gdt("on"), type_name);
 	  break;
 	} /* switch (base_type)... */
 
@@ -641,13 +640,13 @@ defun_internal (int type, int x_p)
 	execute_string ("@vindex %s\n", defined_name);
 	break;
       case deftypeivar:
-	execute_string ("@vindex %s %s %s\n", defined_name, _("of"),
+	execute_string ("@vindex %s %s %s\n", defined_name, gdt("of"),
                         type_name);
 	break;
       case defop:
       case deftypeop:
       case deftypemethod:
-	execute_string ("@findex %s %s %s\n", defined_name, _("on"),
+	execute_string ("@findex %s %s %s\n", defined_name, gdt("on"),
                         type_name);
 	break;
       case deftp:
@@ -688,8 +687,9 @@ defun_internal (int type, int x_p)
 void
 cm_defun (void)
 {
-  int type;
+  enum insertion_type type;
   char *base_command = xstrdup (command);  /* command with any `x' removed */
+  /* FIXME: is strlen(command) allways > 0? */
   int x_p = (command[strlen (command) - 1] == 'x');
 
   if (x_p)
diff --git a/Build/source/utils/texinfo/makeinfo/defun.h b/Build/source/utils/texinfo/makeinfo/defun.h
index 9af73ec4a57..fcd4ff9f448 100644
--- a/Build/source/utils/texinfo/makeinfo/defun.h
+++ b/Build/source/utils/texinfo/makeinfo/defun.h
@@ -1,12 +1,12 @@
 /* defun.h -- declaration for defuns.
-   $Id: defun.h,v 1.2 2004/04/11 17:56:47 karl Exp $
+   $Id: defun.h,v 1.6 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2005, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
 
@@ -24,7 +23,7 @@
 
 #include "insertion.h"
 
-extern enum insertion_type get_base_type (int type);
+extern enum insertion_type get_base_type (enum insertion_type);
 extern void cm_defun (void);
 
 #endif /* !DEFUN_H */
diff --git a/Build/source/utils/texinfo/makeinfo/files.c b/Build/source/utils/texinfo/makeinfo/files.c
index db112262ee2..49e36583f26 100644
--- a/Build/source/utils/texinfo/makeinfo/files.c
+++ b/Build/source/utils/texinfo/makeinfo/files.c
@@ -1,13 +1,13 @@
 /* files.c -- file-related functions for makeinfo.
-   $Id: files.c,v 1.5 2004/07/27 00:06:31 karl Exp $
+   $Id: files.c,v 1.8 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "files.h"
@@ -656,7 +655,7 @@ register_delayed_write (char *delayed_command)
   /* We need the HTML header in the output,
      to get a proper output_position.  */
   if (!executing_string && html)
-    html_output_head ();
+    output_head ();
   /* Get output_position updated.  */
   flush_output ();
 
diff --git a/Build/source/utils/texinfo/makeinfo/files.h b/Build/source/utils/texinfo/makeinfo/files.h
index 0943663467f..856c10814af 100644
--- a/Build/source/utils/texinfo/makeinfo/files.h
+++ b/Build/source/utils/texinfo/makeinfo/files.h
@@ -1,12 +1,12 @@
 /* files.h -- declarations for files.c.
-   $Id: files.h,v 1.4 2004/07/27 00:06:31 karl Exp $
+   $Id: files.h,v 1.7 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef FILES_H
 #define FILES_H
diff --git a/Build/source/utils/texinfo/makeinfo/float.c b/Build/source/utils/texinfo/makeinfo/float.c
index b2c9a3367c1..8866ffb3fd2 100644
--- a/Build/source/utils/texinfo/makeinfo/float.c
+++ b/Build/source/utils/texinfo/makeinfo/float.c
@@ -1,12 +1,12 @@
 /* float.c -- float environment functions.
-   $Id: float.c,v 1.8 2004/07/05 22:23:22 karl Exp $
+   $Id: float.c,v 1.12 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Alper Ersoy <dirt@gtk.org>.  */
 
@@ -219,6 +218,14 @@ cm_listoffloats (void)
         {
           if (strlen (temp->id) > 0 && STREQ (float_type, temp->type))
             {
+              char *caption;
+              if (strlen (temp->shorttitle) > 0)
+                caption = expansion (temp->shorttitle, 0);
+              else if (strlen (temp->title) > 0)
+                caption = expansion (temp->title, 0);
+              else
+                caption = "";
+                  
               if (html)
                 {
                   /* A bit of space for HTML reabality.  */
@@ -242,13 +249,11 @@ cm_listoffloats (void)
                       add_word (temp->number);
                     }
 
-                  if (strlen (temp->title) > 0)
+                  if (caption)
                     {
-                      if (strlen (float_type) > 0
-                          || strlen (temp->id) > 0)
+                      if (strlen (float_type) > 0 || strlen (temp->id) > 0)
                         insert_string (": ");
-
-                      execute_string ("%s", temp->title);
+                      execute_string ("%s", caption);
                     }
 
                   add_word ("</a>");
@@ -259,7 +264,6 @@ cm_listoffloats (void)
                 {
                   char *entry;
                   char *raw_entry;
-                  char *title = expansion (temp->title, 0);
 
                   int len;
                   int aux_chars_len; /* these are asterisk, colon, etc.  */
@@ -285,25 +289,19 @@ cm_listoffloats (void)
 
                   /* Allocate enough space for possible expansion later.  */
                   raw_entry = (char *) xmalloc (strlen (float_type)
-                      + strlen (temp->number) + strlen (title)
+                      + strlen (temp->number) + strlen (caption)
                       + sizeof (":  "));
 
                   sprintf (raw_entry, "%s %s", float_type, temp->number);
 
-                  if (strlen (title) > 0)
+                  if (strlen (caption) > 0)
                     strcat (raw_entry, ": ");
 
                   number_len = strlen (raw_entry);
 
-                  len = strlen (title) + strlen (raw_entry);
-
-                  /* If we have a @shortcaption, try it if @caption is
-                     too long to fit on a line.  */
-                  if (len + aux_chars_len > column_width
-                      && strlen (temp->shorttitle) > 0)
-                    title = expansion (temp->shorttitle, 0);
+                  len = strlen (caption) + strlen (raw_entry);
 
-                  strcat (raw_entry, title);
+                  strcat (raw_entry, caption);
                   len = strlen (raw_entry);
 
                   if (len + aux_chars_len > column_width)
@@ -324,7 +322,7 @@ cm_listoffloats (void)
                          went as far as the beginning.  Just print as much
                          as possible of the title.  */
                       if (len == 0
-                          || (len == number_len && strlen (title) > 0))
+                          || (len == number_len && strlen (caption) > 0))
                         len = column_width - sizeof ("...");
 
                       /* Break here.  */
@@ -393,8 +391,10 @@ cm_listoffloats (void)
                   insert_string (".\n");
 
                   free (entry);
-                  free (title);
                 }
+              
+              if (strlen (caption) > 0)
+                free (caption);
             }
           temp = temp->next;
         }
diff --git a/Build/source/utils/texinfo/makeinfo/float.h b/Build/source/utils/texinfo/makeinfo/float.h
index be9deb58096..d8a0753056b 100644
--- a/Build/source/utils/texinfo/makeinfo/float.h
+++ b/Build/source/utils/texinfo/makeinfo/float.h
@@ -1,12 +1,12 @@
 /* float.h -- declarations for the float environment.
-   $Id: float.h,v 1.5 2004/04/11 17:56:47 karl Exp $
+   $Id: float.h,v 1.8 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Alper Ersoy <dirt@gtk.org>.  */
 
diff --git a/Build/source/utils/texinfo/makeinfo/footnote.c b/Build/source/utils/texinfo/makeinfo/footnote.c
index e5a7f4c08f5..381ce58ce09 100644
--- a/Build/source/utils/texinfo/makeinfo/footnote.c
+++ b/Build/source/utils/texinfo/makeinfo/footnote.c
@@ -1,12 +1,12 @@
 /* footnote.c -- footnotes for Texinfo.
-   $Id: footnote.c,v 1.7 2004/04/11 17:56:47 karl Exp $
+   $Id: footnote.c,v 1.12 2007/12/03 01:38:43 karl Exp $
 
-   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "footnote.h"
@@ -60,9 +59,9 @@ int footnote_count = 0;
 int
 set_footnote_style (char *string)
 {
-  if (strcasecmp (string, "separate") == 0)
+  if (mbscasecmp (string, "separate") == 0)
     footnote_style = separate_node;
-  else if (strcasecmp (string, "end") == 0)
+  else if (mbscasecmp (string, "end") == 0)
     footnote_style = end_node;
   else
     return -1;
@@ -380,7 +379,7 @@ output_pending_notes (void)
       }
 
     if (html)
-      add_word ("<hr></div>");
+      add_html_block_elt ("<hr></div>");
     close_paragraph ();
     free (array);
 
diff --git a/Build/source/utils/texinfo/makeinfo/footnote.h b/Build/source/utils/texinfo/makeinfo/footnote.h
index e4f95102c5f..8a812a62ea7 100644
--- a/Build/source/utils/texinfo/makeinfo/footnote.h
+++ b/Build/source/utils/texinfo/makeinfo/footnote.h
@@ -1,13 +1,13 @@
 /* footnote.h -- declarations for footnote.c.
-   $Id: footnote.h,v 1.2 2004/04/11 17:56:47 karl Exp $
+   $Id: footnote.h,v 1.5 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007 Free Software
    Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef FOOTNOTE_H
 #define FOOTNOTE_H
diff --git a/Build/source/utils/texinfo/makeinfo/html.c b/Build/source/utils/texinfo/makeinfo/html.c
index be2c136d41f..f2ac8dc1dd6 100644
--- a/Build/source/utils/texinfo/makeinfo/html.c
+++ b/Build/source/utils/texinfo/makeinfo/html.c
@@ -1,13 +1,13 @@
 /* html.c -- html-related utilities.
-   $Id: html.c,v 1.28 2004/12/06 01:13:06 karl Exp $
+   $Id: html.c,v 1.41 2007/12/03 01:38:43 karl Exp $
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "cmds.h"
@@ -108,6 +107,7 @@ process_css_file (char *filename)
               if (nextchar == 'i' || nextchar == 'c')
                 {
                   append_char (import_text, c);
+                  append_char (import_text, nextchar);
                   state = import_state;
                 }
               else
@@ -167,6 +167,9 @@ process_css_file (char *filename)
       lastchar = c;
     }
 
+  fclose (f);  /* Even closing stdin should be ok, can't read it more
+                  than once?  */
+  
   /* Reached the end of the file.  We should not be still in a comment.  */
   if (state == comment_state)
     warning (_("%s:%d: --css-file ended in comment"), filename, lineno);
@@ -186,25 +189,18 @@ process_css_file (char *filename)
 HSTACK *htmlstack = NULL;
 
 /* See html.h.  */
-int html_output_head_p = 0;
 int html_title_written = 0;
 
 void
 html_output_head (void)
 {
   static const char *html_title = NULL;
-  char *encoding;
-
-  if (html_output_head_p)
-    return;
-  html_output_head_p = 1;
-
-  encoding = current_document_encoding ();
+  char *encoding = current_document_encoding ();
 
   /* The <title> should not have markup, so use text_expansion.  */
   if (!html_title)
     html_title = escape_string (title ?
-        text_expansion (title) : (char *) _("Untitled"));
+        text_expansion (title) : (char *) gdt("Untitled"));
 
   /* Make sure this is the very first string of the output document.  */
   output_paragraph_offset = 0;
@@ -212,8 +208,8 @@ html_output_head (void)
   add_html_block_elt_args ("<html lang=\"%s\">\n<head>\n",
       language_table[language_code].abbrev);
 
-  /* When splitting, add current node's name to title if it's available and not
-     Top.  */
+  /* When splitting, add current node's name to title if it's available
+     and not Top.  */
   if (splitting && current_node && !STREQ (current_node, "Top"))
     add_word_args ("<title>%s - %s</title>\n",
         escape_string (xstrdup (current_node)), html_title);
@@ -324,7 +320,10 @@ rel=\"generator-home\" title=\"Texinfo Homepage\">\n");
 
     add_word ("--></style>\n");
   }
-
+  if (css_ref)
+    add_word_args ("<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\">\n",
+	            css_ref);
+  
   add_word ("</head>\n<body>\n");
 
   if (title && !html_title_written && titlepage_cmd_present)
@@ -395,7 +394,7 @@ escape_string (char *string)
         }
     }
   while (string[i++]);
-  free (string);
+
   return newstring - newlen;
 }
 
@@ -437,7 +436,9 @@ rollback_empty_tag (char *tag)
   int check_position = output_paragraph_offset;
   int taglen = strlen (tag);
   int rollback_happened = 0;
-  char *contents = "";
+  char *contents = "";			/* FIXME (ptr to constant, later
+  					   assigned to malloc'd address).
+					 */
   char *contents_canon_white = "";
 
   /* If output_paragraph is empty, we cannot rollback :-\  */
@@ -445,7 +446,7 @@ rollback_empty_tag (char *tag)
     return 0;
 
   /* Find the end of the previous tag.  */
-  while (output_paragraph[check_position-1] != '>' && check_position > 0)
+  while (check_position > 0 && output_paragraph[check_position-1] != '>')
     check_position--;
 
   /* Save stuff between tag's end to output_paragraph's end.  */
@@ -462,7 +463,7 @@ rollback_empty_tag (char *tag)
     }
 
   /* Find the start of the previous tag.  */
-  while (output_paragraph[check_position-1] != '<' && check_position > 0)
+  while (check_position > 0 && output_paragraph[check_position-1] != '<')
     check_position--;
 
   /* Check to see if this is the tag.  */
@@ -549,6 +550,7 @@ insert_html_tag_with_attribute (start_or_end, tag, format, va_alist)
   /* texinfo.tex doesn't support more than one font attribute
      at the same time.  */
   if ((start_or_end == START) && old_tag && *old_tag
+      && !STREQ (old_tag, "samp")
       && !rollback_empty_tag (old_tag))
     add_word_args ("</%s>", old_tag);
 
@@ -556,13 +558,13 @@ insert_html_tag_with_attribute (start_or_end, tag, format, va_alist)
     {
       if (start_or_end == START)
         add_word_args (format ? "<%s %s>" : "<%s>", tag, formatted_attribs);
-      else if (!rollback_empty_tag (tag))
+      else if (STREQ (tag, "samp") || !rollback_empty_tag (tag))
         /* Insert close tag only if we didn't rollback,
            in which case the opening tag is removed.  */
         add_word_args ("</%s>", tag);
     }
 
-  if ((start_or_end != START) && old_tag && *old_tag)
+  if ((start_or_end != START) && old_tag && *old_tag && !STREQ (old_tag, "samp"))
     add_word_args (strlen (old_attribs) > 0 ? "<%s %s>" : "<%s>",
         old_tag, old_attribs);
 
@@ -582,11 +584,15 @@ add_link (char *nodename, char *attributes)
 {
   if (nodename)
     {
+      char *escaped_nodename;
       add_html_elt ("<link ");
       add_word_args ("%s", attributes);
       add_word_args (" href=\"");
       add_anchor_name (nodename, 1);
-      add_word_args ("\" title=\"%s\">\n", nodename);
+      escaped_nodename = escape_string (nodename);
+      add_word_args ("\" title=\"%s\">\n", escaped_nodename);
+      if (escaped_nodename != nodename)
+        free (escaped_nodename);
     }
 }
 
@@ -653,10 +659,10 @@ add_anchor_name (char *nodename, int href)
      exact node on its file.  This is so several nodes could share the
      same file, in case of file-name clashes, but also for more
      accurate browser positioning.  */
-  if (strcasecmp (nodename, "(dir)") == 0)
+  if (mbscasecmp (nodename, "(dir)") == 0)
     /* Strip the parens, but keep the original letter-case.  */
     add_word_args ("%.3s", nodename + 1);
-  else if (strcasecmp (nodename, "top") == 0)
+  else if (mbscasecmp (nodename, "top") == 0)
     add_word ("Top");
   else
     add_escaped_anchor_name (nodename, href < 0);
@@ -670,8 +676,10 @@ add_url_name (char *nodename, int href)
     add_nodename_to_filename (nodename, href);
 }
 
-/* Convert non [A-Za-z0-9] to _00xx, where xx means the hexadecimal
-   representation of the ASCII character.  Also convert spaces and
+/* Convert non [A-Za-z0-9] characters depending on the command line options given.
+   If --transliterate-file-names is specified, these are replaced with their ASCII
+   phonetic transliteration. Otherwise, _00xx notation is used, where xx means the
+   hexadecimal representation of the ASCII character.  Also convert spaces and
    newlines to dashes.  */
 static void
 fix_filename (char *filename)
@@ -684,7 +692,11 @@ fix_filename (char *filename)
 
   for (i = 0; i < len; i++)
     {
-      if (cr_or_whitespace (oldname[i]))
+      const char *p = lang_transliterate_char (oldname[i]);
+
+      if (p)
+	strcat (filename, p);
+      else if (cr_or_whitespace (oldname[i]))
         strcat (filename, "-");
       else if (URL_SAFE_CHAR (oldname[i]))
         strncat (filename, (char *) oldname + i, 1);
@@ -715,7 +727,7 @@ nodename_to_filename_1 (char *nodename, int href)
   char *filename;
   char dirname[PATH_MAX];
 
-  if (strcasecmp (nodename, "Top") == 0)
+  if (mbscasecmp (nodename, "Top") == 0)
     {
       /* We want to convert references to the Top node into
 	 "index.html#Top".  */
@@ -724,7 +736,7 @@ nodename_to_filename_1 (char *nodename, int href)
       else
 	filename = xstrdup ("Top");
     }
-  else if (strcasecmp (nodename, "(dir)") == 0)
+  else if (mbscasecmp (nodename, "(dir)") == 0)
     /* We want to convert references to the (dir) node into
        "../index.html".  */
     filename = xstrdup ("../index.html");
diff --git a/Build/source/utils/texinfo/makeinfo/html.h b/Build/source/utils/texinfo/makeinfo/html.h
index d2b5411282f..ab7eb7e9906 100644
--- a/Build/source/utils/texinfo/makeinfo/html.h
+++ b/Build/source/utils/texinfo/makeinfo/html.h
@@ -1,12 +1,12 @@
 /* html.h -- declarations for html-related utilities.
-   $Id: html.h,v 1.6 2004/11/30 02:03:23 karl Exp $
+   $Id: html.h,v 1.10 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef HTML_H
 #define HTML_H
@@ -28,9 +27,6 @@ typedef struct hstack
   char *attribs;
 } HSTACK;
 
-/* Nonzero if we have output the <head>.  */
-extern int html_output_head_p;
-
 /* Nonzero if we have output a title, from @titlefont or @settitle.  */
 extern int html_title_written;
 
diff --git a/Build/source/utils/texinfo/makeinfo/index.c b/Build/source/utils/texinfo/makeinfo/index.c
index 710e8b6855b..6db63f13154 100644
--- a/Build/source/utils/texinfo/makeinfo/index.c
+++ b/Build/source/utils/texinfo/makeinfo/index.c
@@ -1,13 +1,13 @@
 /* index.c -- indexing for Texinfo.
-   $Id: index.c,v 1.17 2004/11/30 02:03:23 karl Exp $
+   $Id: index.c,v 1.26 2007/12/03 01:38:43 karl Exp $
 
-   Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
-   Inc.
+   Copyright (C) 1998, 1999, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,10 +15,10 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
+#include "mbswidth.h"
 #include "files.h"
 #include "footnote.h"
 #include "html.h"
@@ -29,12 +29,8 @@
 #include "toc.h"
 #include "xml.h"
 
-INDEX_ALIST **name_index_alist = NULL;
-
-/* An array of pointers.  Each one is for a different index.  The
-   "synindex" command changes which array slot is pointed to by a
-   given "index". */
-INDEX_ELT **the_indices = NULL;
+/* Nonzero means that we are in the middle of printing an index. */
+int printing_index = 0;
 
 /* The number of defined indices. */
 int defined_indices = 0;
@@ -46,12 +42,14 @@ int index_counter = 0;
 COMMAND **user_command_array = NULL;
 int user_command_array_len = 0;
 
-/* How to compare index entries for sorting.  May be set to strcoll.  */
-int (*index_compare_fn) (const char *a, const char *b) = strcasecmp;
+INDEX_ALIST **name_index_alist = NULL;
 
-/* Function to compare index entries for sorting.  (Calls
-   `index_compare_fn' above.)  */
-int index_element_compare (const void *element1, const void *element2);
+/* An array of pointers.  Each one is for a different index.  The @synindex
+   command changes which array slot is pointed to by a given index.  */
+static INDEX_ELT **the_indices = NULL;
+
+/* How to compare index entries for sorting.  May be set to strcoll.  */
+static int (*index_compare_fn) (const char *a, const char *b) = mbscasecmp;
 
 /* Find which element in the known list of indices has this name.
    Returns -1 if NAME isn't found. */
@@ -260,7 +258,7 @@ index_add_arg (char *name)
   if (xml)
     xml_insert_indexterm (index_entry, name);
 }
-
+
 /* The function which user defined index commands call. */
 static void
 gen_index (void)
@@ -271,7 +269,7 @@ gen_index (void)
   index_add_arg (name);
   free (name);
 }
-
+
 /* Define an index known as NAME.  We assign the slot number.
    If CODE is nonzero, make this a code index. */
 static void
@@ -503,8 +501,8 @@ cm_tindex (void)                    /* Data Type index. */
 {
   index_add_arg ("tp");
 }
-
-int
+
+static int
 index_element_compare (const void *element1, const void *element2)
 {
   INDEX_ELT **elt1 = (INDEX_ELT **) element1;
@@ -653,11 +651,28 @@ sort_index (INDEX_ELT *index)
 
   return array;
 }
+
+/* Return the number of times that the byte CH occurs in the LEN bytes
+   starting at STR.  Multibyte strings are not taken into account, which
+   is incorrect, but we need this for @tie; see more comments below.  */
+
+static int
+count_strn_chars (const char *str, int len, int ch)
+{
+  int count = 0;
+  int i;
+  
+  for (i = 0; i < len; i++)
+    if (str[i] == ch)
+      count++;
+
+  return count;
+}
 
 static void
 insert_index_output_line_no (int line_number, int output_line_number_len)
 {
-  int last_column;
+  int last_column, out_line_no_width;
   int str_size = output_line_number_len + strlen (_("(line )"))
     + sizeof (NULL);
   char *out_line_no_str = (char *) xmalloc (str_size + 1);
@@ -673,16 +688,20 @@ insert_index_output_line_no (int line_number, int output_line_number_len)
     int i = output_paragraph_offset; 
     while (0 < i && output_paragraph[i-1] != '\n')
       i--;
-    last_column = output_paragraph_offset - i;
+    last_column = mbsnwidth ((char *)(output_paragraph + i),
+			     output_paragraph_offset - i, 0);
+    last_column += count_strn_chars (output_paragraph + i,
+                              output_paragraph_offset - i, NON_BREAKING_SPACE);
   }
 
-  if (last_column + strlen (out_line_no_str) > fill_column)
+  out_line_no_width = mbswidth (out_line_no_str, 0);
+  if (last_column + out_line_no_width > fill_column)
     {
       insert ('\n');
       last_column = 0;
     }
 
-  while (last_column + strlen (out_line_no_str) < fill_column)
+  while (last_column + out_line_no_width < fill_column)
     {
       insert (' ');
       last_column++;
@@ -693,10 +712,7 @@ insert_index_output_line_no (int line_number, int output_line_number_len)
 
   free (out_line_no_str);
 }
-
-/* Nonzero means that we are in the middle of printing an index. */
-int printing_index = 0;
-
+
 /* Takes one arg, a short name of an index to print.
    Outputs a menu of the sorted elements of the index. */
 void
@@ -711,10 +727,11 @@ cm_printindex (void)
   if (!handling_delayed_writes)
     line_number--;
 
-  if (xml && !docbook)
+  if (xml)
     {
       xml_insert_element (PRINTINDEX, START);
-      insert_string (index_name);
+      if (! docbook)
+	insert_string (index_name);
       xml_insert_element (PRINTINDEX, END);
     }
   else if (!handling_delayed_writes)
@@ -723,9 +740,6 @@ cm_printindex (void)
       char *index_command = xmalloc (command_len + 1);
 
       close_paragraph ();
-      if (docbook)
-        xml_begin_index ();
-
       sprintf (index_command, "@%s %s", command, index_name);
       register_delayed_write (index_command);
       free (index_command);
@@ -869,15 +883,14 @@ cm_printindex (void)
             }
           else if (xml && docbook)
             {
-              /* In the DocBook case, the expanded index entry is not
-                 good for us, since it was expanded for non-DocBook mode
-                 inside sort_index.  So we send the original entry text
-                 to be used with execute_string.  */
-              xml_insert_indexentry (index->entry_text, index_node);
+	      /* Let DocBook processor generate the index. */
             }
           else
             {
-              unsigned new_length = strlen (index->entry);
+#define MIN_ENTRY_COLUMNS 37
+	      /* Make sure there is enough space even if index->entry has zero
+		 width. */
+              unsigned new_length = strlen (index->entry) + MIN_ENTRY_COLUMNS;
 
               if (new_length < 50) /* minimum length used below */
                 new_length = 50;
@@ -894,10 +907,25 @@ cm_printindex (void)
                  @@ has turned into @. */
               if (!no_headers)
                 {
-                  sprintf (line, "* %-37s  ", index->entry);
+                  int nspaces;
+		  int width = mbswidth (index->entry, 0);
+		  
+		  /* Unfortunately, our @tie{} / @w{ } magic is an
+                     unprintable character, and so mbswidth doesn't
+                     count it.  If that byte value occurs in a multibyte
+                     string, we'd lose, but at least it's only a
+                     question of minor formatting, not functionality.  */
+		  width += count_strn_chars (index->entry,
+                                    strlen (index->entry), NON_BREAKING_SPACE);
+		  
+		  nspaces = -(strlen (index->entry)
+                              + (MIN_ENTRY_COLUMNS - width));
+                  sprintf (line, "* %*s  ",
+                           width < MIN_ENTRY_COLUMNS ? nspaces : 0, 
+			   index->entry);
                   line[2 + strlen (index->entry)] = ':';
                   insert_string (line);
-                  /* Make sure any non-macros in the node name are expanded.  */
+                  /* Expand any non-macros in the node name.  */
                   in_fixed_width_font++;
                   execute_string ("%s. ", index_node);
                   insert_index_output_line_no (index->output_line,
@@ -910,7 +938,8 @@ cm_printindex (void)
                      there's little sense in referring to them in the
                      index.  Instead, output the number or name of the
                      section that corresponds to that node.  */
-                  sprintf (line, "%-*s ", number_sections ? 46 : 1, index->entry);
+                  sprintf (line, "%-*s ", number_sections ? 46 : 1,
+                           index->entry);
                   line[strlen (index->entry)] = ':';
                   insert_string (line);
 
diff --git a/Build/source/utils/texinfo/makeinfo/index.h b/Build/source/utils/texinfo/makeinfo/index.h
index 3ff723daa18..1e7810720e9 100644
--- a/Build/source/utils/texinfo/makeinfo/index.h
+++ b/Build/source/utils/texinfo/makeinfo/index.h
@@ -1,12 +1,12 @@
 /* index.h -- declarations for index.c.
-   $Id: index.h,v 1.2 2004/04/11 17:56:47 karl Exp $
+   $Id: index.h,v 1.6 2007/09/26 20:53:40 karl Exp $
 
-   Copyright (C) 1998, 99 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef INDEX_H
 #define INDEX_H
@@ -23,6 +22,10 @@
 #include "makeinfo.h"
 #include "cmds.h"
 
+extern int printing_index;
+extern int defined_indices;
+extern int index_counter;
+
 /* User commands are only new indices.  (Macros are handled separately.)  */
 extern COMMAND **user_command_array;
 extern int user_command_array_len;
@@ -84,10 +87,6 @@ extern INDEX_ALIST **name_index_alist;
 /* Initialize all indices.  */
 extern void init_indices (void);
 
-extern int defined_indices;
-extern int printing_index;
-extern int index_counter;
-
 INDEX_ELT *index_list (char *name);
 
 #endif /* !INDEX_H */
diff --git a/Build/source/utils/texinfo/makeinfo/insertion.c b/Build/source/utils/texinfo/makeinfo/insertion.c
index 05a20440eba..9928115f6a5 100644
--- a/Build/source/utils/texinfo/makeinfo/insertion.c
+++ b/Build/source/utils/texinfo/makeinfo/insertion.c
@@ -1,13 +1,13 @@
 /* insertion.c -- insertions for Texinfo.
-   $Id: insertion.c,v 1.55 2004/11/11 18:34:28 karl Exp $
+   $Id: insertion.c,v 1.71 2008/04/09 17:31:10 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "cmds.h"
@@ -79,6 +78,8 @@ static int raw_output_block = 0;
 /* Non-zero if a <dl> element has a <dt> element in it.  We use this when
    deciding whether to insert a <br> or not.  */
 static int html_deflist_has_term = 0;
+
+const char default_item_function[] = { "@bullet" };
 
 void
 init_insertion_stack (void)
@@ -142,7 +143,7 @@ current_item_function (void)
    change it to "@ ", since "@" by itself is not a command.  This makes
    "@ ", "@\t", and "@\n" all the same, but their default meanings are
    the same anyway, and let's not worry about supporting redefining them.  */
-static char *
+char *
 get_item_function (void)
 {
   char *item_function;
@@ -209,7 +210,10 @@ pop_insertion (void)
   inhibit_paragraph_indentation = temp->inhibited;
   filling_enabled = temp->filling_enabled;
   indented_fill = temp->indented_fill;
-  free_and_clear (&(temp->item_function));
+  if (temp->item_function == default_item_function)
+    temp->item_function = NULL;
+  else
+    free_and_clear (&(temp->item_function));
   free_and_clear (&(temp->filename));
   insertion_stack = insertion_stack->next;
   free (temp);
@@ -370,7 +374,7 @@ enumerate_item (void)
   else
     sprintf (temp, "%d. ", current_enumval);
 
-  indent (output_column += (current_indent - strlen (temp)));
+  indent (current_output_column () + (current_indent - strlen (temp)));
   add_word (temp);
   current_enumval++;
 }
@@ -472,7 +476,7 @@ begin_insertion (enum insertion_type type)
       if (xml)
         {
           xml_insert_element (DETAILMENU, START);
-          skip_whitespace_and_newlines();
+          skip_whitespace_and_newlines ();
         }
       else
         in_fixed_width_font++;
@@ -484,7 +488,12 @@ begin_insertion (enum insertion_type type)
       close_single_paragraph ();
       filling_enabled = no_indent = 0;
       inhibit_paragraph_indentation = 1;
-      insert_string ("START-INFO-DIR-ENTRY\n");
+      add_word ("START-INFO-DIR-ENTRY\n");
+      
+      /* The zsh manual, maybe others, wrongly indents the * line of the
+         direntry in the source.  Ignore that whitespace.  */
+      skip_whitespace_and_newlines ();
+      no_discard++;
       break;
 
     case documentdescription:
@@ -522,7 +531,7 @@ begin_insertion (enum insertion_type type)
          output it right away since xml output is never split.
          For html, we output it specifically in html_output_head. 
          For plain text, there's no way to hide it, so the author must
-          use @insertcopying in the desired location.  */
+         use @insertcopying in the desired location.  */
       if (docbook)
 	{
 	  if (!xml_in_bookinfo)
@@ -538,7 +547,6 @@ begin_insertion (enum insertion_type type)
 
       if (docbook)
         xml_insert_element (LEGALNOTICE, END);
-
       break;
 
     case quotation:
@@ -553,8 +561,8 @@ begin_insertion (enum insertion_type type)
           last_char_was_newline = no_indent = 0;
           indented_fill = filling_enabled = 1;
           inhibit_paragraph_indentation = 1;
+          current_indent += default_indentation_increment;
         }
-      current_indent += default_indentation_increment;
       if (xml)
         xml_insert_quotation (insertion_stack->item_function, START);
       else if (strlen(insertion_stack->item_function))
@@ -622,7 +630,7 @@ begin_insertion (enum insertion_type type)
           if (!(*insertion_stack->item_function))
             {
               free (insertion_stack->item_function);
-              insertion_stack->item_function = xstrdup ("@bullet");
+              insertion_stack->item_function = (char *) default_item_function;
             }
         }
 
@@ -955,9 +963,9 @@ begin_insertion (enum insertion_type type)
    of the stack.  Otherwise, if TYPE doesn't match the top of the
    insertion stack, give error. */
 static void
-end_insertion (int type)
+end_insertion (enum insertion_type type)
 {
-  int temp_type;
+  enum insertion_type temp_type;
 
   if (!insertion_level)
     return;
@@ -1082,7 +1090,9 @@ end_insertion (int type)
           xml_keep_space--;
         }
 
-      if ((xml || html) && output_paragraph[output_paragraph_offset-1] == '\n')
+      if ((xml || html)
+	  && output_paragraph_offset > 0
+	  && output_paragraph[output_paragraph_offset-1] == '\n')
         output_paragraph_offset--;
       break;
 
@@ -1211,7 +1221,7 @@ end_insertion (int type)
          without a change in indentation. */
       if (type != format && type != smallformat && type != quotation)
         current_indent -= example_indentation_increment;
-      else if (type == quotation)
+      else if (type == quotation && !html)
         current_indent -= default_indentation_increment;
 
       if (html)
@@ -1219,8 +1229,10 @@ end_insertion (int type)
              does not function here, since we've inserted non-whitespace
              (the </whatever>) before it.  The indentation already got
              inserted at the end of the last example line, so we have to
-             delete it, or browsers wind up showing an extra blank line.  */
-          kill_self_indent (default_indentation_increment);
+             delete it, or browsers wind up showing an extra blank line.
+             Furthermore, if we're inside indented environments, we
+             might have arbitrarily much indentation, so remove it all.  */
+          kill_self_indent (-1);
           add_html_block_elt (type == quotation
               ? "</blockquote>\n" : "</pre>\n");
         }
@@ -1361,7 +1373,8 @@ cm_example (void)
     {
       /* Rollback previous newlines.  These occur between
          </para> and <example>.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
+      if (output_paragraph_offset > 0
+	  && output_paragraph[output_paragraph_offset-1] == '\n')
         output_paragraph_offset--;
 
       xml_insert_element (EXAMPLE, START);
@@ -1384,7 +1397,8 @@ cm_smallexample (void)
   if (xml)
     {
       /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
+      if (output_paragraph_offset > 0
+	  && output_paragraph[output_paragraph_offset-1] == '\n')
         output_paragraph_offset--;
       xml_insert_element (SMALLEXAMPLE, START);
       if (docbook)
@@ -1403,7 +1417,8 @@ cm_lisp (void)
   if (xml)
     {
       /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
+      if (output_paragraph_offset > 0
+	  && output_paragraph[output_paragraph_offset-1] == '\n')
         output_paragraph_offset--;
       xml_insert_element (LISP, START);
       if (docbook)
@@ -1422,7 +1437,8 @@ cm_smalllisp (void)
   if (xml)
     {
       /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
+      if (output_paragraph_offset > 0
+	  && output_paragraph[output_paragraph_offset-1] == '\n')
         output_paragraph_offset--;
       xml_insert_element (SMALLLISP, START);
       if (docbook)
@@ -1459,6 +1475,12 @@ cm_insert_copying (void)
       return;
     }
 
+  /* It is desirable that @copying is set early in the input file.  For
+     Info output, we write the copying text out right away, and thus it
+     may well be the first thing in the output, and we want the file
+     header first.  The special case in add_char has to check for
+     executing_string, so it won't be effective.  Thus, do it explicitly.  */
+  output_head ();
   execute_string ("%s", copying_text);
 
   if (!xml && !html)
@@ -1483,7 +1505,8 @@ cm_format (void)
       else
         {
           /* See cm_example comments about newlines.  */
-          if (output_paragraph[output_paragraph_offset-1] == '\n')
+          if (output_paragraph_offset > 0
+	      && output_paragraph[output_paragraph_offset-1] == '\n')
             output_paragraph_offset--;
           xml_insert_element (FORMAT, START);
           if (docbook)
@@ -1499,7 +1522,8 @@ cm_smallformat (void)
   if (xml)
     {
       /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
+      if (output_paragraph_offset > 0
+	  && output_paragraph[output_paragraph_offset-1] == '\n')
         output_paragraph_offset--;
       xml_insert_element (SMALLFORMAT, START);
       if (docbook)
@@ -1515,7 +1539,8 @@ cm_display (void)
   if (xml)
     {
       /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
+      if (output_paragraph_offset > 0
+	  && output_paragraph[output_paragraph_offset-1] == '\n')
         output_paragraph_offset--;
       xml_insert_element (DISPLAY, START);
       if (docbook)
@@ -1531,7 +1556,8 @@ cm_smalldisplay (void)
   if (xml)
     {
       /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
+      if (output_paragraph_offset > 0
+	  && output_paragraph[output_paragraph_offset-1] == '\n')
         output_paragraph_offset--;
       xml_insert_element (SMALLDISPLAY, START);
       if (docbook)
@@ -1576,7 +1602,7 @@ cm_itemize (void)
 /* Start an enumeration insertion of type TYPE.  If the user supplied
    no argument on the line, then use DEFAULT_STRING as the initial string. */
 static void
-do_enumeration (int type, char *default_string)
+do_enumeration (enum insertion_type type, char *default_string)
 {
   get_until_in_line (0, ".", &enumeration_arg);
   canon_white (enumeration_arg);
@@ -1608,14 +1634,20 @@ cm_enumerate (void)
   do_enumeration (enumerate, "1");
 }
 
-/*  Handle verbatim environment:
+
+
+/* Handle verbatim environment:
     find_end_verbatim == 0:  process until end of file
     find_end_verbatim != 0:  process until 'COMMAND_PREFIXend verbatim'
                              or end of file
 
-  We cannot simply copy input stream onto output stream; as the
-  verbatim environment may be encapsulated in an @example environment,
-  for example. */
+   No indentation is inserted: this is verbatim after all.
+   If you want indentation, enclose @verbatim in @example.
+
+   Thus, we cannot simply copy the input to the output, since the
+   verbatim environment may be encapsulated in an @example environment,
+   for example. */
+
 void
 handle_verbatim_environment (int find_end_verbatim)
 {
@@ -1623,7 +1655,6 @@ handle_verbatim_environment (int find_end_verbatim)
   int seen_end = 0;
   int save_filling_enabled = filling_enabled;
   int save_inhibit_paragraph_indentation = inhibit_paragraph_indentation;
-  int save_escape_html = escape_html;
 
   if (!insertion_stack)
     close_single_paragraph (); /* no blank lines if not at outer level */
@@ -1632,11 +1663,6 @@ handle_verbatim_environment (int find_end_verbatim)
   in_fixed_width_font++;
   last_char_was_newline = 0;
 
-  /* No indentation: this is verbatim after all
-     If you want indent, enclose @verbatim in @example
-       current_indent += default_indentation_increment;
-   */
-
   if (html)
     { /* If inside @example, we'll be preceded by the indentation
          already.  Browsers will ignore those spaces because we're about
@@ -1651,10 +1677,15 @@ handle_verbatim_environment (int find_end_verbatim)
   else if (xml)
     {
       xml_insert_element (VERBATIM, START);
-      escape_html = 0;
-      add_word ("<![CDATA[");
     }
 
+  if (find_end_verbatim)
+    { /* Ignore the remainder of the @verbatim line.  */
+      char *junk;
+      get_rest_of_line (0, &junk);
+      free (junk);
+    }
+  
   while (input_text_offset < input_text_length)
     {
       character = curchar ();
@@ -1693,9 +1724,7 @@ handle_verbatim_environment (int find_end_verbatim)
     }
   else if (xml)
     {
-      add_word ("]]>");
       xml_insert_element (VERBATIM, END);
-      escape_html = save_escape_html;
     }
   
   in_fixed_width_font--;
@@ -2054,7 +2083,7 @@ void
 cm_end (void)
 {
   char *temp;
-  int type;
+  enum insertion_type type;
 
   get_rest_of_line (0, &temp);
 
@@ -2194,8 +2223,7 @@ cm_item (void)
 
                   if (current_item_function ())
                     {
-                      output_column = current_indent - 2;
-                      indent (output_column);
+                      indent (current_indent - 2);
 
                       /* The item marker can be given with or without
                          braces -- @bullet and @bullet{} are both ok.
@@ -2214,7 +2242,6 @@ cm_item (void)
                             execute_string ("%s", item_func);
                         }
                       insert (' ');
-                      output_column++;
                     }
                   else
                     enumerate_item ();
diff --git a/Build/source/utils/texinfo/makeinfo/insertion.h b/Build/source/utils/texinfo/makeinfo/insertion.h
index ace55716f2a..75e5468d907 100644
--- a/Build/source/utils/texinfo/makeinfo/insertion.h
+++ b/Build/source/utils/texinfo/makeinfo/insertion.h
@@ -1,12 +1,13 @@
 /* insertion.h -- declarations for insertion.c.
-   $Id: insertion.h,v 1.10 2004/04/11 17:56:47 karl Exp $
+   $Id: insertion.h,v 1.15 2008/01/31 18:33:27 karl Exp $
 
-   Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2002, 2003, 2007, 2008
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef INSERTION_H
 #define INSERTION_H
@@ -35,6 +35,8 @@ enum insertion_type
   table, tex, vtable, titlepage, bad_type
 };
 
+extern const char default_item_function[];
+
 typedef struct istack_elt
 {
   struct istack_elt *next;
@@ -75,4 +77,6 @@ extern int is_in_insertion_of_type (int type);
 extern int command_needs_braces (char *cmd);
 
 extern enum insertion_type find_type_from_name (char *name);
+
+extern char *get_item_function (void);
 #endif /* !INSERTION_H */
diff --git a/Build/source/utils/texinfo/makeinfo/lang.c b/Build/source/utils/texinfo/makeinfo/lang.c
index c72e8dbc631..a56cb617e57 100644
--- a/Build/source/utils/texinfo/makeinfo/lang.c
+++ b/Build/source/utils/texinfo/makeinfo/lang.c
@@ -1,13 +1,13 @@
 /* lang.c -- language-dependent support.
-   $Id: lang.c,v 1.14 2004/11/22 23:57:33 karl Exp $
+   $Id: lang.c,v 1.34 2007/12/03 01:38:43 karl Exp $
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
 
@@ -27,16 +26,21 @@
 #include "makeinfo.h"
 #include "xml.h"
 
+#include <assert.h>
+
 /* Current document encoding.  */
 encoding_code_type document_encoding_code = no_encoding;
 
 /* Current language code; default is English.  */
 language_code_type language_code = en;
 
+/* Language to use for translations that end up in the output. */
+char *document_language = "C";
+
 /* By default, unsupported encoding is an empty string.  */
 char *unknown_encoding = NULL;
 
-static iso_map_type us_ascii_map [] = {{NULL, 0, 0}}; /* ASCII map is trivial */
+static iso_map_type asis_map [] = {{NULL, 0, 0}}; /* ASCII, etc. */
 
 /* Translation table between HTML and ISO Codes.  The last item is
    hopefully the Unicode. It might be possible that those Unicodes are
@@ -74,79 +78,79 @@ static iso_map_type iso8859_1_map [] = {
   { "frac12", 0xBD, 0x00BD },
   { "frac34", 0xBE, 0x00BE },
   { "iquest", 0xBF, 0x00BF },
-  { "Agrave", 0xC0, 0x00C0 },
-  { "Aacute", 0xC1, 0x00C1 },
-  { "Acirc",  0xC2, 0x00C2 },
-  { "Atilde", 0xC3, 0x00C3 },
-  { "Auml",   0xC4, 0x00C4 },
-  { "Aring",  0xC5, 0x00C5 },
-  { "AElig",  0xC6, 0x00C6 },
-  { "Ccedil", 0xC7, 0x00C7 },
-  { "Ccedil", 0xC7, 0x00C7 },
-  { "Egrave", 0xC8, 0x00C8 },
-  { "Eacute", 0xC9, 0x00C9 },
-  { "Ecirc",  0xCA, 0x00CA },
-  { "Euml",   0xCB, 0x00CB },
-  { "Igrave", 0xCC, 0x00CC },
-  { "Iacute", 0xCD, 0x00CD },
-  { "Icirc",  0xCE, 0x00CE },
-  { "Iuml",   0xCF, 0x00CF },
-  { "ETH",    0xD0, 0x00D0 },
-  { "Ntilde", 0xD1, 0x00D1 },
-  { "Ograve", 0xD2, 0x00D2 },
-  { "Oacute", 0xD3, 0x00D3 },
-  { "Ocirc",  0xD4, 0x00D4 },
-  { "Otilde", 0xD5, 0x00D5 },
-  { "Ouml",   0xD6, 0x00D6 },
+  { "Agrave", 0xC0, 0x00C0, "A" },
+  { "Aacute", 0xC1, 0x00C1, "A" },
+  { "Acirc",  0xC2, 0x00C2, "A" },
+  { "Atilde", 0xC3, 0x00C3, "A" },
+  { "Auml",   0xC4, 0x00C4, "A" },
+  { "Aring",  0xC5, 0x00C5, "AA" },
+  { "AElig",  0xC6, 0x00C6, "AE" },
+  { "Ccedil", 0xC7, 0x00C7, "C" },
+  { "Ccedil", 0xC7, 0x00C7, "C" },
+  { "Egrave", 0xC8, 0x00C8, "E" },
+  { "Eacute", 0xC9, 0x00C9, "E" },
+  { "Ecirc",  0xCA, 0x00CA, "E" },
+  { "Euml",   0xCB, 0x00CB, "E" },
+  { "Igrave", 0xCC, 0x00CC, "I" },
+  { "Iacute", 0xCD, 0x00CD, "I" },
+  { "Icirc",  0xCE, 0x00CE, "I" },
+  { "Iuml",   0xCF, 0x00CF, "I" },
+  { "ETH",    0xD0, 0x00D0, "DH" },
+  { "Ntilde", 0xD1, 0x00D1, "N" },
+  { "Ograve", 0xD2, 0x00D2, "O" },
+  { "Oacute", 0xD3, 0x00D3, "O" },
+  { "Ocirc",  0xD4, 0x00D4, "O" },
+  { "Otilde", 0xD5, 0x00D5, "O" },
+  { "Ouml",   0xD6, 0x00D6, "O" },
   { "times",  0xD7, 0x00D7 },
-  { "Oslash", 0xD8, 0x00D8 },
-  { "Ugrave", 0xD9, 0x00D9 },
-  { "Uacute", 0xDA, 0x00DA },
-  { "Ucirc",  0xDB, 0x00DB },
-  { "Uuml",   0xDC, 0x00DC },
-  { "Yacute", 0xDD, 0x00DD },
-  { "THORN",  0xDE, 0x00DE },
-  { "szlig",  0xDF, 0x00DF },
-  { "agrave", 0xE0, 0x00E0 },
-  { "aacute", 0xE1, 0x00E1 },
-  { "acirc",  0xE2, 0x00E2 },
-  { "atilde", 0xE3, 0x00E3 },
-  { "auml",   0xE4, 0x00E4 },
-  { "aring",  0xE5, 0x00E5 },
-  { "aelig",  0xE6, 0x00E6 },
-  { "ccedil", 0xE7, 0x00E7 },
-  { "egrave", 0xE8, 0x00E8 },
-  { "eacute", 0xE9, 0x00E9 },
-  { "ecirc",  0xEA, 0x00EA },
-  { "euml",   0xEB, 0x00EB },
-  { "igrave", 0xEC, 0x00EC },
-  { "iacute", 0xED, 0x00ED },
-  { "icirc",  0xEE, 0x00EE },
-  { "iuml",   0xEF, 0x00EF },
-  { "eth",    0xF0, 0x00F0 },
-  { "ntilde", 0xF1, 0x00F1 },
-  { "ograve", 0xF2, 0x00F2 },
-  { "oacute", 0xF3, 0x00F3 },
-  { "ocirc",  0xF4, 0x00F4 },
-  { "otilde", 0xF5, 0x00F5 },
-  { "ouml",   0xF6, 0x00F6 },
+  { "Oslash", 0xD8, 0x00D8, "OE" },
+  { "Ugrave", 0xD9, 0x00D9, "U" },
+  { "Uacute", 0xDA, 0x00DA, "U" },
+  { "Ucirc",  0xDB, 0x00DB, "U" },
+  { "Uuml",   0xDC, 0x00DC, "U" },
+  { "Yacute", 0xDD, 0x00DD, "Y" },
+  { "THORN",  0xDE, 0x00DE, "TH" },
+  { "szlig",  0xDF, 0x00DF, "s" },
+  { "agrave", 0xE0, 0x00E0, "a" },
+  { "aacute", 0xE1, 0x00E1, "a" },
+  { "acirc",  0xE2, 0x00E2, "a" },
+  { "atilde", 0xE3, 0x00E3, "a" },
+  { "auml",   0xE4, 0x00E4, "a" },
+  { "aring",  0xE5, 0x00E5, "aa" },
+  { "aelig",  0xE6, 0x00E6, "ae" },
+  { "ccedil", 0xE7, 0x00E7, "c" },
+  { "egrave", 0xE8, 0x00E8, "e" },
+  { "eacute", 0xE9, 0x00E9, "e" },
+  { "ecirc",  0xEA, 0x00EA, "e" },
+  { "euml",   0xEB, 0x00EB, "e" },
+  { "igrave", 0xEC, 0x00EC, "i" },
+  { "iacute", 0xED, 0x00ED, "i" },
+  { "icirc",  0xEE, 0x00EE, "i" },
+  { "iuml",   0xEF, 0x00EF, "i" },
+  { "eth",    0xF0, 0x00F0, "dh" },
+  { "ntilde", 0xF1, 0x00F1, "n" },
+  { "ograve", 0xF2, 0x00F2, "o"},
+  { "oacute", 0xF3, 0x00F3, "o" },
+  { "ocirc",  0xF4, 0x00F4, "o" },
+  { "otilde", 0xF5, 0x00F5, "o" },
+  { "ouml",   0xF6, 0x00F6, "o" },
   { "divide", 0xF7, 0x00F7 },
-  { "oslash", 0xF8, 0x00F8 },
-  { "ugrave", 0xF9, 0x00F9 },
-  { "uacute", 0xFA, 0x00FA },
-  { "ucirc",  0xFB, 0x00FB },
-  { "uuml",   0xFC, 0x00FC },
-  { "yacute", 0xFD, 0x00FD },
-  { "thorn",  0xFE, 0x00FE },
-  { "yuml",   0xFF, 0x00FF },
+  { "oslash", 0xF8, 0x00F8, "oe" },
+  { "ugrave", 0xF9, 0x00F9, "u" },
+  { "uacute", 0xFA, 0x00FA, "u" },
+  { "ucirc",  0xFB, 0x00FB, "u" },
+  { "uuml",   0xFC, 0x00FC, "u" },
+  { "yacute", 0xFD, 0x00FD, "y" },
+  { "thorn",  0xFE, 0x00FE, "th" },
+  { "yuml",   0xFF, 0x00FF, "y" },
   { NULL, 0, 0 }
 };
 
 
 /* ISO 8859-15, also known as Latin 9, differs from Latin 1 in only a
    few positions.  http://www.cs.tut.fi/~jkorpela/latin9.html has a good
-   explanation and listing, summarized here.  The names are abbreviated
-   from the official Unicode names, to fit in a decent line length.
+   explanation and listing, summarized here.  The names here are
+   abbreviated to fit in a decent line length.
 
   code position
   dec	oct   hex   latin1 latin1 name	      latin9 latin9 name
@@ -168,9 +172,9 @@ static iso_map_type iso8859_15_map [] = {
   { "pound",  0xA3, 0x00A3 },
   { "euro",   0xA4, 0x20AC },
   { "yen",    0xA5, 0x00A5 },
-  { "Scaron", 0xA6, 0x0160 },
+  { "Scaron", 0xA6, 0x0160, "S" },
   { "sect",   0xA7, 0x00A7 },
-  { "scaron", 0xA8, 0x0161 },
+  { "scaron", 0xA8, 0x0161, "s" },
   { "copy",   0xA9, 0x00A9 },
   { "ordf",   0xAA, 0x00AA },
   { "laquo",  0xAB, 0x00AB },
@@ -182,83 +186,82 @@ static iso_map_type iso8859_15_map [] = {
   { "plusmn", 0xB1, 0x00B1 },
   { "sup2",   0xB2, 0x00B2 },
   { "sup3",   0xB3, 0x00B3 },
-  { "Zcaron", 0xB4, 0x017D },
+  { "Zcaron", 0xB4, 0x017D, "Z" },
   { "micro",  0xB5, 0x00B5 },
   { "para",   0xB6, 0x00B6 },
   { "middot", 0xB7, 0x00B7 },
-  { "zcaron", 0xB8, 0x017E },
+  { "zcaron", 0xB8, 0x017E, "z" },
   { "sup1",   0xB9, 0x00B9 },
   { "ordm",   0xBA, 0x00BA },
   { "raquo",  0xBB, 0x00BB },
-  { "OElig",  0xBC, 0x0152 },
-  { "oelig",  0xBD, 0x0153 },
-  { "Yuml",   0xBE, 0x0178 },
+  { "OElig",  0xBC, 0x0152, "OE" },
+  { "oelig",  0xBD, 0x0153, "oe" },
+  { "Yuml",   0xBE, 0x0178, "y" },
   { "iquest", 0xBF, 0x00BF },
-  { "Agrave", 0xC0, 0x00C0 },
-  { "Aacute", 0xC1, 0x00C1 },
-  { "Acirc",  0xC2, 0x00C2 },
-  { "Atilde", 0xC3, 0x00C3 },
-  { "Auml",   0xC4, 0x00C4 },
-  { "Aring",  0xC5, 0x00C5 },
-  { "AElig",  0xC6, 0x00C6 },
-  { "Ccedil", 0xC7, 0x00C7 },
-  { "Ccedil", 0xC7, 0x00C7 },
-  { "Egrave", 0xC8, 0x00C8 },
-  { "Eacute", 0xC9, 0x00C9 },
-  { "Ecirc",  0xCA, 0x00CA },
-  { "Euml",   0xCB, 0x00CB },
-  { "Igrave", 0xCC, 0x00CC },
-  { "Iacute", 0xCD, 0x00CD },
-  { "Icirc",  0xCE, 0x00CE },
-  { "Iuml",   0xCF, 0x00CF },
-  { "ETH",    0xD0, 0x00D0 },
-  { "Ntilde", 0xD1, 0x00D1 },
-  { "Ograve", 0xD2, 0x00D2 },
-  { "Oacute", 0xD3, 0x00D3 },
-  { "Ocirc",  0xD4, 0x00D4 },
-  { "Otilde", 0xD5, 0x00D5 },
-  { "Ouml",   0xD6, 0x00D6 },
+  { "Agrave", 0xC0, 0x00C0, "A" },
+  { "Aacute", 0xC1, 0x00C1, "A" },
+  { "Acirc",  0xC2, 0x00C2, "A" },
+  { "Atilde", 0xC3, 0x00C3, "A" },
+  { "Auml",   0xC4, 0x00C4, "A" },
+  { "Aring",  0xC5, 0x00C5, "AA" },
+  { "AElig",  0xC6, 0x00C6, "AE" },
+  { "Ccedil", 0xC7, 0x00C7, "C" },
+  { "Egrave", 0xC8, 0x00C8, "E" },
+  { "Eacute", 0xC9, 0x00C9, "E" },
+  { "Ecirc",  0xCA, 0x00CA, "E" },
+  { "Euml",   0xCB, 0x00CB, "E" },
+  { "Igrave", 0xCC, 0x00CC, "I" },
+  { "Iacute", 0xCD, 0x00CD, "I" },
+  { "Icirc",  0xCE, 0x00CE, "I" },
+  { "Iuml",   0xCF, 0x00CF, "I" },
+  { "ETH",    0xD0, 0x00D0, "DH" },
+  { "Ntilde", 0xD1, 0x00D1, "N" },
+  { "Ograve", 0xD2, 0x00D2, "O" },
+  { "Oacute", 0xD3, 0x00D3, "O" },
+  { "Ocirc",  0xD4, 0x00D4, "O" },
+  { "Otilde", 0xD5, 0x00D5, "O" },
+  { "Ouml",   0xD6, 0x00D6, "O" },
   { "times",  0xD7, 0x00D7 },
-  { "Oslash", 0xD8, 0x00D8 },
-  { "Ugrave", 0xD9, 0x00D9 },
-  { "Uacute", 0xDA, 0x00DA },
-  { "Ucirc",  0xDB, 0x00DB },
-  { "Uuml",   0xDC, 0x00DC },
-  { "Yacute", 0xDD, 0x00DD },
-  { "THORN",  0xDE, 0x00DE },
-  { "szlig",  0xDF, 0x00DF },
-  { "agrave", 0xE0, 0x00E0 },
-  { "aacute", 0xE1, 0x00E1 },
-  { "acirc",  0xE2, 0x00E2 },
-  { "atilde", 0xE3, 0x00E3 },
-  { "auml",   0xE4, 0x00E4 },
-  { "aring",  0xE5, 0x00E5 },
-  { "aelig",  0xE6, 0x00E6 },
-  { "ccedil", 0xE7, 0x00E7 },
-  { "egrave", 0xE8, 0x00E8 },
-  { "eacute", 0xE9, 0x00E9 },
-  { "ecirc",  0xEA, 0x00EA },
-  { "euml",   0xEB, 0x00EB },
-  { "igrave", 0xEC, 0x00EC },
-  { "iacute", 0xED, 0x00ED },
-  { "icirc",  0xEE, 0x00EE },
-  { "iuml",   0xEF, 0x00EF },
-  { "eth",    0xF0, 0x00F0 },
-  { "ntilde", 0xF1, 0x00F1 },
-  { "ograve", 0xF2, 0x00F2 },
-  { "oacute", 0xF3, 0x00F3 },
-  { "ocirc",  0xF4, 0x00F4 },
-  { "otilde", 0xF5, 0x00F5 },
-  { "ouml",   0xF6, 0x00F6 },
+  { "Oslash", 0xD8, 0x00D8, "OE" },
+  { "Ugrave", 0xD9, 0x00D9, "U" },
+  { "Uacute", 0xDA, 0x00DA, "U" },
+  { "Ucirc",  0xDB, 0x00DB, "U" },
+  { "Uuml",   0xDC, 0x00DC, "U" },
+  { "Yacute", 0xDD, 0x00DD, "Y" },
+  { "THORN",  0xDE, 0x00DE, "TH" },
+  { "szlig",  0xDF, 0x00DF, "s" },
+  { "agrave", 0xE0, 0x00E0, "a" },
+  { "aacute", 0xE1, 0x00E1, "a" },
+  { "acirc",  0xE2, 0x00E2, "a" },
+  { "atilde", 0xE3, 0x00E3, "a" },
+  { "auml",   0xE4, 0x00E4, "a" },
+  { "aring",  0xE5, 0x00E5, "aa" },
+  { "aelig",  0xE6, 0x00E6, "ae" },
+  { "ccedil", 0xE7, 0x00E7, "c" },
+  { "egrave", 0xE8, 0x00E8, "e" },
+  { "eacute", 0xE9, 0x00E9, "e" },
+  { "ecirc",  0xEA, 0x00EA, "e" },
+  { "euml",   0xEB, 0x00EB, "e" },
+  { "igrave", 0xEC, 0x00EC, "i" },
+  { "iacute", 0xED, 0x00ED, "i" },
+  { "icirc",  0xEE, 0x00EE, "i" },
+  { "iuml",   0xEF, 0x00EF, "i" },
+  { "eth",    0xF0, 0x00F0, "d" },
+  { "ntilde", 0xF1, 0x00F1, "n" },
+  { "ograve", 0xF2, 0x00F2, "o" },
+  { "oacute", 0xF3, 0x00F3, "o" },
+  { "ocirc",  0xF4, 0x00F4, "o" },
+  { "otilde", 0xF5, 0x00F5, "o" },
+  { "ouml",   0xF6, 0x00F6, "o" },
   { "divide", 0xF7, 0x00F7 },
-  { "oslash", 0xF8, 0x00F8 },
-  { "ugrave", 0xF9, 0x00F9 },
-  { "uacute", 0xFA, 0x00FA },
-  { "ucirc",  0xFB, 0x00FB },
-  { "uuml",   0xFC, 0x00FC },
-  { "yacute", 0xFD, 0x00FD },
-  { "thorn",  0xFE, 0x00FE },
-  { "yuml",   0xFF, 0x00FF },
+  { "oslash", 0xF8, 0x00F8, "oe" },
+  { "ugrave", 0xF9, 0x00F9, "u" },
+  { "uacute", 0xFA, 0x00FA, "u" },
+  { "ucirc",  0xFB, 0x00FB, "u" },
+  { "uuml",   0xFC, 0x00FC, "u" },
+  { "yacute", 0xFD, 0x00FD, "y" },
+  { "thorn",  0xFE, 0x00FE, "th" },
+  { "yuml",   0xFF, 0x00FF, "y" },
   { NULL, 0, 0 }
 };
 
@@ -277,7 +280,7 @@ static iso_map_type iso8859_15_map [] = {
    including the character table!!! (must see!)
 
  * ISO 8859-2 and even HTML entities !!! (must see!)
-   http://people.ssh.fi/mtr/genscript/88592.txt
+   88592.txt in the GNU enscript distribution
 
  * (minor) http://www.agh.edu.pl/ogonki/plchars.html
    One more table, this time it includes even information about Polish
@@ -286,107 +289,186 @@ static iso_map_type iso8859_15_map [] = {
 
 static iso_map_type iso8859_2_map [] = {
   { "nbsp",	0xA0, 0x00A0 }, /* NO-BREAK SPACE */
-  { "",	0xA1, 0x0104 }, /* LATIN CAPITAL LETTER A WITH OGONEK */
+  { "",	0xA1, 0x0104, "A" }, /* LATIN CAPITAL LETTER A WITH OGONEK */
   { "",	0xA2, 0x02D8 }, /* BREVE */
-  { "",	0xA3, 0x0141 }, /* LATIN CAPITAL LETTER L WITH STROKE */
+  { "",	0xA3, 0x0141, "L" }, /* LATIN CAPITAL LETTER L WITH STROKE */
   { "curren",	0xA4, 0x00A4 }, /* CURRENCY SIGN */
-  { "",	0xA5, 0x013D }, /* LATIN CAPITAL LETTER L WITH CARON */
-  { "",	0xA6, 0x015A }, /* LATIN CAPITAL LETTER S WITH ACUTE */
+  { "",	0xA5, 0x013D, "L" }, /* LATIN CAPITAL LETTER L WITH CARON */
+  { "",	0xA6, 0x015A, "S" }, /* LATIN CAPITAL LETTER S WITH ACUTE */
   { "sect",	0xA7, 0x00A7 }, /* SECTION SIGN */
   { "uml",	0xA8, 0x00A8 }, /* DIAERESIS */
-  { "",	0xA9, 0x0160 }, /* LATIN CAPITAL LETTER S WITH CARON */
-  { "",	0xAA, 0x015E }, /* LATIN CAPITAL LETTER S WITH CEDILLA */
-  { "",	0xAB, 0x0164 }, /* LATIN CAPITAL LETTER T WITH CARON */
-  { "",	0xAC, 0x0179 }, /* LATIN CAPITAL LETTER Z WITH ACUTE */
+  { "#xa9",	0xA9, 0x0160, "S" }, /* LATIN CAPITAL LETTER S WITH CARON */
+  { "",	0xAA, 0x015E, "S" }, /* LATIN CAPITAL LETTER S WITH CEDILLA */
+  { "",	0xAB, 0x0164, "T" }, /* LATIN CAPITAL LETTER T WITH CARON */
+  { "",	0xAC, 0x0179, "Z" }, /* LATIN CAPITAL LETTER Z WITH ACUTE */
   { "shy",	0xAD, 0x00AD }, /* SOFT HYPHEN */
-  { "",	0xAE, 0x017D }, /* LATIN CAPITAL LETTER Z WITH CARON */
-  { "",	0xAF, 0x017B }, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+  { "",	0xAE, 0x017D, "Z" }, /* LATIN CAPITAL LETTER Z WITH CARON */
+  { "",	0xAF, 0x017B, "Z" }, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
   { "deg",	0xB0, 0x00B0 }, /* DEGREE SIGN */
-  { "",	0xB1, 0x0105 }, /* LATIN SMALL LETTER A WITH OGONEK */
+  { "",	0xB1, 0x0105, "a" }, /* LATIN SMALL LETTER A WITH OGONEK */
   { "",	0xB2, 0x02DB }, /* OGONEK */
-  { "",	0xB3, 0x0142 }, /* LATIN SMALL LETTER L WITH STROKE */
+  { "",	0xB3, 0x0142, "l" }, /* LATIN SMALL LETTER L WITH STROKE */
   { "acute",	0xB4, 0x00B4 }, /* ACUTE ACCENT */
-  { "",	0xB5, 0x013E }, /* LATIN SMALL LETTER L WITH CARON */
-  { "",	0xB6, 0x015B }, /* LATIN SMALL LETTER S WITH ACUTE */
+  { "",	0xB5, 0x013E, "l" }, /* LATIN SMALL LETTER L WITH CARON */
+  { "",	0xB6, 0x015B, "s" }, /* LATIN SMALL LETTER S WITH ACUTE */
   { "",	0xB7, 0x02C7 }, /* CARON (Mandarin Chinese third tone) */
   { "cedil",	0xB8, 0x00B8 }, /* CEDILLA */
-  { "",	0xB9, 0x0161 }, /* LATIN SMALL LETTER S WITH CARON */
-  { "",	0xBA, 0x015F }, /* LATIN SMALL LETTER S WITH CEDILLA */
-  { "",	0xBB, 0x0165 }, /* LATIN SMALL LETTER T WITH CARON */
-  { "",	0xBC, 0x017A }, /* LATIN SMALL LETTER Z WITH ACUTE */
+  { "",	0xB9, 0x0161, "s" }, /* LATIN SMALL LETTER S WITH CARON */
+  { "",	0xBA, 0x015F, "s" }, /* LATIN SMALL LETTER S WITH CEDILLA */
+  { "",	0xBB, 0x0165, "t" }, /* LATIN SMALL LETTER T WITH CARON */
+  { "",	0xBC, 0x017A, "z" }, /* LATIN SMALL LETTER Z WITH ACUTE */
   { "",	0xBD, 0x02DD }, /* DOUBLE ACUTE ACCENT */
-  { "",	0xBE, 0x017E }, /* LATIN SMALL LETTER Z WITH CARON */
-  { "",	0xBF, 0x017C }, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
-  { "",	0xC0, 0x0154 }, /* LATIN CAPITAL LETTER R WITH ACUTE */
-  { "",	0xC1, 0x00C1 }, /* LATIN CAPITAL LETTER A WITH ACUTE */
-  { "",	0xC2, 0x00C2 }, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
-  { "",	0xC3, 0x0102 }, /* LATIN CAPITAL LETTER A WITH BREVE */
-  { "",	0xC4, 0x00C4 }, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
-  { "",	0xC5, 0x0139 }, /* LATIN CAPITAL LETTER L WITH ACUTE */
-  { "",	0xC6, 0x0106 }, /* LATIN CAPITAL LETTER C WITH ACUTE */
-  { "",	0xC7, 0x00C7 }, /* LATIN CAPITAL LETTER C WITH CEDILLA */
-  { "",	0xC8, 0x010C }, /* LATIN CAPITAL LETTER C WITH CARON */
-  { "",	0xC9, 0x00C9 }, /* LATIN CAPITAL LETTER E WITH ACUTE */
-  { "",	0xCA, 0x0118 }, /* LATIN CAPITAL LETTER E WITH OGONEK */
-  { "",	0xCB, 0x00CB }, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
-  { "",	0xCC, 0x011A }, /* LATIN CAPITAL LETTER E WITH CARON */
-  { "",	0xCD, 0x00CD }, /* LATIN CAPITAL LETTER I WITH ACUTE */
-  { "",	0xCE, 0x00CE }, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
-  { "",	0xCF, 0x010E }, /* LATIN CAPITAL LETTER D WITH CARON */
-  { "",	0xD0, 0x0110 }, /* LATIN CAPITAL LETTER D WITH STROKE */
-  { "",	0xD1, 0x0143 }, /* LATIN CAPITAL LETTER N WITH ACUTE */
-  { "",	0xD2, 0x0147 }, /* LATIN CAPITAL LETTER N WITH CARON */
-  { "",	0xD3, 0x00D3 }, /* LATIN CAPITAL LETTER O WITH ACUTE */
-  { "",	0xD4, 0x00D4 }, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
-  { "",	0xD5, 0x0150 }, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
-  { "",	0xD6, 0x00D6 }, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+  { "",	0xBE, 0x017E, "z" }, /* LATIN SMALL LETTER Z WITH CARON */
+  { "",	0xBF, 0x017C, "z" }, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
+  { "",	0xC0, 0x0154, "R" }, /* LATIN CAPITAL LETTER R WITH ACUTE */
+  { "Aacute",	0xC1, 0x00C1, "A" }, /* LATIN CAPITAL LETTER A WITH ACUTE */
+  { "Acirc",	0xC2, 0x00C2, "A" }, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+  { "",	0xC3, 0x0102, "A" }, /* LATIN CAPITAL LETTER A WITH BREVE */
+  { "Auml",	0xC4, 0x00C4, "A" }, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+  { "",	0xC5, 0x0139, "L" }, /* LATIN CAPITAL LETTER L WITH ACUTE */
+  { "",	0xC6, 0x0106, "C" }, /* LATIN CAPITAL LETTER C WITH ACUTE */
+  { "Ccedil",	0xC7, 0x00C7, "C" }, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+  { "",	0xC8, 0x010C, "C" }, /* LATIN CAPITAL LETTER C WITH CARON */
+  { "Eacute",	0xC9, 0x00C9, "E" }, /* LATIN CAPITAL LETTER E WITH ACUTE */
+  { "",	0xCA, 0x0118, "E" }, /* LATIN CAPITAL LETTER E WITH OGONEK */
+  { "Euml",	0xCB, 0x00CB, "E" }, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+  { "",	0xCC, 0x011A, "E" }, /* LATIN CAPITAL LETTER E WITH CARON */
+  { "Iacute",	0xCD, 0x00CD, "I" }, /* LATIN CAPITAL LETTER I WITH ACUTE */
+  { "Icirc",	0xCE, 0x00CE, "I" }, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+  { "",	0xCF, 0x010E, "D" }, /* LATIN CAPITAL LETTER D WITH CARON */
+  { "ETH",	0xD0, 0x0110, "D" }, /* LATIN CAPITAL LETTER D WITH STROKE */
+  { "",	0xD1, 0x0143, "N" }, /* LATIN CAPITAL LETTER N WITH ACUTE */
+  { "",	0xD2, 0x0147, "N" }, /* LATIN CAPITAL LETTER N WITH CARON */
+  { "Oacute",	0xD3, 0x00D3, "O" }, /* LATIN CAPITAL LETTER O WITH ACUTE */
+  { "Ocirc",	0xD4, 0x00D4, "O" }, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+  { "",	0xD5, 0x0150, "O" }, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
+  { "Ouml",	0xD6, 0x00D6, "O" }, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
   { "times",	0xD7, 0x00D7 }, /* MULTIPLICATION SIGN */
-  { "",	0xD8, 0x0158 }, /* LATIN CAPITAL LETTER R WITH CARON */
-  { "",	0xD9, 0x016E }, /* LATIN CAPITAL LETTER U WITH RING ABOVE */
-  { "",	0xDA, 0x00DA }, /* LATIN CAPITAL LETTER U WITH ACUTE */
-  { "",	0xDB, 0x0170 }, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
-  { "",	0xDC, 0x00DC }, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
-  { "",	0xDD, 0x00DD }, /* LATIN CAPITAL LETTER Y WITH ACUTE */
-  { "",	0xDE, 0x0162 }, /* LATIN CAPITAL LETTER T WITH CEDILLA */
-  { "",	0xDF, 0x00DF }, /* LATIN SMALL LETTER SHARP S (German) */
-  { "",	0xE0, 0x0155 }, /* LATIN SMALL LETTER R WITH ACUTE */
-  { "",	0xE1, 0x00E1 }, /* LATIN SMALL LETTER A WITH ACUTE */
-  { "",	0xE2, 0x00E2 }, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
-  { "",	0xE3, 0x0103 }, /* LATIN SMALL LETTER A WITH BREVE */
-  { "",	0xE4, 0x00E4 }, /* LATIN SMALL LETTER A WITH DIAERESIS */
-  { "",	0xE5, 0x013A }, /* LATIN SMALL LETTER L WITH ACUTE */
-  { "",	0xE6, 0x0107 }, /* LATIN SMALL LETTER C WITH ACUTE */
-  { "",	0xE7, 0x00E7 }, /* LATIN SMALL LETTER C WITH CEDILLA */
-  { "",	0xE8, 0x010D }, /* LATIN SMALL LETTER C WITH CARON */
-  { "",	0xE9, 0x00E9 }, /* LATIN SMALL LETTER E WITH ACUTE */
-  { "",	0xEA, 0x0119 }, /* LATIN SMALL LETTER E WITH OGONEK */
-  { "",	0xEB, 0x00EB }, /* LATIN SMALL LETTER E WITH DIAERESIS */
-  { "",	0xEC, 0x011B }, /* LATIN SMALL LETTER E WITH CARON */
-  { "",	0xED, 0x00ED }, /* LATIN SMALL LETTER I WITH ACUTE */
-  { "",	0xEE, 0x00EE }, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
-  { "",	0xEF, 0x010F }, /* LATIN SMALL LETTER D WITH CARON */
-  { "",	0xF0, 0x0111 }, /* LATIN SMALL LETTER D WITH STROKE */
-  { "",	0xF1, 0x0144 }, /* LATIN SMALL LETTER N WITH ACUTE */
-  { "",	0xF2, 0x0148 }, /* LATIN SMALL LETTER N WITH CARON */
-  { "",	0xF3, 0x00F3 }, /* LATIN SMALL LETTER O WITH ACUTE */
-  { "",	0xF4, 0x00F4 }, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
-  { "",	0xF5, 0x0151 }, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */
-  { "",	0xF6, 0x00F6 }, /* LATIN SMALL LETTER O WITH DIAERESIS */
+  { "",	0xD8, 0x0158, "R" }, /* LATIN CAPITAL LETTER R WITH CARON */
+  { "",	0xD9, 0x016E, "U" }, /* LATIN CAPITAL LETTER U WITH RING ABOVE */
+  { "Uacute",	0xDA, 0x00DA, "U" }, /* LATIN CAPITAL LETTER U WITH ACUTE */
+  { "",	0xDB, 0x0170, "U" }, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
+  { "Uuml",	0xDC, 0x00DC, "U" }, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+  { "Yacute",	0xDD, 0x00DD, "Y" }, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+  { "",	0xDE, 0x0162, "T" }, /* LATIN CAPITAL LETTER T WITH CEDILLA */
+  { "szlig",	0xDF, 0x00DF, "ss" }, /* LATIN SMALL LETTER SHARP S (German) */
+  { "",	0xE0, 0x0155, "s" }, /* LATIN SMALL LETTER R WITH ACUTE */
+  { "aacute",	0xE1, 0x00E1, "a" }, /* LATIN SMALL LETTER A WITH ACUTE */
+  { "acirc",	0xE2, 0x00E2, "a" }, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+  { "",	0xE3, 0x0103, "a" }, /* LATIN SMALL LETTER A WITH BREVE */
+  { "auml",	0xE4, 0x00E4, "a" }, /* LATIN SMALL LETTER A WITH DIAERESIS */
+  { "",	0xE5, 0x013A, "l" }, /* LATIN SMALL LETTER L WITH ACUTE */
+  { "",	0xE6, 0x0107, "c" }, /* LATIN SMALL LETTER C WITH ACUTE */
+  { "ccedil",	0xE7, 0x00E7, "c" }, /* LATIN SMALL LETTER C WITH CEDILLA */
+  { "",	0xE8, 0x010D, "c" }, /* LATIN SMALL LETTER C WITH CARON */
+  { "eacute",	0xE9, 0x00E9, "e" }, /* LATIN SMALL LETTER E WITH ACUTE */
+  { "",	0xEA, 0x0119, "e" }, /* LATIN SMALL LETTER E WITH OGONEK */
+  { "euml",	0xEB, 0x00EB, "e" }, /* LATIN SMALL LETTER E WITH DIAERESIS */
+  { "",	0xEC, 0x011B, "e" }, /* LATIN SMALL LETTER E WITH CARON */
+  { "iacute",	0xED, 0x00ED, "i" }, /* LATIN SMALL LETTER I WITH ACUTE */
+  { "icirc",	0xEE, 0x00EE, "i" }, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+  { "",	0xEF, 0x010F, "d" }, /* LATIN SMALL LETTER D WITH CARON */
+  { "",	0xF0, 0x0111, "d" }, /* LATIN SMALL LETTER D WITH STROKE */
+  { "",	0xF1, 0x0144, "n" }, /* LATIN SMALL LETTER N WITH ACUTE */
+  { "",	0xF2, 0x0148, "n" }, /* LATIN SMALL LETTER N WITH CARON */
+  { "oacute",	0xF3, 0x00F3, "o" }, /* LATIN SMALL LETTER O WITH ACUTE */
+  { "ocirc",	0xF4, 0x00F4, "o" }, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+  { "",	0xF5, 0x0151, "o" }, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */
+  { "ouml",	0xF6, 0x00F6, "o" }, /* LATIN SMALL LETTER O WITH DIAERESIS */
   { "divide",	0xF7, 0x00F7 }, /* DIVISION SIGN */
-  { "",	0xF8, 0x0159 }, /* LATIN SMALL LETTER R WITH CARON */
-  { "",	0xF9, 0x016F }, /* LATIN SMALL LETTER U WITH RING ABOVE */
-  { "",	0xFA, 0x00FA }, /* LATIN SMALL LETTER U WITH ACUTE */
-  { "",	0xFB, 0x0171 }, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
-  { "",	0xFC, 0x00FC }, /* LATIN SMALL LETTER U WITH DIAERESIS */
-  { "",	0xFD, 0x00FD }, /* LATIN SMALL LETTER Y WITH ACUTE */
-  { "",	0xFE, 0x0163 }, /* LATIN SMALL LETTER T WITH CEDILLA */
+  { "",	0xF8, 0x0159, "r" }, /* LATIN SMALL LETTER R WITH CARON */
+  { "",	0xF9, 0x016F, "u" }, /* LATIN SMALL LETTER U WITH RING ABOVE */
+  { "uacute",	0xFA, 0x00FA, "u" }, /* LATIN SMALL LETTER U WITH ACUTE */
+  { "",	0xFB, 0x0171, "u" }, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
+  { "uuml",	0xFC, 0x00FC, "u" }, /* LATIN SMALL LETTER U WITH DIAERESIS */
+  { "yacute",	0xFD, 0x00FD, "y" }, /* LATIN SMALL LETTER Y WITH ACUTE */
+  { "",	0xFE, 0x0163, "t" }, /* LATIN SMALL LETTER T WITH CEDILLA */
   { "",	0xFF, 0x02D9 }, /* DOT ABOVE (Mandarin Chinese light tone) */
   { NULL, 0, 0 }
 };
 
+/* Common map for koi8-u, koi8-r */
+static iso_map_type koi8_map [] = {
+  { "", 0xa3, 0x0415, "io"}, /* CYRILLIC SMALL LETTER IO */
+  { "", 0xa4, 0x0454, "ie"}, /* CYRILLIC SMALL LETTER UKRAINIAN IE */
+  { "", 0xa6, 0x0456, "i"}, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
+  { "", 0xa7, 0x0457, "yi"}, /* CYRILLIC SMALL LETTER YI */
+
+  { "", 0xb3, 0x04d7, "IO"}, /* CYRILLIC CAPITAL LETTER IO */
+  { "", 0xb4, 0x0404, "IE"}, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
+  { "", 0xb6, 0x0406, "I"},  /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
+  { "", 0xb7, 0x0407, "YI"}, /* CYRILLIC CAPITAL LETTER YI */
+/* { "", 0xbf, 0x}, / * CYRILLIC COPYRIGHT SIGN */ 
+  { "", 0xc0, 0x042e, "yu"}, /* CYRILLIC SMALL LETTER YU */        
+  { "", 0xc1, 0x0430, "a"}, /* CYRILLIC SMALL LETTER A */         
+  { "", 0xc2, 0x0431, "b"}, /* CYRILLIC SMALL LETTER BE */        
+  { "", 0xc3, 0x0446, "c"}, /* CYRILLIC SMALL LETTER TSE */        
+  { "", 0xc4, 0x0434, "d"}, /* CYRILLIC SMALL LETTER DE */        
+  { "", 0xc5, 0x0435, "e"}, /* CYRILLIC SMALL LETTER IE */        
+  { "", 0xc6, 0x0444, "f"}, /* CYRILLIC SMALL LETTER EF */        
+  { "", 0xc7, 0x0433, "g"}, /* CYRILLIC SMALL LETTER GHE */       
+  { "", 0xc8, 0x0445, "h"}, /* CYRILLIC SMALL LETTER HA */        
+  { "", 0xc9, 0x0438, "i"}, /* CYRILLIC SMALL LETTER I */         
+  { "", 0xca, 0x0439, "i"}, /* CYRILLIC SMALL LETTER SHORT I */   
+  { "", 0xcb, 0x043a, "k"}, /* CYRILLIC SMALL LETTER KA */        
+  { "", 0xcc, 0x043b, "l"}, /* CYRILLIC SMALL LETTER EL */        
+  { "", 0xcd, 0x043c, "m"}, /* CYRILLIC SMALL LETTER EM */        
+  { "", 0xce, 0x043d, "n"}, /* CYRILLIC SMALL LETTER EN */        
+  { "", 0xcf, 0x043e, "o"}, /* CYRILLIC SMALL LETTER O */         
+  { "", 0xd0, 0x043f, "p"}, /* CYRILLIC SMALL LETTER PE */        
+  { "", 0xd1, 0x044f, "ya"}, /* CYRILLIC SMALL LETTER YA */        
+  { "", 0xd2, 0x0440, "r"}, /* CYRILLIC SMALL LETTER ER */        
+  { "", 0xd3, 0x0441, "s"}, /* CYRILLIC SMALL LETTER ES */        
+  { "", 0xd4, 0x0442, "t"}, /* CYRILLIC SMALL LETTER TE */        
+  { "", 0xd5, 0x0443, "u"}, /* CYRILLIC SMALL LETTER U */         
+  { "", 0xd6, 0x0436, "zh"}, /* CYRILLIC SMALL LETTER ZHE */       
+  { "", 0xd7, 0x0432, "v"}, /* CYRILLIC SMALL LETTER VE */        
+  { "", 0xd8, 0x044c, "x"}, /* CYRILLIC SMALL LETTER SOFT SIGN */ 
+  { "", 0xd9, 0x044b, "y"}, /* CYRILLIC SMALL LETTER YERU */      
+  { "", 0xda, 0x0437, "z"}, /* CYRILLIC SMALL LETTER ZE */        
+  { "", 0xdb, 0x0448, "sh"}, /* CYRILLIC SMALL LETTER SHA */       
+  { "", 0xdc, 0x044d, "e"}, /* CYRILLIC SMALL LETTER E */         
+  { "", 0xdd, 0x0449, "shch"}, /* CYRILLIC SMALL LETTER SHCHA */     
+  { "", 0xde, 0x0447, "ch"}, /* CYRILLIC SMALL LETTER CHA */       
+  { "", 0xdf, 0x044a, "w"}, /* CYRILLIC SMALL LETTER HARD SIGN */ 
+  { "", 0xe0, 0x042d, "YU"}, /* CYRILLIC CAPITAL LETTER YU */       
+  { "", 0xe1, 0x0410, "A"}, /* CYRILLIC CAPITAL LETTER A */        
+  { "", 0xe2, 0x0411, "B"}, /* CYRILLIC CAPITAL LETTER BE */         
+  { "", 0xe3, 0x0426, "C"}, /* CYRILLIC CAPITAL LETTER TSE */        
+  { "", 0xe4, 0x0414, "D"}, /* CYRILLIC CAPITAL LETTER DE */        
+  { "", 0xe5, 0x0415, "E"}, /* CYRILLIC CAPITAL LETTER IE */        
+  { "", 0xe6, 0x0424, "F"}, /* CYRILLIC CAPITAL LETTER EF */        
+  { "", 0xe7, 0x0413, "G"}, /* CYRILLIC CAPITAL LETTER GHE */        
+  { "", 0xe8, 0x0425, "H"}, /* CYRILLIC CAPITAL LETTER HA */        
+  { "", 0xe9, 0x0418, "I"}, /* CYRILLIC CAPITAL LETTER I */        
+  { "", 0xea, 0x0419, "I"}, /* CYRILLIC CAPITAL LETTER SHORT I */  
+  { "", 0xeb, 0x041a, "K"}, /* CYRILLIC CAPITAL LETTER KA */        
+  { "", 0xec, 0x041b, "L"}, /* CYRILLIC CAPITAL LETTER EL */        
+  { "", 0xed, 0x041c, "M"}, /* CYRILLIC CAPITAL LETTER EM */        
+  { "", 0xee, 0x041d, "N"}, /* CYRILLIC CAPITAL LETTER EN */        
+  { "", 0xef, 0x041e, "O"}, /* CYRILLIC CAPITAL LETTER O */        
+  { "", 0xf0, 0x041f, "P"}, /* CYRILLIC CAPITAL LETTER PE */        
+  { "", 0xf1, 0x042f, "YA"}, /* CYRILLIC CAPITAL LETTER YA */       
+  { "", 0xf2, 0x0420, "R"}, /* CYRILLIC CAPITAL LETTER ER */        
+  { "", 0xf3, 0x0421, "S"}, /* CYRILLIC CAPITAL LETTER ES */        
+  { "", 0xf4, 0x0422, "T"}, /* CYRILLIC CAPITAL LETTER TE */        
+  { "", 0xf5, 0x0423, "U"}, /* CYRILLIC CAPITAL LETTER U */        
+  { "", 0xf6, 0x0416, "ZH"}, /* CYRILLIC CAPITAL LETTER ZHE */       
+  { "", 0xf7, 0x0412, "V"}, /* CYRILLIC CAPITAL LETTER VE */        
+  { "", 0xf8, 0x042c, "X"}, /* CYRILLIC CAPITAL LETTER SOFT SIGN */
+  { "", 0xf9, 0x042b, "Y"}, /* CYRILLIC CAPITAL LETTER YERU */     
+  { "", 0xfa, 0x0417, "Z"}, /* CYRILLIC CAPITAL LETTER ZE */        
+  { "", 0xfb, 0x0428, "SH"}, /* CYRILLIC CAPITAL LETTER SHA */       
+  { "", 0xfc, 0x042d, "E"}, /* CYRILLIC CAPITAL LETTER E */        
+  { "", 0xfd, 0x0429, "SHCH"}, /* CYRILLIC CAPITAL LETTER SHCHA */     
+  { "", 0xfe, 0x0427, "CH"}, /* CYRILLIC CAPITAL LETTER CHE */      
+  { "", 0xff, 0x042a, "W"}, /* CYRILLIC CAPITAL LETTER HARD SIGN */
+  { NULL, 0, 0 }
+};	      
+
 encoding_type encoding_table[] = {
   { no_encoding, "(no encoding)", NULL },
-  { US_ASCII,    "US-ASCII",    us_ascii_map },
+  { US_ASCII,    "US-ASCII",    asis_map },
   { ISO_8859_1,  "iso-8859-1",  (iso_map_type *) iso8859_1_map },
   { ISO_8859_2,  "iso-8859-2",  (iso_map_type *) iso8859_2_map },
   { ISO_8859_3,  "iso-8859-3",  NULL },
@@ -402,81 +484,389 @@ encoding_type encoding_table[] = {
   { ISO_8859_13, "iso-8859-13", NULL },
   { ISO_8859_14, "iso-8859-14", NULL },
   { ISO_8859_15, "iso-8859-15", (iso_map_type *) iso8859_15_map },
+  { KOI8_R,      "koi8-r",      (iso_map_type *) koi8_map },
+  { KOI8_U,      "koi8-u",      (iso_map_type *) koi8_map },
+  { UTF_8,       "utf-8",       asis_map },  /* specific code for this below */
   { last_encoding_code, NULL, NULL }
 };
 
+
+/* List of HTML entities.  */
+static struct { const char *html; unsigned int unicode; } unicode_map[] = {
+/* Extracted from http://www.w3.org/TR/html401/sgml/entities.html through
+   sed -n -e 's|<!ENTITY \([^ ][^ ]*\) *CDATA "[&]#\([0-9][0-9]*\);".*|  { "\1", \2 },|p'
+   | LC_ALL=C sort -k2  */
+  { "AElig",     198 },
+  { "Aacute",    193 },
+  { "Acirc",     194 },
+  { "Agrave",    192 },
+  { "Alpha",     913 },
+  { "Aring",     197 },
+  { "Atilde",    195 },
+  { "Auml",      196 },
+  { "Beta",      914 },
+  { "Ccedil",    199 },
+  { "Chi",       935 },
+  { "Dagger",   8225 },
+  { "Delta",     916 },
+  { "ETH",       208 },
+  { "Eacute",    201 },
+  { "Ecirc",     202 },
+  { "Egrave",    200 },
+  { "Epsilon",   917 },
+  { "Eta",       919 },
+  { "Euml",      203 },
+  { "Gamma",     915 },
+  { "Iacute",    205 },
+  { "Icirc",     206 },
+  { "Igrave",    204 },
+  { "Iota",      921 },
+  { "Iuml",      207 },
+  { "Kappa",     922 },
+  { "Lambda",    923 },
+  { "Mu",        924 },
+  { "Ntilde",    209 },
+  { "Nu",        925 },
+  { "OElig",     338 },
+  { "Oacute",    211 },
+  { "Ocirc",     212 },
+  { "Ograve",    210 },
+  { "Omega",     937 },
+  { "Omicron",   927 },
+  { "Oslash",    216 },
+  { "Otilde",    213 },
+  { "Ouml",      214 },
+  { "Phi",       934 },
+  { "Pi",        928 },
+  { "Prime",    8243 },
+  { "Psi",       936 },
+  { "Rho",       929 },
+  { "Scaron",    352 },
+  { "Sigma",     931 },
+  { "THORN",     222 },
+  { "Tau",       932 },
+  { "Theta",     920 },
+  { "Uacute",    218 },
+  { "Ucirc",     219 },
+  { "Ugrave",    217 },
+  { "Upsilon",   933 },
+  { "Uuml",      220 },
+  { "Xi",        926 },
+  { "Yacute",    221 },
+  { "Yuml",      376 },
+  { "Zeta",      918 },
+  { "aacute",    225 },
+  { "acirc",     226 },
+  { "acute",     180 },
+  { "aelig",     230 },
+  { "agrave",    224 },
+  { "alefsym",  8501 },
+  { "alpha",     945 },
+  { "amp",        38 },
+  { "and",      8743 },
+  { "ang",      8736 },
+  { "aring",     229 },
+  { "asymp",    8776 },
+  { "atilde",    227 },
+  { "auml",      228 },
+  { "bdquo",    8222 },
+  { "beta",      946 },
+  { "brvbar",    166 },
+  { "bull",     8226 },
+  { "cap",      8745 },
+  { "ccedil",    231 },
+  { "cedil",     184 },
+  { "cent",      162 },
+  { "chi",       967 },
+  { "circ",      710 },
+  { "clubs",    9827 },
+  { "cong",     8773 },
+  { "copy",      169 },
+  { "crarr",    8629 },
+  { "cup",      8746 },
+  { "curren",    164 },
+  { "dArr",     8659 },
+  { "dagger",   8224 },
+  { "darr",     8595 },
+  { "deg",       176 },
+  { "delta",     948 },
+  { "diams",    9830 },
+  { "divide",    247 },
+  { "eacute",    233 },
+  { "ecirc",     234 },
+  { "egrave",    232 },
+  { "empty",    8709 },
+  { "emsp",     8195 },
+  { "ensp",     8194 },
+  { "epsilon",   949 },
+  { "equiv",    8801 },
+  { "eta",       951 },
+  { "eth",       240 },
+  { "euml",      235 },
+  { "euro",     8364 },
+  { "exist",    8707 },
+  { "fnof",      402 },
+  { "forall",   8704 },
+  { "frac12",    189 },
+  { "frac14",    188 },
+  { "frac34",    190 },
+  { "frasl",    8260 },
+  { "gamma",     947 },
+  { "ge",       8805 },
+  { "gt",         62 },
+  { "hArr",     8660 },
+  { "harr",     8596 },
+  { "hearts",   9829 },
+  { "hellip",   8230 },
+  { "iacute",    237 },
+  { "icirc",     238 },
+  { "iexcl",     161 },
+  { "igrave",    236 },
+  { "image",    8465 },
+  { "infin",    8734 },
+  { "int",      8747 },
+  { "iota",      953 },
+  { "iquest",    191 },
+  { "isin",     8712 },
+  { "iuml",      239 },
+  { "kappa",     954 },
+  { "lArr",     8656 },
+  { "lambda",    955 },
+  { "lang",     9001 },
+  { "laquo",     171 },
+  { "larr",     8592 },
+  { "lceil",    8968 },
+  { "ldquo",    8220 },
+  { "le",       8804 },
+  { "lfloor",   8970 },
+  { "lowast",   8727 },
+  { "loz",      9674 },
+  { "lrm",      8206 },
+  { "lsaquo",   8249 },
+  { "lsquo",    8216 },
+  { "lt",         60 },
+  { "macr",      175 },
+  { "mdash",    8212 },
+  { "micro",     181 },
+  { "middot",    183 },
+  { "minus",    8722 },
+  { "mu",        956 },
+  { "nabla",    8711 },
+  { "nbsp",      160 },
+  { "ndash",    8211 },
+  { "ne",       8800 },
+  { "ni",       8715 },
+  { "not",       172 },
+  { "notin",    8713 },
+  { "nsub",     8836 },
+  { "ntilde",    241 },
+  { "nu",        957 },
+  { "oacute",    243 },
+  { "ocirc",     244 },
+  { "oelig",     339 },
+  { "ograve",    242 },
+  { "oline",    8254 },
+  { "omega",     969 },
+  { "omicron",   959 },
+  { "oplus",    8853 },
+  { "or",       8744 },
+  { "ordf",      170 },
+  { "ordm",      186 },
+  { "oslash",    248 },
+  { "otilde",    245 },
+  { "otimes",   8855 },
+  { "ouml",      246 },
+  { "para",      182 },
+  { "part",     8706 },
+  { "permil",   8240 },
+  { "perp",     8869 },
+  { "phi",       966 },
+  { "pi",        960 },
+  { "piv",       982 },
+  { "plusmn",    177 },
+  { "pound",     163 },
+  { "prime",    8242 },
+  { "prod",     8719 },
+  { "prop",     8733 },
+  { "psi",       968 },
+  { "quot",       34 },
+  { "rArr",     8658 },
+  { "radic",    8730 },
+  { "rang",     9002 },
+  { "raquo",     187 },
+  { "rarr",     8594 },
+  { "rceil",    8969 },
+  { "rdquo",    8221 },
+  { "real",     8476 },
+  { "reg",       174 },
+  { "rfloor",   8971 },
+  { "rho",       961 },
+  { "rlm",      8207 },
+  { "rsaquo",   8250 },
+  { "rsquo",    8217 },
+  { "sbquo",    8218 },
+  { "scaron",    353 },
+  { "sdot",     8901 },
+  { "sect",      167 },
+  { "shy",       173 },
+  { "sigma",     963 },
+  { "sigmaf",    962 },
+  { "sim",      8764 },
+  { "spades",   9824 },
+  { "sub",      8834 },
+  { "sube",     8838 },
+  { "sum",      8721 },
+  { "sup",      8835 },
+  { "sup1",      185 },
+  { "sup2",      178 },
+  { "sup3",      179 },
+  { "supe",     8839 },
+  { "szlig",     223 },
+  { "tau",       964 },
+  { "there4",   8756 },
+  { "theta",     952 },
+  { "thetasym",  977 },
+  { "thinsp",   8201 },
+  { "thorn",     254 },
+  { "tilde",     732 },
+  { "times",     215 },
+  { "trade",    8482 },
+  { "uArr",     8657 },
+  { "uacute",    250 },
+  { "uarr",     8593 },
+  { "ucirc",     251 },
+  { "ugrave",    249 },
+  { "uml",       168 },
+  { "upsih",     978 },
+  { "upsilon",   965 },
+  { "uuml",      252 },
+  { "weierp",   8472 },
+  { "xi",        958 },
+  { "yacute",    253 },
+  { "yen",       165 },
+  { "yuml",      255 },
+  { "zeta",      950 },
+  { "zwj",      8205 },
+  { "zwnj",     8204 }
+};
+ 
+
+
+/* To update this list of language codes, download the current data from
+   http://www.loc.gov/standards/iso639-2; specifically,
+   http://www.loc.gov/standards/iso639-2/ISO-639-2_values_8bits-8559-1.txt.
+   Run cut -d\| -f 3,4 <ISO-639-2_values_8bits-8559-1.txt | sort -u >/tmp/639.2
+   
+   Extract the C table below to a file, say /tmp/lc, and run:
+   cut -c 10- /tmp/lc| sed -e 's/", "/|/' -e 's,".*,,'>/tmp/lang.2
+   
+   Then: comm -3 /tmp/639.2 /tmp/lang.c.
+   
+   Also update the enum in lang.h.  */
 
 language_type language_table[] = {
   { aa, "aa", "Afar" },
   { ab, "ab", "Abkhazian" },
+  { ae, "ae", "Avestan" },
   { af, "af", "Afrikaans" },
+  { ak, "ak", "Akan" },
   { am, "am", "Amharic" },
+  { an, "an", "Aragonese" },
   { ar, "ar", "Arabic" },
   { as, "as", "Assamese" },
+  { av, "av", "Avaric" },
   { ay, "ay", "Aymara" },
   { az, "az", "Azerbaijani" },
   { ba, "ba", "Bashkir" },
-  { be, "be", "Byelorussian" },
+  { be, "be", "Belarusian" },
   { bg, "bg", "Bulgarian" },
   { bh, "bh", "Bihari" },
   { bi, "bi", "Bislama" },
-  { bn, "bn", "Bengali; Bangla" },
+  { bm, "bm", "Bambara" },
+  { bn, "bn", "Bengali" },
   { bo, "bo", "Tibetan" },
   { br, "br", "Breton" },
-  { ca, "ca", "Catalan" },
+  { bs, "bs", "Bosnian" },
+  { ca, "ca", "Catalan; Valencian" },
+  { ce, "ce", "Chechen" },
+  { ch, "ch", "Chamorro" },
   { co, "co", "Corsican" },
+  { cr, "cr", "Cree" },
   { cs, "cs", "Czech" },
+  { cu, "cu", "Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic" },
+  { cv, "cv", "Chuvash" },
   { cy, "cy", "Welsh" },
   { da, "da", "Danish" },
   { de, "de", "German" },
-  { dz, "dz", "Bhutani" },
-  { el, "el", "Greek" },
+  { dv, "dv", "Divehi; Dhivehi; Maldivian" },
+  { dz, "dz", "Dzongkha" },
+  { ee, "ee", "Ewe" },
+  { el, "el", "Greek, Modern (1453-)" },
   { en, "en", "English" },
   { eo, "eo", "Esperanto" },
-  { es, "es", "Spanish" },
+  { es, "es", "Spanish; Castilian" },
   { et, "et", "Estonian" },
   { eu, "eu", "Basque" },
   { fa, "fa", "Persian" },
+  { ff, "ff", "Fulah" },
   { fi, "fi", "Finnish" },
-  { fj, "fj", "Fiji" },
+  { fj, "fj", "Fijian" },
   { fo, "fo", "Faroese" },
   { fr, "fr", "French" },
-  { fy, "fy", "Frisian" },
+  { fy, "fy", "Western Frisian" },
   { ga, "ga", "Irish" },
-  { gd, "gd", "Scots Gaelic" },
+  { gd, "gd", "Gaelic; Scottish Gaelic" },
   { gl, "gl", "Galician" },
   { gn, "gn", "Guarani" },
   { gu, "gu", "Gujarati" },
+  { gv, "gv", "Manx" },
   { ha, "ha", "Hausa" },
   { he, "he", "Hebrew" } /* (formerly iw) */,
   { hi, "hi", "Hindi" },
+  { ho, "ho", "Hiri Motu" },
   { hr, "hr", "Croatian" },
+  { ht, "ht", "Haitian; Haitian Creole" },
   { hu, "hu", "Hungarian" },
   { hy, "hy", "Armenian" },
-  { ia, "ia", "Interlingua" },
+  { hz, "hz", "Herero" },
+  { ia, "ia", "Interlingua (International Auxiliary Language Association)" },
   { id, "id", "Indonesian" } /* (formerly in) */,
   { ie, "ie", "Interlingue" },
-  { ik, "ik", "Inupiak" },
+  { ig, "ig", "Igbo" },
+  { ii, "ii", "Sichuan Yi" },
+  { ik, "ik", "Inupiaq" },
+  { io, "io", "Ido" },
   { is, "is", "Icelandic" },
   { it, "it", "Italian" },
   { iu, "iu", "Inuktitut" },
   { ja, "ja", "Japanese" },
-  { jw, "jw", "Javanese" },
+  { jv, "jv", "Javanese" },
   { ka, "ka", "Georgian" },
+  { kg, "kg", "Kongo" },
+  { ki, "ki", "Kikuyu; Gikuyu" },
+  { kj, "kj", "Kuanyama; Kwanyama" },
   { kk, "kk", "Kazakh" },
-  { kl, "kl", "Greenlandic" },
-  { km, "km", "Cambodian" },
+  { kl, "kl", "Kalaallisut; Greenlandic" },
+  { km, "km", "Central Khmer" },
   { kn, "kn", "Kannada" },
   { ko, "ko", "Korean" },
+  { kr, "kr", "Kanuri" },
   { ks, "ks", "Kashmiri" },
   { ku, "ku", "Kurdish" },
-  { ky, "ky", "Kirghiz" },
+  { kv, "kv", "Komi" },
+  { kw, "kw", "Cornish" },
+  { ky, "ky", "Kirghiz; Kyrgyz" },
   { la, "la", "Latin" },
+  { lb, "lb", "Luxembourgish; Letzeburgesch" },
+  { lg, "lg", "Ganda" },
+  { li, "li", "Limburgan; Limburger; Limburgish" },
   { ln, "ln", "Lingala" },
-  { lo, "lo", "Laothian" },
+  { lo, "lo", "Lao" },
   { lt, "lt", "Lithuanian" },
-  { lv, "lv", "Latvian, Lettish" },
+  { lu, "lu", "Luba-Katanga" },
+  { lv, "lv", "Latvian" },
   { mg, "mg", "Malagasy" },
+  { mh, "mh", "Marshallese" },
   { mi, "mi", "Maori" },
   { mk, "mk", "Macedonian" },
   { ml, "ml", "Malayalam" },
@@ -487,27 +877,38 @@ language_type language_table[] = {
   { mt, "mt", "Maltese" },
   { my, "my", "Burmese" },
   { na, "na", "Nauru" },
+  { nb, "nb", "Bokmål, Norwegian; Norwegian Bokmål" },
+  { nd, "nd", "Ndebele, North; North Ndebele" },
   { ne, "ne", "Nepali" },
-  { nl, "nl", "Dutch" },
+  { ng, "ng", "Ndonga" },
+  { nl, "nl", "Dutch; Flemish" },
+  { nn, "nn", "Norwegian Nynorsk; Nynorsk, Norwegian" },
   { no, "no", "Norwegian" },
-  { oc, "oc", "Occitan" },
-  { om, "om", "(Afan) Oromo" },
+  { nr, "nr", "Ndebele, South; South Ndebele" },
+  { nv, "nv", "Navajo; Navaho" },
+  { ny, "ny", "Chichewa; Chewa; Nyanja" },
+  { oc, "oc", "Occitan (post 1500); Provençal" },
+  { oj, "oj", "Ojibwa" },
+  { om, "om", "Oromo" },
   { or, "or", "Oriya" },
-  { pa, "pa", "Punjabi" },
+  { os, "os", "Ossetian; Ossetic" },
+  { pa, "pa", "Panjabi; Punjabi" },
+  { pi, "pi", "Pali" },
   { pl, "pl", "Polish" },
-  { ps, "ps", "Pashto, Pushto" },
+  { ps, "ps", "Pushto" },
   { pt, "pt", "Portuguese" },
   { qu, "qu", "Quechua" },
-  { rm, "rm", "Rhaeto-Romance" },
-  { rn, "rn", "Kirundi" },
+  { rm, "rm", "Romansh" },
+  { rn, "rn", "Rundi" },
   { ro, "ro", "Romanian" },
   { ru, "ru", "Russian" },
   { rw, "rw", "Kinyarwanda" },
   { sa, "sa", "Sanskrit" },
+  { sc, "sc", "Sardinian" },
   { sd, "sd", "Sindhi" },
-  { sg, "sg", "Sangro" },
-  { sh, "sh", "Serbo-Croatian" },
-  { si, "si", "Sinhalese" },
+  { se, "se", "Northern Sami" },
+  { sg, "sg", "Sango" },
+  { si, "si", "Sinhala; Sinhalese" },
   { sk, "sk", "Slovak" },
   { sl, "sl", "Slovenian" },
   { sm, "sm", "Samoan" },
@@ -515,8 +916,8 @@ language_type language_table[] = {
   { so, "so", "Somali" },
   { sq, "sq", "Albanian" },
   { sr, "sr", "Serbian" },
-  { ss, "ss", "Siswati" },
-  { st, "st", "Sesotho" },
+  { ss, "ss", "Swati" },
+  { st, "st", "Sotho, Souther" },
   { su, "su", "Sundanese" },
   { sv, "sv", "Swedish" },
   { sw, "sw", "Swahili" },
@@ -527,48 +928,348 @@ language_type language_table[] = {
   { ti, "ti", "Tigrinya" },
   { tk, "tk", "Turkmen" },
   { tl, "tl", "Tagalog" },
-  { tn, "tn", "Setswana" },
-  { to, "to", "Tonga" },
+  { tn, "tn", "Tswana" },
+  { to, "to", "Tonga (Tonga Islands)" },
   { tr, "tr", "Turkish" },
   { ts, "ts", "Tsonga" },
   { tt, "tt", "Tatar" },
   { tw, "tw", "Twi" },
-  { ug, "ug", "Uighur" },
+  { ty, "ty", "Tahitian" },
+  { ug, "ug", "Uighur; Uyghur" },
   { uk, "uk", "Ukrainian" },
   { ur, "ur", "Urdu" },
   { uz, "uz", "Uzbek" },
+  { ve, "ve", "Venda" },
   { vi, "vi", "Vietnamese" },
-  { vo, "vo", "Volapuk" },
+  { vo, "vo", "Volapük" },
+  { wa, "wa", "Walloon" },
   { wo, "wo", "Wolof" },
   { xh, "xh", "Xhosa" },
   { yi, "yi", "Yiddish" } /* (formerly ji) */,
   { yo, "yo", "Yoruba" },
-  { za, "za", "Zhuang" },
+  { za, "za", "Zhuang; Chuang" },
   { zh, "zh", "Chinese" },
   { zu, "zu", "Zulu" },
   { last_language_code, NULL, NULL }
 };
+
+static const char *
+cm_search_iso_map_char (byte_t ch)
+{
+  int i;
+  iso_map_type *iso = encoding_table[document_encoding_code].isotab;
+
+  /* If no conversion table for this encoding, quit.  */
+  if (!iso)
+    return NULL;
+  
+  for (i = 0; iso[i].html; i++)
+    if (iso[i].bytecode == ch)
+      return iso[i].translit;
+
+  return NULL;
+}
+
+const char *
+lang_transliterate_char (byte_t ch)
+{
+  if (transliterate_file_names
+      && document_encoding_code != no_encoding)
+    return cm_search_iso_map_char (ch);
+  return NULL;
+}	
+
+
 
-/* @documentlanguage.  Maybe we'll do something useful with this in the
-   future.  For now, we just recognize it.  */
+/* Given a language code LL_CODE, return a "default" country code (in
+   new memory).  We use the same table as gettext, and return LL_CODE
+   uppercased in the absence of any better possibility, with a warning.
+   (gettext silently defaults to the C locale, but we want to give users
+   a shot at fixing ambiguities.)  We also return en_US for en, while
+   gettext does not.  */
+
+#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+
+static char *
+default_country_for_lang (const char *ll_code)
+{
+  /* This table comes from msginit.c in gettext (0.16.1).  It is
+     intentionally copied verbatim even though the format is not the
+     most convenient for our purposes, to make updates simple.  */
+  static const char *locales_with_principal_territory[] = {
+		/* Language	Main territory */
+    "ace_ID",	/* Achinese	Indonesia */
+    "af_ZA",	/* Afrikaans	South Africa */
+    "ak_GH",	/* Akan		Ghana */
+    "am_ET",	/* Amharic	Ethiopia */
+    "an_ES",	/* Aragonese	Spain */
+    "ang_GB",	/* Old English	Britain */
+    "as_IN",	/* Assamese	India */
+    "av_RU",	/* Avaric	Russia */
+    "awa_IN",	/* Awadhi	India */
+    "az_AZ",	/* Azerbaijani	Azerbaijan */
+    "bad_CF",	/* Banda	Central African Republic */
+    "ban_ID",	/* Balinese	Indonesia */
+    "be_BY",	/* Belarusian	Belarus */
+    "bem_ZM",	/* Bemba	Zambia */
+    "bg_BG",	/* Bulgarian	Bulgaria */
+    "bho_IN",	/* Bhojpuri	India */
+    "bik_PH",	/* Bikol	Philippines */
+    "bin_NG",	/* Bini		Nigeria */
+    "bm_ML",	/* Bambara	Mali */
+    "bn_IN",	/* Bengali	India */
+    "bo_CN",	/* Tibetan	China */
+    "br_FR",	/* Breton	France */
+    "bs_BA",	/* Bosnian	Bosnia */
+    "btk_ID",	/* Batak	Indonesia */
+    "bug_ID",	/* Buginese	Indonesia */
+    "ca_ES",	/* Catalan	Spain */
+    "ce_RU",	/* Chechen	Russia */
+    "ceb_PH",	/* Cebuano	Philippines */
+    "co_FR",	/* Corsican	France */
+    "cr_CA",	/* Cree		Canada */
+    "cs_CZ",	/* Czech	Czech Republic */
+    "csb_PL",	/* Kashubian	Poland */
+    "cy_GB",	/* Welsh	Britain */
+    "da_DK",	/* Danish	Denmark */
+    "de_DE",	/* German	Germany */
+    "din_SD",	/* Dinka	Sudan */
+    "doi_IN",	/* Dogri	India */
+    "dv_MV",	/* Divehi	Maldives */
+    "dz_BT",	/* Dzongkha	Bhutan */
+    "ee_GH",	/* Éwé		Ghana */
+    "el_GR",	/* Greek	Greece */
+    /* Don't put "en_GB" or "en_US" here.  That would be asking for fruitless
+       political discussion.  */
+    "es_ES",	/* Spanish	Spain */
+    "et_EE",	/* Estonian	Estonia */
+    "fa_IR",	/* Persian	Iran */
+    "fi_FI",	/* Finnish	Finland */
+    "fil_PH",	/* Filipino	Philippines */
+    "fj_FJ",	/* Fijian	Fiji */
+    "fo_FO",	/* Faroese	Faeroe Islands */
+    "fon_BJ",	/* Fon		Benin */
+    "fr_FR",	/* French	France */
+    "fy_NL",	/* Western Frisian	Netherlands */
+    "ga_IE",	/* Irish	Ireland */
+    "gd_GB",	/* Scots	Britain */
+    "gon_IN",	/* Gondi	India */
+    "gsw_CH",	/* Swiss German	Switzerland */
+    "gu_IN",	/* Gujarati	India */
+    "he_IL",	/* Hebrew	Israel */
+    "hi_IN",	/* Hindi	India */
+    "hil_PH",	/* Hiligaynon	Philippines */
+    "hr_HR",	/* Croatian	Croatia */
+    "ht_HT",	/* Haitian	Haiti */
+    "hu_HU",	/* Hungarian	Hungary */
+    "hy_AM",	/* Armenian	Armenia */
+    "id_ID",	/* Indonesian	Indonesia */
+    "ig_NG",	/* Igbo		Nigeria */
+    "ii_CN",	/* Sichuan Yi	China */
+    "ilo_PH",	/* Iloko	Philippines */
+    "is_IS",	/* Icelandic	Iceland */
+    "it_IT",	/* Italian	Italy */
+    "ja_JP",	/* Japanese	Japan */
+    "jab_NG",	/* Hyam		Nigeria */
+    "jv_ID",	/* Javanese	Indonesia */
+    "ka_GE",	/* Georgian	Georgia */
+    "kab_DZ",	/* Kabyle	Algeria */
+    "kaj_NG",	/* Jju		Nigeria */
+    "kam_KE",	/* Kamba	Kenya */
+    "kmb_AO",	/* Kimbundu	Angola */
+    "kcg_NG",	/* Tyap		Nigeria */
+    "kdm_NG",	/* Kagoma	Nigeria */
+    "kg_CD",	/* Kongo	Democratic Republic of Congo */
+    "kk_KZ",	/* Kazakh	Kazakhstan */
+    "kl_GL",	/* Kalaallisut	Greenland */
+    "km_KH",	/* Khmer	Cambodia */
+    "kn_IN",	/* Kannada	India */
+    "ko_KR",	/* Korean	Korea (South) */
+    "kok_IN",	/* Konkani	India */
+    "kr_NG",	/* Kanuri	Nigeria */
+    "kru_IN",	/* Kurukh	India */
+    "lg_UG",	/* Ganda	Uganda */
+    "li_BE",	/* Limburgish	Belgium */
+    "lo_LA",	/* Laotian	Laos */
+    "lt_LT",	/* Lithuanian	Lithuania */
+    "lu_CD",	/* Luba-Katanga	Democratic Republic of Congo */
+    "lua_CD",	/* Luba-Lulua	Democratic Republic of Congo */
+    "luo_KE",	/* Luo		Kenya */
+    "lv_LV",	/* Latvian	Latvia */
+    "mad_ID",	/* Madurese	Indonesia */
+    "mag_IN",	/* Magahi	India */
+    "mai_IN",	/* Maithili	India */
+    "mak_ID",	/* Makasar	Indonesia */
+    "man_ML",	/* Mandingo	Mali */
+    "men_SL",	/* Mende	Sierra Leone */
+    "mg_MG",	/* Malagasy	Madagascar */
+    "min_ID",	/* Minangkabau	Indonesia */
+    "mk_MK",	/* Macedonian	Macedonia */
+    "ml_IN",	/* Malayalam	India */
+    "mn_MN",	/* Mongolian	Mongolia */
+    "mni_IN",	/* Manipuri	India */
+    "mos_BF",	/* Mossi	Burkina Faso */
+    "mr_IN",	/* Marathi	India */
+    "ms_MY",	/* Malay	Malaysia */
+    "mt_MT",	/* Maltese	Malta */
+    "mwr_IN",	/* Marwari	India */
+    "my_MM",	/* Burmese	Myanmar */
+    "na_NR",	/* Nauru	Nauru */
+    "nah_MX",	/* Nahuatl	Mexico */
+    "nap_IT",	/* Neapolitan	Italy */
+    "nb_NO",	/* Norwegian Bokmål	Norway */
+    "nds_DE",	/* Low Saxon	Germany */
+    "ne_NP",	/* Nepali	Nepal */
+    "nl_NL",	/* Dutch	Netherlands */
+    "nn_NO",	/* Norwegian Nynorsk	Norway */
+    "no_NO",	/* Norwegian	Norway */
+    "nr_ZA",	/* South Ndebele	South Africa */
+    "nso_ZA",	/* Northern Sotho	South Africa */
+    "nym_TZ",	/* Nyamwezi	Tanzania */
+    "nyn_UG",	/* Nyankole	Uganda */
+    "oc_FR",	/* Occitan	France */
+    "oj_CA",	/* Ojibwa	Canada */
+    "or_IN",	/* Oriya	India */
+    "pa_IN",	/* Punjabi	India */
+    "pag_PH",	/* Pangasinan	Philippines */
+    "pam_PH",	/* Pampanga	Philippines */
+    "pbb_CO",	/* Páez		Colombia */
+    "pl_PL",	/* Polish	Poland */
+    "ps_AF",	/* Pashto	Afghanistan */
+    "pt_PT",	/* Portuguese	Portugal */
+    "raj_IN",	/* Rajasthani	India */
+    "rm_CH",	/* Rhaeto-Roman	Switzerland */
+    "rn_BI",	/* Kirundi	Burundi */
+    "ro_RO",	/* Romanian	Romania */
+    "ru_RU",	/* Russian	Russia */
+    "sa_IN",	/* Sanskrit	India */
+    "sas_ID",	/* Sasak	Indonesia */
+    "sat_IN",	/* Santali	India */
+    "sc_IT",	/* Sardinian	Italy */
+    "scn_IT",	/* Sicilian	Italy */
+    "sg_CF",	/* Sango	Central African Republic */
+    "shn_MM",	/* Shan		Myanmar */
+    "si_LK",	/* Sinhala	Sri Lanka */
+    "sid_ET",	/* Sidamo	Ethiopia */
+    "sk_SK",	/* Slovak	Slovakia */
+    "sl_SI",	/* Slovenian	Slovenia */
+    "so_SO",	/* Somali	Somalia */
+    "sq_AL",	/* Albanian	Albania */
+    "sr_RS",	/* Serbian	Serbia */
+    "sr_YU",	/* Serbian	Yugoslavia */
+    "srr_SN",	/* Serer	Senegal */
+    "suk_TZ",	/* Sukuma	Tanzania */
+    "sus_GN",	/* Susu		Guinea */
+    "sv_SE",	/* Swedish	Sweden */
+    "te_IN",	/* Telugu	India */
+    "tem_SL",	/* Timne	Sierra Leone */
+    "tet_ID",	/* Tetum	Indonesia */
+    "tg_TJ",	/* Tajik	Tajikistan */
+    "th_TH",	/* Thai		Thailand */
+    "tiv_NG",	/* Tiv		Nigeria */
+    "tk_TM",	/* Turkmen	Turkmenistan */
+    "tl_PH",	/* Tagalog	Philippines */
+    "to_TO",	/* Tonga	Tonga */
+    "tr_TR",	/* Turkish	Turkey */
+    "tum_MW",	/* Tumbuka	Malawi */
+    "uk_UA",	/* Ukrainian	Ukraine */
+    "umb_AO",	/* Umbundu	Angola */
+    "ur_PK",	/* Urdu		Pakistan */
+    "uz_UZ",	/* Uzbek	Uzbekistan */
+    "ve_ZA",	/* Venda	South Africa */
+    "vi_VN",	/* Vietnamese	Vietnam */
+    "wa_BE",	/* Walloon	Belgium */
+    "wal_ET",	/* Walamo	Ethiopia */
+    "war_PH",	/* Waray	Philippines */
+    "wen_DE",	/* Sorbian	Germany */
+    "yao_MW",	/* Yao		Malawi */
+    "zap_MX"	/* Zapotec	Mexico */
+  };
+  int c;
+  int cc_len;
+  int ll_len = strlen (ll_code);
+  char *cc_code = xmalloc (ll_len + 1 + 1);
+  int principal_len = SIZEOF (locales_with_principal_territory);
+  
+  strcpy (cc_code, ll_code);
+  strcat (cc_code, "_");
+  cc_len = ll_len + 1;
+  
+  for (c = 0; c < principal_len; c++)
+    {
+      const char *principal_locale = locales_with_principal_territory[c];
+      if (strncmp (principal_locale, cc_code, cc_len) == 0)
+        {
+          const char *underscore = strchr (principal_locale, '_');
+          /* should always be there, but in case ... */
+          free (cc_code);
+          cc_code = xstrdup (underscore ? underscore + 1 : principal_locale);
+          break;
+        }
+    }
+  
+  /* If we didn't find one to copy, warn and duplicate.  */
+  if (c == principal_len)
+    {
+      if (mbscasecmp (ll_code, "en") == 0)
+        cc_code = xstrdup ("en_US");
+      else
+        {
+          warning (_("no default territory known for language `%s'"), ll_code);
+          for (c = 0; c < strlen (ll_code); c++)
+            cc_code[c] = toupper (ll_code[c]);
+          cc_code[c] = 0;
+          /* We're probably wasting a byte, oops.  */
+        }
+    }
+  
+  return cc_code;
+}
+
+
+
+/* @documentlanguage ARG.  We set the global `document_language' (which
+   `getdocumenttext' uses) to the gettextish string, and 
+   `language_code' to the corresponding enum value.  */
 
-/* XML documents can make use of this data.  Unfortunately, it clashes with
-   the structure currently used.  So instead of enclosing content into
-   a language block, we just output an empty element.  Anyways, a stream based
-   parser can make good use of it.  */
 void
 cm_documentlanguage (void)
 {
   language_code_type c;
-  char *lang_arg;
+  char *lang_arg, *ll_part, *cc_part, *locale_string;
+  char *underscore;
 
   /* Read the line with the language code on it.  */
   get_rest_of_line (0, &lang_arg);
 
+  /* What we're passed might be either just a language code LL (we'll 
+     also need it with the usual _CC appended, if there is one), or a
+     locale name as used by gettext, LL_CC (we'll also need its
+     constituents separately).  */
+  underscore = strchr (lang_arg, '_');
+  if (underscore)
+    {
+      ll_part = substring (lang_arg, underscore);
+      cc_part = xstrdup (underscore + 1);
+      locale_string = xstrdup (lang_arg);
+    }
+  else
+    {
+      ll_part = xstrdup (lang_arg);
+      cc_part = default_country_for_lang (ll_part);
+      locale_string = xmalloc (strlen (ll_part) + 1 + strlen (cc_part) + 1);
+      strcpy (locale_string, ll_part);
+      strcat (locale_string, "_");
+      strcat (locale_string, cc_part);
+    }
+
+  /* Done with analysis of user-supplied string.  */
+  free (lang_arg);
+  
   /* Linear search is fine these days.  */
   for (c = aa; c != last_language_code; c++)
     {
-      if (strcmp (lang_arg, language_table[c].abbrev) == 0)
+      if (strcmp (ll_part, language_table[c].abbrev) == 0)
         { /* Set current language code.  */
           language_code = c;
           break;
@@ -577,15 +1278,30 @@ cm_documentlanguage (void)
 
   /* If we didn't find this code, complain.  */
   if (c == last_language_code)
-    warning (_("%s is not a valid ISO 639 language code"), lang_arg);
+    warning (_("%s is not a valid ISO 639 language code"), ll_part);
 
+  /* Set the language our `getdocumenttext' function uses for
+     translating document strings.  */
+  document_language = xstrdup (locale_string);
+  free (locale_string);
+  
   if (xml && !docbook)
-    {
-      xml_insert_element_with_attribute (DOCUMENTLANGUAGE, START, "xml:lang=\"%s\"", lang_arg);
+    { /* According to http://www.opentag.com/xfaq_lang.htm, xml:lang
+         takes an ISO 639 language code, optionally followed by a dash
+         (not underscore) and an ISO 3166 country code.  So we have
+         to make another version with - instead of _.  */
+      char *xml_locale = xmalloc (strlen (ll_part) + 1 + strlen (cc_part) + 1);
+      strcpy (xml_locale, ll_part);
+      strcat (xml_locale, "-");
+      strcat (xml_locale, cc_part);
+      xml_insert_element_with_attribute (DOCUMENTLANGUAGE, START,
+                                         "xml:lang=\"%s\"", xml_locale);
       xml_insert_element (DOCUMENTLANGUAGE, END);
+      free (xml_locale);
     }
 
-  free (lang_arg);
+  free (ll_part);
+  free (cc_part);
 }
 
 
@@ -596,20 +1312,48 @@ cm_documentlanguage (void)
 static int
 cm_search_iso_map (char *html)
 {
-  int i;
-  iso_map_type *iso = encoding_table[document_encoding_code].isotab;
-
-  /* If no conversion table for this encoding, quit.  */
-  if (!iso)
-    return -1;
-
-  for (i = 0; iso[i].html; i++)
+  if (document_encoding_code == UTF_8)
     {
-      if (strcmp (html, iso[i].html) == 0)
-        return i;
+      /* Binary search in unicode_map.  */
+      size_t low = 0;
+      size_t high = sizeof (unicode_map) / sizeof (unicode_map[0]);
+
+      /* At each loop iteration, low < high; for indices < low the values are
+         smaller than HTML; for indices >= high the values are greater than HTML.
+         So, if HTML occurs in the list, it is at  low <= position < high.  */
+      do
+        {
+          size_t mid = low + (high - low) / 2; /* low <= mid < high */
+          int cmp = strcmp (unicode_map[mid].html, html);
+
+          if (cmp < 0)
+            low = mid + 1;
+          else if (cmp > 0)
+            high = mid;
+          else /* cmp == 0 */
+            return unicode_map[mid].unicode;
+        }
+      while (low < high);
+
+      return -1;
     }
+  else
+    {
+      int i;
+      iso_map_type *iso = encoding_table[document_encoding_code].isotab;
+
+      /* If no conversion table for this encoding, quit.  */
+      if (!iso)
+        return -1;
+
+      for (i = 0; iso[i].html; i++)
+        {
+          if (strcmp (html, iso[i].html) == 0)
+            return i;
+        }
 
-  return -1;
+      return -1;
+    }
 }
 
 
@@ -642,7 +1386,7 @@ cm_documentencoding (void)
       /* See if we have this encoding.  */
       for (enc = no_encoding+1; enc != last_encoding_code; enc++)
         {
-          if (strcasecmp (enc_arg, encoding_table[enc].encname) == 0)
+          if (mbscasecmp (enc_arg, encoding_table[enc].encname) == 0)
             {
               document_encoding_code = enc;
               break;
@@ -691,6 +1435,39 @@ current_document_encoding (void)
 }
 
 
+/* Add RC per the current encoding.  */
+
+static void
+add_encoded_char_from_code (int rc)
+{
+  if (document_encoding_code == UTF_8)
+    {
+      if (rc < 0x80)
+        add_char (rc);
+      else if (rc < 0x800)
+        {
+          add_char (0xc0 | (rc >> 6));
+          add_char (0x80 | (rc & 0x3f));
+        }
+      else if (rc < 0x10000)
+        {
+          add_char (0xe0 | (rc >> 12));
+          add_char (0x80 | ((rc >> 6) & 0x3f));
+          add_char (0x80 | (rc & 0x3f));
+        }
+      else
+        {
+          add_char (0xf0 | (rc >> 18));
+          add_char (0x80 | ((rc >> 12) & 0x3f));
+          add_char (0x80 | ((rc >> 6) & 0x3f));
+          add_char (0x80 | (rc & 0x3f));
+        }
+    }
+  else
+    add_char (encoding_table[document_encoding_code].isotab[rc].bytecode);
+}
+
+
 /* If html or xml output, add &HTML_STR; to the output.  If not html and
    the user requested encoded output, add the real 8-bit character
    corresponding to HTML_STR from the translation tables.  Otherwise,
@@ -703,13 +1480,13 @@ add_encoded_char (char *html_str, char *info_str)
     add_word_args ("&%s;", html_str);
   else if (xml)
     xml_insert_entity (html_str);
-  else if (enable_encoding)
+  else if (enable_encoding && document_encoding_code != no_encoding)
     {
       /* Look for HTML_STR in the current translation table.  */
       int rc = cm_search_iso_map (html_str);
       if (rc >= 0)
         /* We found it, add the real character.  */
-        add_char (encoding_table[document_encoding_code].isotab[rc].bytecode);
+        add_encoded_char_from_code (rc);
       else
         { /* We didn't find it, that seems bad.  */
           warning (_("invalid encoded character `%s'"), html_str);
@@ -789,11 +1566,16 @@ cm_accent_generic_html (int arg, int start, int end, char *html_supported,
 }
 
 
+/* If END is zero, there is nothing in the paragraph to accent.  This
+   can happen when we're in a menu with an accent command and
+   --no-headers is given, so the base character is not added.  In this
+   case we're not producing any output anyway, so just forget it.
+   Otherwise, produce the ASCII version of the accented char.  */
 static void
 cm_accent_generic_no_headers (int arg, int start, int end, int single,
     char *html_solo)
 {
-  if (arg == END)
+  if (arg == END && end > 0)
     {
       if (no_encoding)
         add_char (single);
@@ -801,19 +1583,20 @@ cm_accent_generic_no_headers (int arg, int start, int end, int single,
         {
           int rc;
           char *buffer = xmalloc (1 + strlen (html_solo) + 1);
+	  assert (end > 0);
           buffer[0] = output_paragraph[end - 1];
           buffer[1] = 0;
           strcat (buffer, html_solo);
 
           rc = cm_search_iso_map (buffer);
           if (rc >= 0)
-            /* A little bit tricky ;-)
-               Here we replace the character which has
-               been inserted in read_command with
-               the value we have found in converting table
-               Does there exist a better way to do this?  kama. */
-            output_paragraph[end - 1]
-              = encoding_table[document_encoding_code].isotab[rc].bytecode;
+            {
+              /* Here we replace the character which has
+                 been inserted in read_command with
+                 the value we have found in the conversion table.  */
+              output_paragraph_offset--;
+              add_encoded_char_from_code (rc);
+            }
           else
             { /* If we didn't find a translation for this character,
                  put the single instead. E.g., &Xuml; does not exist so X&uml;
@@ -976,6 +1759,8 @@ cm_special_char (int arg)
         add_encoded_char ("ordf" , "a");
       else if (strcmp (command, "ordm") == 0)
         add_encoded_char ("ordm" , "o");
+      else if (strcmp (command, "textdegree") == 0)
+        add_encoded_char ("deg" , "o");
       else if (strcmp (command, "AE") == 0)
         add_encoded_char ("AElig", command);
       else if (strcmp (command, "ae") == 0)
@@ -990,6 +1775,12 @@ cm_special_char (int arg)
         add_encoded_char ("aring", command);
       else if (strcmp (command, "ss") == 0)
         add_encoded_char ("szlig", command);
+      else if (strcmp (command, "guillemetleft") == 0
+               || strcmp (command, "guillemotleft") == 0)
+        add_encoded_char ("laquo", "<<");
+      else if (strcmp (command, "guillemetright") == 0
+               || strcmp (command, "guillemotright") == 0)
+        add_encoded_char ("raquo", ">>");
       else
         line_error ("cm_special_char internal error: command=@%s", command);
     }
diff --git a/Build/source/utils/texinfo/makeinfo/lang.h b/Build/source/utils/texinfo/makeinfo/lang.h
index b231455a6e9..b902f19f627 100644
--- a/Build/source/utils/texinfo/makeinfo/lang.h
+++ b/Build/source/utils/texinfo/makeinfo/lang.h
@@ -1,12 +1,13 @@
 /* lang.h -- declarations for language codes etc.
-   $Id: lang.h,v 1.6 2004/04/11 17:56:47 karl Exp $
+   $Id: lang.h,v 1.14 2007/11/21 23:02:22 karl Exp $
 
-   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2006, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
 
@@ -23,37 +23,22 @@
 #define LANG_H
 
 /* The language code which can be changed through @documentlanguage
- * Actually we don't currently support this (may be in the future) ;-)
- * These code are the ISO-639 two letter codes.
- */
+   These code are the ISO-639 two letter codes.  */
+
+#undef hz /* AIX 4.3.3 */
 typedef enum
-{
-  aa,  ab,  af,  am,  ar,  as,  ay,  az,
-  ba,  be,  bg,  bh,  bi,  bn,  bo,  br,
-  ca,  co,  cs,  cy,
-  da,  de,  dz,
-  el,  en,  eo,  es,  et,  eu,
-  fa,  fi,  fj,  fo,  fr,  fy,
-  ga,  gd,  gl,  gn,  gu,
-  ha,  he,  hi,  hr,  hu,  hy,
-  ia,  id,  ie,  ik,  is,  it,  iu,
-  ja,  jw,
-  ka,  kk,  kl,  km,  kn,  ko,  ks,  ku,  ky,
-  la,  ln,  lo,  lt,  lv,
-  mg,  mi,  mk,  ml,  mn,  mo,  mr,  ms,  mt,  my,
-  na,  ne,  nl,  no,
-  oc,  om,  or,
-  pa,  pl,  ps,  pt,
-  qu,
-  rm,  rn,  ro,  ru,  rw,
-  sa,  sd,  sg,  sh,  si,  sk,  sl,  sm,  sn,  so,  sq,  sr,  ss,  st,  su,  sv,  sw,
-  ta,  te,  tg,  th,  ti,  tk,  tl,  tn,  to,  tr,  ts,  tt,  tw,
-  ug,  uk,  ur,  uz,
-  vi,  vo,
-  wo,
-  xh,
-  yi,  yo,
-  za,  zh,  zu,
+{ 
+  aa, ab, ae, af, ak, am, an, ar, as, av, ay, az, ba, be, bg, bh, bi,
+  bm, bn, bo, br, bs, ca, ce, ch, co, cr, cs, cu, cv, cy, da, de, dv,
+  dz, ee, el, en, eo, es, et, eu, fa, ff, fi, fj, fo, fr, fy, ga, gd,
+  gl, gn, gu, gv, ha, he, hi, ho, hr, ht, hu, hy, hz, ia, id, ie, ig,
+  ii, ik, io, is, it, iu, ja, jv, ka, kg, ki, kj, kk, kl, km, kn, ko,
+  kr, ks, ku, kv, kw, ky, la, lb, lg, li, ln, lo, lt, lu, lv, mg, mh,
+  mi, mk, ml, mn, mo, mr, ms, mt, my, na, nb, nd, ne, ng, nl, nn, no,
+  nr, nv, ny, oc, oj, om, or, os, pa, pi, pl, ps, pt, qu, rm, rn, ro,
+  ru, rw, sa, sc, sd, se, sg, si, sk, sl, sm, sn, so, sq, sr, ss, st,
+  su, sv, sw, ta, te, tg, th, ti, tk, tl, tn, to, tr, ts, tt, tw, ty,
+  ug, uk, ur, uz, ve, vi, vo, wa, wo, xh, yi, yo, za, zh, zu,
   last_language_code
 } language_code_type;
 
@@ -94,6 +79,9 @@ typedef enum {
   ISO_8859_13,
   ISO_8859_14,
   ISO_8859_15,
+  KOI8_R,
+  KOI8_U,
+  UTF_8,
   last_encoding_code
 } encoding_code_type;
 
@@ -113,6 +101,7 @@ typedef struct
   char *html;        /* HTML equivalent like umlaut auml => &auml; */
   byte_t bytecode;   /* 8-Bit Code (ISO 8859-1,...) */
   unicode_t unicode; /* Unicode in U+ convention */
+  char *translit;    /* 7-bit transliteration */
 } iso_map_type;
 
 /* Information about the document encoding. */
@@ -145,4 +134,8 @@ extern void cm_accent_umlaut (int arg, int start, int end),
 
 extern char *current_document_encoding (void);
 
+extern const char *lang_transliterate_char (byte_t ch);
+
+extern char *document_language;
+
 #endif /* not LANG_H */
diff --git a/Build/source/utils/texinfo/makeinfo/macro.c b/Build/source/utils/texinfo/makeinfo/macro.c
index 65ac0dac8f8..10dabb25728 100644
--- a/Build/source/utils/texinfo/makeinfo/macro.c
+++ b/Build/source/utils/texinfo/makeinfo/macro.c
@@ -1,12 +1,13 @@
 /* macro.c -- user-defined macros for Texinfo.
-   $Id: macro.c,v 1.6 2004/04/11 17:56:47 karl Exp $
+   $Id: macro.c,v 1.12 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "cmds.h"
@@ -151,13 +151,14 @@ add_macro (char *name, char **arglist, char *body, char *source_file,
   def->source_lineno = source_lineno;
   def->body = body;
   def->arglist = arglist;
+  def->argcount = array_len (arglist);
   def->inhibited = 0;
   def->flags = flags;
 }
 
 
 char **
-get_brace_args (int quote_single)
+get_brace_args (enum quote_type quote)
 {
   char **arglist, *word;
   int arglist_index, arglist_size;
@@ -187,8 +188,10 @@ get_brace_args (int quote_single)
           depth++;
           input_text_offset++;
         }
-      else if ((character == ',' && !quote_single) ||
-               ((character == '}') && depth == 1))
+      else if ((character == ','
+		&& !(quote == quote_single
+		     || (quote == quote_many && depth > 1)))
+	       || ((character == '}') && depth == 1))
         {
           int len = input_text_offset - start;
 
@@ -264,7 +267,8 @@ get_macro_args (MACRO_DEF *def)
               char **arglist;
 
               get_rest_of_line (0, &word);
-              if (input_text[input_text_offset - 1] == '\n')
+              if (input_text_offset > 0
+		  && input_text[input_text_offset - 1] == '\n')
                 {
                   input_text_offset--;
                   line_number--;
@@ -284,7 +288,7 @@ get_macro_args (MACRO_DEF *def)
             }
         }
     }
-  return get_brace_args (def->flags & ME_QUOTE_ARG);
+  return get_brace_args (def->argcount == 1 ? quote_single : quote_many);
 }
 
 /* Substitute actual parameters for named parameters in body.
@@ -385,17 +389,13 @@ char *
 expand_macro (MACRO_DEF *def)
 {
   char **arglist;
-  int num_args;
   char *execution_string = NULL;
   int start_line = line_number;
 
-  /* Find out how many arguments this macro definition takes. */
-  num_args = array_len (def->arglist);
-
   /* Gather the arguments present on the line if there are any. */
   arglist = get_macro_args (def);
 
-  if (num_args < array_len (arglist))
+  if (def->argcount < array_len (arglist))
     {
       free_array (arglist);
       line_error (_("Macro `%s' called on line %d with too many args"),
@@ -566,12 +566,6 @@ define_macro (char *mactype, int recursive)
                 }
             }
         }
-      
-      /* If we have exactly one argument, do @quote-arg implicitly.  Not
-         only does this match TeX's behavior (which can't feasibly be
-         changed), but it's a good idea.  */
-      if (arglist_index == 1)
-        flags |= ME_QUOTE_ARG;
     }
 
   /* Read the text carefully until we find an "@end macro" which
@@ -594,6 +588,7 @@ define_macro (char *mactype, int recursive)
           (strncmp (line + 1, "allow-recursion", 15) == 0) &&
           (line[16] == 0 || whitespace (line[16])))
         {
+	  warning (_("@allow-recursion is deprecated; please use @rmacro instead"));
           for (i = 16; whitespace (line[i]); i++);
           strcpy (line, line + i);
           flags |= ME_RECURSE;
@@ -608,20 +603,14 @@ define_macro (char *mactype, int recursive)
           (strncmp (line + 1, "quote-arg", 9) == 0) &&
           (line[10] == 0 || whitespace (line[10])))
         {
+	  warning (_("@quote-arg is deprecated; arguments are quoted by default"));
           for (i = 10; whitespace (line[i]); i++);
           strcpy (line, line + i);
-
-          if (arglist && arglist[0] && !arglist[1])
-            {
-              flags |= ME_QUOTE_ARG;
-              if (!*line)
-                {
-                  free (line);
-                  continue;
-                }
-            }
-          else
-           line_error (_("@quote-arg only useful for single-argument macros"));
+	  if (!*line)
+	    {
+	      free (line);
+	      continue;
+	    }
         }
 
       if (*line == COMMAND_PREFIX
@@ -899,13 +888,12 @@ me_execute_string (char *execution_string)
 void
 me_execute_string_keep_state (char *execution_string, char *append_string)
 {
-  int op_orig, opcol_orig, popen_orig;
+  int op_orig, popen_orig;
   int fill_orig, newline_orig, indent_orig, meta_pos_orig;
 
   remember_itext (input_text, input_text_offset);
   op_orig = output_paragraph_offset;
   meta_pos_orig = meta_char_pos;
-  opcol_orig = output_column;
   popen_orig = paragraph_is_open;
   fill_orig = filling_enabled;
   newline_orig = last_char_was_newline;
@@ -917,7 +905,6 @@ me_execute_string_keep_state (char *execution_string, char *append_string)
     write_region_to_macro_output (append_string, 0, strlen (append_string));
   output_paragraph_offset = op_orig;
   meta_char_pos = meta_pos_orig;
-  output_column = opcol_orig;
   paragraph_is_open = popen_orig;
   filling_enabled = fill_orig;
   last_char_was_newline = newline_orig;
diff --git a/Build/source/utils/texinfo/makeinfo/macro.h b/Build/source/utils/texinfo/makeinfo/macro.h
index fbc0e59e651..de9c65a94c0 100644
--- a/Build/source/utils/texinfo/makeinfo/macro.h
+++ b/Build/source/utils/texinfo/makeinfo/macro.h
@@ -1,12 +1,12 @@
 /* macro.h -- declarations for macro.c.
-   $Id: macro.h,v 1.2 2004/04/11 17:56:47 karl Exp $
+   $Id: macro.h,v 1.6 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 99 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef MACRO_H
 #define MACRO_H
@@ -37,16 +35,16 @@ typedef struct {
 typedef struct {
   char *name;                   /* Name of the macro. */
   char **arglist;               /* Args to replace when executing. */
+  int argcount;                 /* Number of args in arglist */
   char *body;                   /* Macro body. */
   char *source_file;            /* File where this macro is defined. */
   int source_lineno;            /* Line number within FILENAME. */
   int inhibited;                /* Nonzero means make find_macro () fail. */
-  int flags;                    /* ME_RECURSE, ME_QUOTE_ARG, etc. */
+  int flags;                    /* ME_RECURSE, etc. */
 } MACRO_DEF;
 
 /* flags for MACRO_DEF */
 #define ME_RECURSE      0x01
-#define ME_QUOTE_ARG    0x02
 
 extern void execute_macro (MACRO_DEF *def);
 extern MACRO_DEF *find_macro (char *name);
@@ -72,6 +70,8 @@ extern void cm_alias (void), cm_definfoenclose (void);
 
 extern int array_len (char **array);
 extern void free_array (char **array);
-extern char **get_brace_args (int quote_single);
+
+enum quote_type { quote_none, quote_single, quote_many };
+extern char **get_brace_args (enum quote_type type);
 
 #endif /* not MACRO_H */
diff --git a/Build/source/utils/texinfo/makeinfo/makeinfo.c b/Build/source/utils/texinfo/makeinfo/makeinfo.c
index 22ed4c4fd99..36792c26692 100644
--- a/Build/source/utils/texinfo/makeinfo/makeinfo.c
+++ b/Build/source/utils/texinfo/makeinfo/makeinfo.c
@@ -1,13 +1,14 @@
 /* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.74 2004/12/19 17:15:42 karl Exp $
+   $Id: makeinfo.c,v 1.118 2008/03/26 23:57:11 karl Exp $
 
    Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,13 +16,13 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Original author of makeinfo: Brian Fox (bfox@ai.mit.edu).  */
 
 #include "system.h"
 #include "getopt.h"
+#include "mbswidth.h"
 
 #define COMPILING_MAKEINFO
 #include "makeinfo.h"
@@ -71,9 +72,6 @@ char *output_filename = NULL;
 char *command_output_filename = NULL;
 static char *save_command_output_filename = NULL;
 
-#define INITIAL_PARAGRAPH_SPACE 5000
-int paragraph_buffer_len = INITIAL_PARAGRAPH_SPACE;
-
 /* The amount of indentation to add at the starts of paragraphs.
    0 means don't change existing indentation at paragraph starts.
    > 0 is amount to indent new paragraphs by.
@@ -143,6 +141,11 @@ static int executing_macro = 0;
 /* True when we are inside a <li> block of a menu.  */
 static int in_menu_item = 0;
 
+/* The column position of output_paragraph[0].  This is not saved and restored
+   in the multitable code because flush_output () is only called in environment
+   0. */
+static int output_paragraph_start_column = 0;
+
 typedef struct brace_element
 {
   struct brace_element *next;
@@ -164,6 +167,7 @@ static void init_brace_stack (void);
 static void init_internals (void);
 static void pop_and_call_brace (void);
 static void remember_brace (COMMAND_FUNCTION (*proc));
+static void write_trailer (char *filename, char *trailer);
 static int end_of_sentence_p (void);
 
 void maybe_update_execution_strings (char **text, unsigned int new_len);
@@ -350,48 +354,50 @@ Info files suitable for reading online with Emacs or standalone GNU Info.\n"));
     printf (_("\
 General options:\n\
       --error-limit=NUM       quit after NUM errors (default %d).\n\
+      --document-language=STR locale to use in translating Texinfo keywords\n\
+                                for the output document (default C).\n\
       --force                 preserve output even if errors.\n\
       --help                  display this help and exit.\n\
       --no-validate           suppress node cross-reference validation.\n\
       --no-warn               suppress warnings (but not errors).\n\
-      --reference-limit=NUM   warn about at most NUM references (default %d).\n\
   -v, --verbose               explain what is being done.\n\
       --version               display version information and exit.\n"),
-            max_error_level, reference_warning_limit);
+            max_error_level);
     puts ("");
 
      /* xgettext: no-wrap */
     puts (_("\
 Output format selection (default is to produce Info):\n\
-      --docbook             output Docbook XML rather than Info.\n\
-      --html                output HTML rather than Info.\n\
-      --xml                 output Texinfo XML rather than Info.\n\
-      --plaintext           output plain text rather than Info.\n\
+      --docbook               output Docbook XML rather than Info.\n\
+      --html                  output HTML rather than Info.\n\
+      --xml                   output Texinfo XML rather than Info.\n\
+      --plaintext             output plain text rather than Info.\n\
 "));
 
     puts (_("\
 General output options:\n\
-  -E, --macro-expand FILE   output macro-expanded source to FILE.\n\
-                            ignoring any @setfilename.\n\
-      --no-headers          suppress node separators, Node: lines, and menus\n\
-                              from Info output (thus producing plain text)\n\
-                              or from HTML (thus producing shorter output);\n\
-                              also, write to standard output by default.\n\
-      --no-split            suppress splitting of Info or HTML output,\n\
-                            generate only one output file.\n\
-      --number-sections     output chapter and sectioning numbers.\n\
-  -o, --output=FILE         output to FILE (directory if split HTML),\n\
+  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n\
+                                ignoring any @setfilename.\n\
+      --no-headers            suppress node separators, Node: lines, and menus\n\
+                                from Info output (thus producing plain text)\n\
+                                or from HTML (thus producing shorter output);\n\
+                                also, write to standard output by default.\n\
+      --no-split              suppress the splitting of Info or HTML output,\n\
+                                generate only one output file.\n\
+      --number-sections       output chapter and sectioning numbers.\n\
+  -o, --output=FILE           output to FILE (or directory if split HTML).\n\
 "));
 
     printf (_("\
 Options for Info and plain text:\n\
-      --enable-encoding       output accented and special characters in\n\
-                                Info output based on @documentencoding.\n\
+      --disable-encoding      do not output accented and special characters\n\
+                                in Info output based on @documentencoding.\n\
+      --enable-encoding       override --disable-encoding (default).\n\
       --fill-column=NUM       break Info lines at NUM characters (default %d).\n\
       --footnote-style=STYLE  output footnotes in Info according to STYLE:\n\
                                 `separate' to put them in their own node;\n\
-                                `end' to put them at the end of the node\n\
-                                  in which they are defined (default).\n\
+                                `end' to put them at the end of the node, in\n\
+                                which they are defined (this is the default).\n\
       --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %d).\n\
                                 If VAL is `none', do not indent; if VAL is\n\
                                 `asis', preserve existing indentation.\n\
@@ -402,14 +408,17 @@ Options for Info and plain text:\n\
 
     puts (_("\
 Options for HTML:\n\
-      --css-include=FILE        include FILE in HTML <style> output;\n\
-                                  read stdin if FILE is -.\n\
+      --css-include=FILE      include FILE in HTML <style> output;\n\
+                                read stdin if FILE is -.\n\
+      --css-ref=URL           generate reference to a CSS file.\n\
+      --transliterate-file-names\n\
+                              produce file names in ASCII transliteration.\n\
 "));
 
     printf (_("\
 Options for XML and Docbook:\n\
-      --output-indent=VAL       indent XML elements by VAL spaces (default %d).\n\
-                                  If VAL is 0, ignorable whitespace is dropped.\n\
+      --output-indent=VAL     indent XML elements by VAL spaces (default %d).\n\
+                                If VAL is 0, ignorable whitespace is dropped.\n\
 "), xml_indentation_increment);
     puts ("");
 
@@ -451,15 +460,15 @@ Conditional processing in input:\n\
 
     fputs (_("\
 Examples:\n\
-  makeinfo foo.texi                     write Info to foo's @setfilename\n\
-  makeinfo --html foo.texi              write HTML to @setfilename\n\
-  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n\
-  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n\
-  makeinfo --no-headers foo.texi        write plain text to standard output\n\
+  makeinfo foo.texi                      write Info to foo's @setfilename\n\
+  makeinfo --html foo.texi               write HTML to @setfilename\n\
+  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n\
+  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n\
+  makeinfo --no-headers foo.texi         write plain text to standard output\n\
 \n\
-  makeinfo --html --no-headers foo.texi write html without node lines, menus\n\
-  makeinfo --number-sections foo.texi   write Info with numbered sections\n\
-  makeinfo --no-split foo.texi          write one Info file however big\n\
+  makeinfo --html --no-headers foo.texi  write html without node lines, menus\n\
+  makeinfo --number-sections foo.texi    write Info with numbered sections\n\
+  makeinfo --no-split foo.texi           write one Info file however big\n\
 "), stdout);
 
     puts (_("\n\
@@ -472,12 +481,18 @@ Texinfo home page: http://www.gnu.org/software/texinfo/"));
   xexit (exit_value);
 }
 
+#define OPT_CSSREF    256
+#define OPT_TRANSLITERATE_FILE_NAMES 257
+
 struct option long_options[] =
 {
   { "commands-in-node-names", 0, &expensive_validation, 1 },
   { "css-include", 1, 0, 'C' },
+  { "css-ref", 1, 0, OPT_CSSREF },
   { "docbook", 0, 0, 'd' },
+  { "disable-encoding", 0, &enable_encoding, 0 },
   { "enable-encoding", 0, &enable_encoding, 1 },
+  { "document-language", 1, 0, 'l' },
   { "error-limit", 1, 0, 'e' },
   { "fill-column", 1, 0, 'f' },
   { "footnote-style", 1, 0, 's' },
@@ -512,6 +527,7 @@ struct option long_options[] =
   { "plaintext", 0, 0, 't' },
   { "reference-limit", 1, 0, 'r' },
   { "split-size", 1, 0, 'S'},
+  { "transliterate-file-names", 0, &transliterate_file_names, 1 },
   { "verbose", 0, &verbose_mode, 1 },
   { "version", 0, 0, 'V' },
   { "xml", 0, 0, 'x' },
@@ -534,7 +550,7 @@ static COMMAND_LINE_DEFINE *command_line_defines = NULL;
 /* For each file mentioned in the command line, process it, turning
    Texinfo commands into wonderfully formatted output text. */
 int
-main (int argc, char **argv)
+main (int argc, char *argv[])
 {
   int c, ind;
   int reading_from_stdin = 0;
@@ -543,7 +559,7 @@ main (int argc, char **argv)
   /* Do not use LC_ALL, because LC_NUMERIC screws up the scanf parsing
      of the argument to @multicolumn.  */
   setlocale (LC_TIME, "");
-#ifdef LC_MESSAGES /* ultrix */
+#ifdef LC_MESSAGES /* ultrix, djgpp 2.04 */
   setlocale (LC_MESSAGES, "");
 #endif
   setlocale (LC_CTYPE, "");
@@ -617,6 +633,10 @@ main (int argc, char **argv)
           css_include = xstrdup (optarg);
           break;
 
+	case OPT_CSSREF:
+	  css_ref = xstrdup (optarg);
+	  break;
+	  
         case 'D':
         case 'U':
           /* User specified variable to set or clear. */
@@ -685,6 +705,11 @@ main (int argc, char **argv)
           append_to_include_path (optarg);
           break;
 
+	case 'l':
+	  /* save the override language code */
+	  document_language = xstrdup (optarg);
+	  break;
+
         case 'i':
           if (sscanf (optarg, "%d", &xml_indentation_increment) != 1)
             {
@@ -715,14 +740,7 @@ main (int argc, char **argv)
           prepend_to_include_path (optarg);
           break;
 
-        case 'r': /* --reference-limit */
-          if (sscanf (optarg, "%d", &reference_warning_limit) != 1)
-            {
-              fprintf (stderr,
-                     _("%s: %s arg must be numeric, not `%s'.\n"),
-                     progname, "--reference-limit", optarg);
-              usage (1);
-            }
+        case 'r': /* was --reference-limit; obsolete, ignore */
           break;
 
         case 's': /* --footnote-style */
@@ -762,10 +780,11 @@ main (int argc, char **argv)
         case 'V': /* --version */
           print_version_info ();
           puts ("");
-          puts ("Copyright (C) 2004 Free Software Foundation, Inc.");
-          printf (_("There is NO warranty.  You may redistribute this software\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.\n"));
+          printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
+This is free software: you are free to change and redistribute it.\n\
+There is NO WARRANTY, to the extent permitted by law.\n"),
+	      "2008");
           xexit (0);
           break;
 
@@ -1348,14 +1367,13 @@ convert_from_file (char *name)
   int i;
   char *filename = xmalloc (strlen (name) + 50);
 
-  /* Prepend file directory to the search path, so relative links work.  */
+  /* Prepend NAME's directory to the search path, so relative links work.  */
   prepend_to_include_path (pathname_part (name));
 
   initialize_conversion ();
 
   /* Try to load the file specified by NAME, concatenated with our
-     various suffixes.  Prefer files like `makeinfo.texi' to
-     `makeinfo'.  */
+     various suffixes.  Prefer files like `makeinfo.texi' to `makeinfo'.  */
   for (i = 0; suffixes[i]; i++)
     {
       strcpy (filename, name);
@@ -1363,13 +1381,6 @@ convert_from_file (char *name)
 
       if (find_and_load (filename, 1))
         break;
-
-      if (!suffixes[i][0] && strrchr (filename, '.'))
-        {
-          fs_error (filename);
-          free (filename);
-          return;
-        }
     }
 
   if (!suffixes[i])
@@ -1379,8 +1390,14 @@ convert_from_file (char *name)
       return;
     }
 
+  /* `find_and_load' (when successful) clobbers this global with new
+     memory.  We're about to reset it, so may as well free first.  */
+  free (input_filename);
+  
+  /* Set the current filename.  */
   input_filename = filename;
 
+  /* Do the main conversion.  */
   convert_from_loaded_file (name);
 
   /* Pop the prepended path, so multiple filenames in the
@@ -1630,10 +1647,7 @@ convert_from_loaded_file (char *name)
     }
 
   set_current_output_filename (real_output_filename);
-
-  if (xml && !docbook)
-    xml_begin_document (filename_part (output_filename));
-
+  
   if (verbose_mode)
     printf (_("Making %s file `%s' from `%s'.\n"),
             no_headers ? "text"
@@ -1648,6 +1662,9 @@ convert_from_loaded_file (char *name)
       goto finished;
     }
 
+  if (xml)
+    xml_begin_document (filename_part (output_filename));
+
   /* Make the displayable filename from output_filename.  Only the base
      portion of the filename need be displayed. */
   flush_output ();              /* in case there was no @bye */
@@ -1668,13 +1685,6 @@ convert_from_loaded_file (char *name)
         line_number++;
   }
 
-  /* html fixxme: should output this as trailer on first page.  */
-  if (!no_headers && !html && !xml)
-    add_word_args (_("This is %s, produced by makeinfo version %s from %s.\n"),
-                   output_filename, VERSION, input_filename);
-
-  close_paragraph ();
-
   if (xml && !docbook)
     {
       /* Just before the real main loop, let's handle the defines.  */
@@ -1725,25 +1735,12 @@ _("%s: Removing macro output file `%s' due to errors; use --force to preserve.\n
           close_paragraph ();
         }
 
-      /* maybe we want local variables in info output.  */
-      {
-        char *trailer = info_trailer ();
-	if (!xml && !docbook && trailer)
-          {
-            if (html)
-              insert_string ("<!--");
-            insert_string (trailer);
-            free (trailer);
-            if (html)
-              insert_string ("\n-->\n");
-          }
-      }
-
       /* Write stuff makeinfo generates after @bye, ie. info_trailer.  */
       flush_output ();
 
       if (output_stream != stdout)
-        fclose (output_stream);
+        if (fclose (output_stream) != 0)
+          fs_error (real_output_filename);
 
       /* If validating, then validate the entire file right now. */
       if (validating)
@@ -1758,6 +1755,10 @@ _("%s: Removing macro output file `%s' due to errors; use --force to preserve.\n
             write_tag_table (real_output_filename);
         }
 
+      /* Maybe we want local variables in info output.  Must be after
+         tag table, since otherwise usually Emacs will not see it.  */
+      write_trailer (real_output_filename, info_trailer ());
+
       if (splitting && !html && (!errors_printed || force))
         {
           clean_old_split_files (real_output_filename);
@@ -1804,6 +1805,37 @@ info_trailer (void)
   free (encoding);
   return NULL;
 }
+
+/* Append TRAILER to FILENAME for Info and HTML output.  Include HTML
+   comments if needed.  */
+static void
+write_trailer (char *filename, char *trailer)
+{
+  if (!trailer || xml || docbook) 
+    return;
+
+  if (output_stream != stdout)
+    output_stream = fopen (filename, "a");
+  if (!output_stream)
+    {
+      fs_error (filename);
+      return;
+    }
+
+  if (html)
+    fwrite ("<!--", 1, 4, output_stream);
+
+  fwrite (trailer, 1, strlen (trailer), output_stream);
+  free (trailer);
+
+  if (html)
+    fwrite ("\n-->\n", 1, 5, output_stream);
+
+  if (output_stream != stdout)
+    if (fclose (output_stream) != 0)
+      fs_error (filename);
+}
+
 
 void
 free_and_clear (char **pointer)
@@ -1839,11 +1871,12 @@ init_internals (void)
 void
 init_paragraph (void)
 {
-  free (output_paragraph);
+  if (output_paragraph)
+    free (output_paragraph);
   output_paragraph = xmalloc (paragraph_buffer_len);
   output_paragraph[0] = 0;
   output_paragraph_offset = 0;
-  output_column = 0;
+  output_paragraph_start_column = 0;
   paragraph_is_open = 0;
   current_indent = 0;
   meta_char_pos = 0;
@@ -1973,7 +2006,8 @@ get_command_entry (char *string)
   /* We never heard of this command. */
   return (COMMAND *) -1;
 }
-
+
+
 /* input_text_offset is right at the command prefix character.
    Read the next token to determine what to do.  Return zero
    if there's no known command or macro after the prefix character.  */
@@ -2202,6 +2236,7 @@ reader_loop (void)
              menu swallows its newline, so check here instead.  */
           if (!only_macro_expansion && in_menu
               && input_text_offset + 1 < input_text_length
+	      && input_text_offset > 0
               && input_text[input_text_offset-1] == '\n')
             handle_menu_entry ();
           else
@@ -2407,37 +2442,63 @@ discard_braces (void)
     }
 }
 
-static int
-get_char_len (int character)
+/* Return the 0-based number of the current output column */
+int
+current_output_column (void)
 {
-  /* Return the printed length of the character. */
-  int len;
+  int i, column;
 
-  switch (character)
+  for (i = output_paragraph_offset; i > 0 && output_paragraph[i - 1] != '\n';
+       i--)
+     ;
+  if (i == 0)
+    column = output_paragraph_start_column;
+  else
+    column = 0;
+  while (i < output_paragraph_offset)
     {
-    case '\t':
-      len = (output_column + 8) & 0xf7;
-      if (len > fill_column)
-        len = fill_column - output_column;
-      else
-        len = len - output_column;
-      break;
-
-    case '\n':
-      len = fill_column - output_column;
-      break;
-
-    default:
-      /* ASCII control characters appear as two characters in the output
-         (e.g., ^A).  But characters with the high bit set are just one
-         on suitable terminals, so don't count them as two for line
-         breaking purposes.  */
-      if (0 <= character && character < ' ')
-        len = 2;
-      else
-        len = 1;
+      int j;
+
+      /* Find a span of non-control characters */
+      for (j = i; j < output_paragraph_offset; j++)
+ 	{
+ 	  char c;
+
+ 	  c = output_paragraph[j];
+ 	  if ((0 <= c && c < ' ') || c == '\t' || c == NON_BREAKING_SPACE)
+ 	    break;
+ 	}
+      if (i < j)
+ 	{
+ 	  column += mbsnwidth ((char *)(output_paragraph + i), j - i, 0);
+	  i = j;
+ 	}
+      if (i < output_paragraph_offset)
+ 	{
+ 	  char c;
+
+ 	  /* Handle a control character */
+ 	  c = output_paragraph[i];
+ 	  if (c == '\t')
+ 	    {
+ 	      column = (column + 8) & ~0x7;
+ 	      if (column > fill_column)
+ 		column = fill_column;
+ 	    }
+	  else if (c == NON_BREAKING_SPACE)
+	    column++;
+ 	  else
+ 	    {
+ 	      /* ASCII control characters appear as two characters in the
+ 		 output (e.g., ^A).  */
+ 	      if (!(0 <= c && c < ' '))
+ 		abort ();
+ 	      column += 2;
+ 	    }
+ 	  i++;
+ 	}
     }
-  return len;
+  return column;
 }
 
 void
@@ -2539,7 +2600,42 @@ defining_copying (void)
   return 0;
 }
 
+/* Output the header for Info.
+   html fixxme: should output this as trailer on first page (at least).  */
+
+static void
+info_output_head (void)
+{
+  add_word_args (gdt("This is %s, produced by makeinfo version %s from %s.\n"),
+                 output_filename, VERSION, input_filename);
+
+  /* Start afresh with whatever real text we have.  */
+  close_paragraph ();
 
+  /* We do not want indentation in what follows, which is usually going
+     to be a node marker (CTRL-_).  */
+  if (inhibit_paragraph_indentation == 0)
+    inhibit_paragraph_indentation = -1;
+}
+
+void
+output_head (void)
+{
+  if (output_head_p) /* no-op if we're mistakenly called twice */
+    return;
+  output_head_p = 1;
+  
+  if (html)
+    html_output_head ();
+  else if (xml)
+    ; /* handled differently, via xml_begin_document */
+  else if (no_headers)
+    ; /* no header for plain text */
+  else
+    info_output_head ();
+}
+
+
 /* Add the character to the current paragraph.  If filling_enabled is
    nonzero, then do filling as well. */
 void
@@ -2562,13 +2658,13 @@ add_char (int character)
      ignore close_paragraph () calls any more. */
   if (must_start_paragraph && character != '\n')
     {
+      int column;
+
       must_start_paragraph = 0;
       line_already_broken = 0;  /* The line is no longer broken. */
-      if (current_indent > output_column)
-        {
-          indent (current_indent - output_column);
-          output_column = current_indent;
-        }
+      column = current_output_column ();
+      if (current_indent > column)
+	indent (current_indent - column);
     }
 
   if (non_splitting_words
@@ -2584,7 +2680,7 @@ add_char (int character)
           character = ';';
         }
       else
-        character = META (' '); /* unmeta-d in flush_output */
+        character = NON_BREAKING_SPACE; /* restored in flush_output */
     }
 
   insertion_paragraph_closed = 0;
@@ -2603,17 +2699,16 @@ add_char (int character)
               flush_output ();
             }
 
-          output_column = 0;
-
           if (!no_indent && paragraph_is_open)
-            indent (output_column = current_indent);
+            indent (current_indent);
           break;
         }
-      else if (end_of_sentence_p ())
-        /* CHARACTER is newline, and filling is enabled. */
+      else if (end_of_sentence_p () && !french_spacing)
+        /* CHARACTER is newline, filling is enabled, and we're at the
+           end of a sentence.  Insert an extra space, unless
+           @frenchspacing is in effect.  */
         {
           insert (' ');
-          output_column++;
           last_inserted_character = character;
         }
 
@@ -2631,13 +2726,12 @@ add_char (int character)
             insert ('\n');
           else
             insert (' ');
-          output_column++;
         }
       break;
 
     default: /* not at newline */
       {
-        int len = get_char_len (character);
+        int column;
         int suppress_insert = 0;
 
         if ((character == ' ') && (last_char_was_newline))
@@ -2649,15 +2743,19 @@ add_char (int character)
               }
           }
 
-        /* This is sad, but it seems desirable to not force any
-           particular order on the front matter commands.  This way,
-           the document can do @settitle, @documentlanguage, etc, in
-           any order and with any omissions, and we'll still output
-           the html <head> `just in time'.  */
+        /* This is a sad place to do this, but it seems highly desirable
+           to not force any particular order on the front matter
+           commands.  This way, the document can do @settitle,
+           @documentlanguage, etc, in any order and with any omissions,
+           and we'll still output the header ("produced by makeinfo",
+           HTML <head>, etc.) `just in time'.  */
         if ((executing_macro || !executing_string)
             && !only_macro_expansion
-            && html && !html_output_head_p && !defining_copying ())
-          html_output_head ();
+            && !defining_copying ()
+            && !output_head_p)
+          {
+            output_head ();
+          }
 
         if (!paragraph_is_open)
           {
@@ -2685,8 +2783,11 @@ add_char (int character)
               }
           }
 
-        output_column += len;
-        if (output_column > fill_column)
+	output_paragraph[output_paragraph_offset] = character;
+	output_paragraph_offset++;
+	column = current_output_column ();
+	output_paragraph_offset--;
+        if (column > fill_column)
           {
             if (filling_enabled && !html)
               {
@@ -2773,11 +2874,6 @@ add_char (int character)
                             output_paragraph_offset += current_indent;
                             free (temp_buffer);
                           }
-                        output_column = 0;
-                        while (temp < output_paragraph_offset)
-                          output_column +=
-                            get_char_len (output_paragraph[temp++]);
-                        output_column += len;
                         break;
                       }
                   }
@@ -2870,7 +2966,6 @@ kill_self_indent (int count)
   /* Handle infinite case first. */
   if (count < 0)
     {
-      output_column = 0;
       while (output_paragraph_offset)
         {
           if (whitespace (output_paragraph[output_paragraph_offset - 1]))
@@ -2922,22 +3017,17 @@ flush_output (void)
           node_line_number++;
         }
 
-      /* If we turned on the 8th bit for a space inside @w, turn it
-         back off for output.  This might be problematic, since the
-         0x80 character may be used in 8-bit character sets.  Sigh.
-         In any case, don't do this for HTML, since the nbsp character
-         is valid input and must be passed along to the browser.  */
-      if (!html && (output_paragraph[i] & meta_character_bit))
-        {
-          int temp = UNMETA (output_paragraph[i]);
-          if (temp == ' ')
-            output_paragraph[i] &= 0x7f;
-        }
+      /* If we turned on the 8th bit for a space inside @w, turn it back off
+         for output.  Don't do this for HTML, since the nbsp character is valid
+         input and must be passed along to the browser.  */
+      if (!html && output_paragraph[i] == NON_BREAKING_SPACE)
+	output_paragraph[i] = ' ';
     }
 
   fwrite (output_paragraph, 1, output_paragraph_offset, output_stream);
 
   output_position += output_paragraph_offset;
+  output_paragraph_start_column = current_output_column ();
   output_paragraph_offset = 0;
   meta_char_pos = 0;
 }
@@ -2988,6 +3078,8 @@ close_insertion_paragraph (void)
     }
   else
     {
+      int column;
+
       /* If the insertion paragraph is closed already, then we are seeing
          two `@end' commands in a row.  Note that the first one we saw was
          handled in the first part of this if-then-else clause, and at that
@@ -2995,8 +3087,9 @@ close_insertion_paragraph (void)
          indentation of the current line.  However, the indentation level
          may have just changed again, so we may have to outdent the current
          line to the new indentation level. */
-      if (current_indent < output_column)
-        kill_self_indent (output_column - current_indent);
+      column = current_output_column ();
+      if (current_indent < column)
+        kill_self_indent (column - current_indent);
     }
 
   insertion_paragraph_closed = 1;
@@ -3009,7 +3102,7 @@ close_paragraph (void)
   int i;
 
   /* We don't need these newlines in XML and Docbook outputs for
-     paragraph seperation.  We have <para> element for that.  */
+     paragraph separation.  We have the <para> element for that.  */
   if (xml)
     return;
 
@@ -3062,7 +3155,6 @@ close_paragraph (void)
       flush_output ();
       paragraph_is_open = 0;
       no_indent = 0;
-      output_column = 0;
     }
 
   ignore_blank_line ();
@@ -3076,38 +3168,40 @@ ignore_blank_line (void)
   last_char_was_newline = 1;
 }
 
-/* Align the end of the text in output_paragraph with fill_column. */
+/* Align the end of the text in output_paragraph with fill_column.  The last
+   character in output_paragraph is '\n'. */
 static void
 do_flush_right_indentation (void)
 {
   char *temp;
-  int temp_len;
 
   kill_self_indent (-1);
 
   if (output_paragraph[0] != '\n')
     {
-      output_paragraph[output_paragraph_offset] = 0;
+      int width;
 
-      if (output_paragraph_offset < fill_column)
+      width = mbsnwidth ((char *)output_paragraph, output_paragraph_offset - 1,
+			 0) + 1;
+      if (width < fill_column)
         {
           int i;
 
-          if (fill_column >= paragraph_buffer_len)
+          if (output_paragraph_offset + (fill_column - width)
+	      >= paragraph_buffer_len)
             output_paragraph =
               xrealloc (output_paragraph,
                         (paragraph_buffer_len += fill_column));
 
-          temp_len = strlen ((char *)output_paragraph);
-          temp = xmalloc (temp_len + 1);
-          memcpy (temp, (char *)output_paragraph, temp_len);
+          temp = xmalloc (output_paragraph_offset);
+          memcpy (temp, (char *)output_paragraph, output_paragraph_offset);
 
-          for (i = 0; i < fill_column - output_paragraph_offset; i++)
+          for (i = 0; i < fill_column - width; i++)
             output_paragraph[i] = ' ';
 
-          memcpy ((char *)output_paragraph + i, temp, temp_len);
+          memcpy ((char *)output_paragraph + i, temp, output_paragraph_offset);
           free (temp);
-          output_paragraph_offset = fill_column;
+          output_paragraph_offset += i;
           adjust_braces_following (0, i);
         }
     }
@@ -3137,6 +3231,8 @@ start_paragraph (void)
       /* If doing indentation, then insert the appropriate amount. */
       if (!no_indent)
         {
+	  int column;
+
           if (inhibit_paragraph_indentation)
             {
               amount_to_indent = current_indent;
@@ -3148,12 +3244,9 @@ start_paragraph (void)
           else
             amount_to_indent = current_indent + paragraph_start_indent;
 
-          if (amount_to_indent >= output_column)
-            {
-              amount_to_indent -= output_column;
-              indent (amount_to_indent);
-              output_column += amount_to_indent;
-            }
+	  column = current_output_column ();
+          if (amount_to_indent >= column)
+	    indent (amount_to_indent - column);
         }
     }
   else
@@ -3173,9 +3266,9 @@ indent (int amount)
 }
 
 /* Search forward for STRING in input_text.
-   FROM says where where to start. */
+   FROM says where to start. */
 int
-search_forward (char *string, int from)
+search_forward (const char *string, int from)
 {
   int len = strlen (string);
 
@@ -3240,6 +3333,32 @@ next_nonwhitespace_character (void)
 
   return -1;
 }
+
+
+
+/* Replace " with \" and \ with \\.  Used for alt tag in Info output.
+   Return a newly-malloced string in all cases.  */
+
+static char *
+bs_escape_quote (const char *src)
+{
+  int c;
+  char *dest = xmalloc (2 * strlen (src) + 1);  /* can't need more.  */
+  char *p = dest;
+  
+  for (; c = *src; src++)
+    {
+      if (c == '"' || c == '\\')
+        *p++ = '\\';
+
+      *p++ = c;
+    }
+  *p = 0;
+  
+  return dest;
+}
+
+
 
 /* An external image is a reference, kind of.  The parsing is (not
    coincidentally) similar, anyway.  */
@@ -3261,8 +3380,8 @@ cm_image (int arg)
     {
       struct stat file_info;
       char *pathname = NULL;
-      char *fullname = xmalloc (strlen (name_arg)
-                       + (ext_arg && *ext_arg ? strlen (ext_arg) + 1: 4) + 1);
+      unsigned ext_len = (ext_arg && *ext_arg) ? strlen (ext_arg) : 0;
+      char *fullname = xmalloc (strlen (name_arg) + MAX (ext_len, 4) + 1);
 
       if (ext_arg && *ext_arg)
         {
@@ -3290,10 +3409,16 @@ cm_image (int arg)
             if (pathname == NULL) {
               sprintf (fullname, "%s.jpg", name_arg);
               if (access (fullname, R_OK) != 0) {
-                sprintf (fullname, "%s.gif", name_arg);
-                if (access (fullname, R_OK) != 0) {
-                  pathname = get_file_info_in_path (fullname,
-                                               include_files_path, &file_info);
+		  pathname = get_file_info_in_path (fullname,
+						    include_files_path,
+						    &file_info);
+		  if (pathname == NULL) {
+		    sprintf (fullname, "%s.gif", name_arg);
+		    if (access (fullname, R_OK) != 0) {
+		      pathname = get_file_info_in_path (fullname,
+							include_files_path,
+							&file_info);
+		    }
                 }
               }
             }
@@ -3355,12 +3480,10 @@ cm_image (int arg)
             xml_no_para--;
         }
       else
-        { /* Try to open foo.EXT or foo.txt.  */
+        { /* Prefer foo.txt for Info/ASCII.  Seems wrong nowadays.  */
           FILE *image_file;
           char *txtpath = NULL;
-          char *txtname = xmalloc (strlen (name_arg)
-                                   + (ext_arg && *ext_arg
-                                      ? strlen (ext_arg) : 4) + 1);
+          char *txtname = xmalloc (strlen (name_arg) + 4 + 1);
           strcpy (txtname, name_arg);
           strcat (txtname, ".txt");
           image_file = fopen (txtname, "r");
@@ -3402,7 +3525,13 @@ cm_image (int arg)
                     add_word_args (" src=\"%s\"", fullname);
 
                   if (*alt_arg)
-                    add_word_args (" alt=\"%s\"", alt_arg);
+                    {
+                      char *expanded = text_expansion (alt_arg);
+                      char *escaped = bs_escape_quote (expanded);
+                      add_word_args (" alt=\"%s\"", escaped);
+                      free (expanded);
+                      free (escaped);
+                    }
                 }
 
               if (image_file != NULL)
@@ -3591,13 +3720,13 @@ cm_ifeq (void)
 {
   char **arglist;
 
-  arglist = get_brace_args (0);
+  arglist = get_brace_args (quote_none);
 
   if (arglist)
     {
       if (array_len (arglist) > 1)
         {
-          if ((strcasecmp (arglist[0], arglist[1]) == 0) &&
+          if ((mbscasecmp (arglist[0], arglist[1]) == 0) &&
               (arglist[2]))
             execute_string ("%s\n", arglist[2]);
         }
@@ -3642,7 +3771,6 @@ cm_value (int arg, int start_pos, int end_pos)
       output_paragraph[end_pos] = 0;
       name = xstrdup (name);
       value = set_p (name);
-      output_column -= end_pos - start_pos;
       output_paragraph_offset = start_pos;
 
       /* Restore the previous value of meta_char_pos if the stuff
@@ -4036,6 +4164,7 @@ maybe_escaped_expansion (char *str, int implicit_code, int do_html_escape)
   indented_fill = 0;
   no_indent = 1;
   escape_html = do_html_escape;
+  xml_no_para++;
 
   result = full_expansion (str, implicit_code);
 
@@ -4043,6 +4172,7 @@ maybe_escaped_expansion (char *str, int implicit_code, int do_html_escape)
   indented_fill = saved_indented_fill;
   no_indent = saved_no_indent;
   escape_html = saved_escape_html;
+  xml_no_para--;
 
   return result;
 }
@@ -4061,7 +4191,6 @@ full_expansion (char *str, int implicit_code)
   /* Inhibit any real output.  */
   int start = output_paragraph_offset;
   int saved_paragraph_is_open = paragraph_is_open;
-  int saved_output_column = output_column;
 
   /* More output state to save.  */
   int saved_meta_pos = meta_char_pos;
@@ -4096,7 +4225,6 @@ full_expansion (char *str, int implicit_code)
 
   output_paragraph_offset = start;
   paragraph_is_open = saved_paragraph_is_open;
-  output_column = saved_output_column;
 
   meta_char_pos = saved_meta_pos;
   last_inserted_character = saved_last_char;
@@ -4155,3 +4283,68 @@ set_paragraph_indent (char *string)
     }
   return 0;
 }
+
+
+/* Translate MSGID according to the document language (@documentlanguage
+   value or --document-language), rather than the current locale
+   (LANGUAGE/LC_ALL/LANG).  This code is from the get_title function in
+   gettext.  (xsetenv and unsetenv come from the gnulib xsetenv module.)  */
+
+char *
+getdocumenttext (const char *msgid)
+{
+  /* The original get_title also saves, sets, and restores
+     OUTPUT_CHARSET, so that the translation will be given in
+     the proper encoding (via canonical_locale_charset).  But defining
+     that function ends up pulling a whole lot of subsidiary functions.
+     Not sure how to handle it; skip the whole thing for now.  */
+  const char *tmp;
+  char *old_LC_ALL;
+  char *old_LANGUAGE;
+  const char *result;
+#ifdef HAVE_SETLOCALE
+  char *old_locale;
+#endif
+
+  /* Save LC_ALL, LANGUAGE environment variables.  */
+
+  tmp = getenv ("LC_ALL");
+  old_LC_ALL = (tmp != NULL ? xstrdup (tmp) : NULL);
+
+  tmp = getenv ("LANGUAGE");
+  old_LANGUAGE = (tmp != NULL ? xstrdup (tmp) : NULL);
+
+  xsetenv ("LC_ALL", document_language, 1);
+  unsetenv ("LANGUAGE");
+
+#ifdef HAVE_SETLOCALE
+  old_locale = xstrdup (setlocale (LC_ALL, NULL));
+  if (setlocale (LC_ALL, "") == NULL)
+    /* Nonexistent locale.  Use the original.  */
+    result = msgid;
+  else
+#endif
+    {
+      /* Fetch the translation.  */
+      result = gettext ((char *) msgid);
+    }
+
+  /* Restore LC_ALL, LANGUAGE environment variables.  */
+
+  if (old_LC_ALL != NULL)
+    xsetenv ("LC_ALL", old_LC_ALL, 1), free (old_LC_ALL);
+  else
+    unsetenv ("LC_ALL");
+
+  if (old_LANGUAGE != NULL)
+    xsetenv ("LANGUAGE", old_LANGUAGE, 1), free (old_LANGUAGE);
+  else
+    unsetenv ("LANGUAGE");
+
+#ifdef HAVE_SETLOCALE
+  setlocale (LC_ALL, old_locale);
+  free (old_locale);
+#endif
+
+  return (char *) result;
+}
diff --git a/Build/source/utils/texinfo/makeinfo/makeinfo.h b/Build/source/utils/texinfo/makeinfo/makeinfo.h
index de4d423708b..ec3b26b4095 100644
--- a/Build/source/utils/texinfo/makeinfo/makeinfo.h
+++ b/Build/source/utils/texinfo/makeinfo/makeinfo.h
@@ -1,13 +1,13 @@
 /* makeinfo.h -- declarations for Makeinfo.
-   $Id: makeinfo.h,v 1.17 2004/11/30 02:03:23 karl Exp $
+   $Id: makeinfo.h,v 1.31 2008/03/26 23:57:12 karl Exp $
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
-   Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
@@ -47,15 +46,14 @@ DECLARE (char *, pretty_output_filename, NULL);
 /* Current output file name.  */
 DECLARE (char *, current_output_filename, NULL);
 
-/* Output paragraph buffer. */
+/* Output paragraph buffer and its length. */
+#define INITIAL_PARAGRAPH_BUFFER_LEN 5000
 DECLARE (unsigned char *, output_paragraph, NULL);
+DECLARE (int, paragraph_buffer_len, INITIAL_PARAGRAPH_BUFFER_LEN);
 
 /* Offset into OUTPUT_PARAGRAPH. */
 DECLARE (int, output_paragraph_offset, 0);
 
-/* The output paragraph "cursor" horizontal position. */
-DECLARE (int, output_column, 0);
-
 /* Position in the output file. */
 DECLARE (int, output_position, 0);
 
@@ -74,6 +72,9 @@ DECLARE (int, paragraph_is_open, 0);
    any attention to `close_paragraph' calls. */
 DECLARE (int, must_start_paragraph, 0);
 
+/* Nonzero if we have output the topmatter of the output file.  */
+DECLARE (int, output_head_p, 0);
+
 /* Nonzero means that we have seen "@top" once already. */
 DECLARE (int, top_node_seen, 0);
 
@@ -109,6 +110,9 @@ DECLARE (int, force_flush_right, 0);
 /* The column at which long lines are broken. */
 DECLARE (int, fill_column, 72);
 
+/* Nonzero means we're doing one space after sentences (@frenchspacing).  */
+DECLARE (int, french_spacing, 0);
+
 /* Nonzero means that words are not to be split, even in long lines.  This
    gets changed for cm_w (). */
 DECLARE (int, non_splitting_words, 0);
@@ -129,9 +133,9 @@ DECLARE (int, xml, 0);
 /* Nonzero means that we're generating DocBook. (--docbook) */
 DECLARE (int, docbook, 0);
 
-/* Nonzero means true 8-bit output for Info and plain text.
-   (--enable-encoding) */
-DECLARE (int, enable_encoding, 0);
+/* Nonzero means 8-bit output for Info and plain text, according to
+   @documentencoding.  (--enable-encoding) */
+DECLARE (int, enable_encoding, 1);
 
 /* Nonzero means escape characters in HTML output. */
 DECLARE (int, escape_html, 1);
@@ -186,6 +190,12 @@ DECLARE (char *, node_filename, NULL);
 /* Name of CSS file to include, if any.  (--css-include).  */
 DECLARE (char *, css_include, NULL);
 
+/* Name of CSS to reference, if any.  (--css-ref).  */
+DECLARE (char *, css_ref, NULL);
+
+/* Transliterate file names into ASCII */
+DECLARE (int, transliterate_file_names, 0);
+
 /* Nonzero means do not output "Node: Foo" for node separations, that
    is, generate plain text.  (--no-headers) */
 DECLARE (int, no_headers, 0);
@@ -213,10 +223,6 @@ DECLARE (int, process_tex, 0);
 /* Nonzero means that we process @xml and @ifxml.  (--ifxml) */
 DECLARE (int, process_xml, 0);
 
-/* Maximum number of references to a single node before complaining.
-   (--reference-limit) */
-DECLARE (int, reference_warning_limit, 1000);
-
 /* Default is to check node references.  (--no-validate) */
 DECLARE (int, validating, 1);
 
@@ -242,13 +248,6 @@ DECLARE (int, expensive_validation, 0);
 #define coerce_to_upper(c) ((islower(c) ? toupper(c) : (c)))
 #define coerce_to_lower(c) ((isupper(c) ? tolower(c) : (c)))
 
-#define control_character_bit 0x40 /* %01000000, must be off. */
-#define meta_character_bit 0x080/* %10000000, must be on.  */
-#define CTL(c) ((c) & (~control_character_bit))
-#define UNCTL(c) coerce_to_upper(((c)|control_character_bit))
-#define META(c) ((c) | (meta_character_bit))
-#define UNMETA(c) ((c) & (~meta_character_bit))
-
 #define whitespace(c)       ((c) == '\t' || (c) == ' ')
 #define sentence_ender(c)   ((c) == '.'  || (c) == '?' || (c) == '!')
 #define cr_or_whitespace(c) (whitespace(c) || (c) == '\r' || (c) == '\n')
@@ -278,10 +277,13 @@ DECLARE (int, expensive_validation, 0);
 #define OLD_URL_SAFE_CHAR(ch) (strchr (OLD_HTML_SAFE, ch))
 
 /* For the current/stable scheme.  */
-#define URL_SAFE_CHAR(ch) (isalnum (ch))
+#define URL_SAFE_CHAR(ch) (((unsigned char)ch)<128 && isalnum (ch))
 
 #define COMMAND_PREFIX '@'
 
+/* A byte value to represent a non-breaking space until flush_output (). */
+#define NON_BREAKING_SPACE 036
+
 #define END_VERBATIM "end verbatim"
 
 /* Stuff for splitting large files.  The numbers for Emacs
@@ -316,6 +318,11 @@ typedef struct generic_list {
   struct generic_list *next;
 } GENERIC_LIST;
 
+/* Use `gdt' instead of `_' to translate strings that end up in the
+   output document.  */
+extern char *getdocumenttext (const char *msgid);
+#define gdt(s) getdocumenttext(s)
+
 /* Reverse the order of a list.  */
 extern GENERIC_LIST * reverse_list (GENERIC_LIST *list);
 
@@ -354,14 +361,16 @@ extern void free_and_clear (char **pointer),
   discard_braces (void),
   replace_with_expansion (int from, int *to),
   fix_whitespace (char *string),
+  output_head (void),
   add_html_elt (char *string);
 
 extern int get_until (char *match, char **string),
   set_paragraph_indent (char *string),
   self_delimiting (int character),
-  search_forward (char *string, int from),
+  search_forward (const char *string, int from),
   search_forward_until_pos (char *string, int from, int end_pos),
   next_nonwhitespace_character (void),
+  current_output_column (void),
   fs_error (char *filename);
 
 #if defined (VA_FPRINTF) && __STDC__
diff --git a/Build/source/utils/texinfo/makeinfo/multi.c b/Build/source/utils/texinfo/makeinfo/multi.c
index 06c548fb5e9..43033a24eea 100644
--- a/Build/source/utils/texinfo/makeinfo/multi.c
+++ b/Build/source/utils/texinfo/makeinfo/multi.c
@@ -1,13 +1,13 @@
 /* multi.c -- multiple-column tables (@multitable) for makeinfo.
-   $Id: multi.c,v 1.8 2004/04/11 17:56:47 karl Exp $
+   $Id: multi.c,v 1.18 2007/07/01 21:20:33 karl Exp $
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,12 +15,12 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
    Originally written by phr@gnu.org (Paul Rubin).  */
 
 #include "system.h"
+#include "mbswidth.h"
 #include "cmds.h"
 #include "insertion.h"
 #include "makeinfo.h"
@@ -54,13 +54,13 @@
 
 /* contents of an output environment */
 /* some more vars may end up being needed here later @@ */
-struct env
+static struct env
 {
   unsigned char *output_paragraph;
   int output_paragraph_offset;
-  int meta_char_pos;
-  int output_column;
+  int paragraph_buffer_len;
   int paragraph_is_open;
+  int meta_char_pos;
   int current_indent;
   int fill_column;
 } envs[MAXCOLS];                /* the environment table */
@@ -142,9 +142,9 @@ select_output_environment (int n)
   /* stash current env info from global vars into the old environment */
   e->output_paragraph = output_paragraph;
   e->output_paragraph_offset = output_paragraph_offset;
-  e->meta_char_pos = meta_char_pos;
-  e->output_column = output_column;
+  e->paragraph_buffer_len = paragraph_buffer_len;
   e->paragraph_is_open = paragraph_is_open;
+  e->meta_char_pos = meta_char_pos;
   e->current_indent = current_indent;
   e->fill_column = fill_column;
 
@@ -153,11 +153,17 @@ select_output_environment (int n)
   e = &envs[current_env_no];
   output_paragraph = e->output_paragraph;
   output_paragraph_offset = e->output_paragraph_offset;
-  meta_char_pos = e->meta_char_pos;
-  output_column = e->output_column;
+  /* All the elements in the output environment structures start out as
+     zeros from the static declaration.  However, we don't want to try
+     to malloc zero bytes when init_paragraph is called just below,
+     after we return.  */
+  paragraph_buffer_len = e->paragraph_buffer_len ? e->paragraph_buffer_len
+                         : INITIAL_PARAGRAPH_BUFFER_LEN;
   paragraph_is_open = e->paragraph_is_open;
+  meta_char_pos = e->meta_char_pos;
   current_indent = e->current_indent;
   fill_column = e->fill_column;
+
   return old_env_no;
 }
 
@@ -348,7 +354,8 @@ do_multitable (void)
   if (xml)
     {
       xml_no_para = 1;
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
+      if (output_paragraph_offset > 0
+	  && output_paragraph[output_paragraph_offset-1] == '\n')
         output_paragraph_offset--;
     }
 
@@ -430,9 +437,9 @@ output_multitable_row (void)
 
   /* remove trailing whitespace from each column */
   for (i = 1; i <= last_column; i++) {
-    if (envs[i].output_paragraph_offset)
-      while (cr_or_whitespace (CHAR_AT (envs[i].output_paragraph_offset - 1)))
-        envs[i].output_paragraph_offset--;
+    while (envs[i].output_paragraph_offset
+           && cr_or_whitespace (CHAR_AT (envs[i].output_paragraph_offset - 1)))
+      envs[i].output_paragraph_offset--;
 
     if (i == current_env_no)
       output_paragraph_offset = envs[i].output_paragraph_offset;
@@ -467,15 +474,16 @@ output_multitable_row (void)
           break;
         out_char (CHAR_AT (j));
       }
-      offset[i] += j + 1;       /* skip last text plus skip the newline */
-      
       /* Do not output trailing blanks if we're in the last column and
          there will be no trailing |.  */
       if (i < last_column && !vsep)
-        for (; j <= envs[i].fill_column; j++)
+        for (s = mbsnwidth ((char *)&CHAR_AT (0), j, 0);
+	     s <= envs[i].fill_column; s++)
           out_char (' ');
       if (vsep)
         out_char ('|'); /* draw column separator */
+
+      offset[i] += j + 1;       /* skip last text plus skip the newline */
     }
     out_char ('\n');    /* end of line */
     had_newline = 1;
diff --git a/Build/source/utils/texinfo/makeinfo/multi.h b/Build/source/utils/texinfo/makeinfo/multi.h
index 64311e0f2be..391c05db801 100644
--- a/Build/source/utils/texinfo/makeinfo/multi.h
+++ b/Build/source/utils/texinfo/makeinfo/multi.h
@@ -1,12 +1,12 @@
 /* multi.h -- declarations for multi.c.
-   $Id: multi.h,v 1.1 2004/04/11 17:56:47 karl Exp $
+   $Id: multi.h,v 1.4 2007/07/01 21:20:33 karl Exp $
 
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef MULTI_H
 #define MULTI_H
diff --git a/Build/source/utils/texinfo/makeinfo/node.c b/Build/source/utils/texinfo/makeinfo/node.c
index 07a37fede2f..5a35c16c817 100644
--- a/Build/source/utils/texinfo/makeinfo/node.c
+++ b/Build/source/utils/texinfo/makeinfo/node.c
@@ -1,13 +1,13 @@
 /* node.c -- nodes for Texinfo.
-   $Id: node.c,v 1.27 2004/12/20 23:56:07 karl Exp $
+   $Id: node.c,v 1.40 2007/12/03 01:38:43 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "cmds.h"
@@ -137,7 +136,7 @@ write_tag_table_indirect (void)
 static void
 normalize_node_name (char *string)
 {
-  if (strcasecmp (string, "Top") == 0)
+  if (mbscasecmp (string, "Top") == 0)
     strcpy (string, "Top");
 }
 
@@ -403,7 +402,7 @@ isolate_nodename (char *nodename)
       if (c == '\t' ||
           c == '\n' ||
           c == ','  ||
-          ((paren_seen && nodename[i - 1] == ')') &&
+          ((paren_seen && i > 0 && nodename[i - 1] == ')') &&
            (c == ' ' || c == '.')) ||
           (c == '.' &&
            ((!nodename[i + 1] ||
@@ -582,7 +581,7 @@ cm_node (void)
   if (html && splitting
       /* If there is a Top node, it always goes into index.html.  So
 	 don't start a new HTML file for Top.  */
-      && (top_node_seen || strcasecmp (node, "Top") != 0))
+      && (top_node_seen || mbscasecmp (node, "Top") != 0))
     {
       /* We test *node here so that @node without a valid name won't
 	 start a new file name with a bogus name such as ".html".
@@ -657,7 +656,6 @@ cm_node (void)
   no_indent = 1;
   if (xml)
     {
-      xml_begin_document (current_output_filename);
       xml_begin_node ();
       if (!docbook)
 	{
@@ -760,7 +758,8 @@ cm_node (void)
                         search_forward ("\n* ", input_text_offset);
 
                       if (input_text_offset != -1)
-                        nodename_from_menu = glean_node_from_menu (0, 0);
+                        nodename_from_menu = glean_node_from_menu (0, 
+						     (enum reftype) 0);
 
                       if (nodename_from_menu)
                         {
@@ -844,7 +843,7 @@ cm_node (void)
                   prev = xstrdup (ref->next->node);
                 }
               else if (!ref->next
-                       && strcasecmp (ref->containing_node, "Top") == 0)
+                       && mbscasecmp (ref->containing_node, "Top") == 0)
                 {
                   free (prev);
                   prev = xstrdup (ref->containing_node);
@@ -912,8 +911,8 @@ cm_node (void)
 	  if (!tag)
 	    {
 	      output_stream = fopen (filename, "w");
-	      html_output_head_p = 0; /* so that we generate HTML preamble */
-	      html_output_head ();
+	      output_head_p = 0; /* so that we generate HTML preamble */
+	      output_head ();
 	    }
 	  else if ((tag->flags & TAG_FLAG_ANCHOR) != 0)
 	    {
@@ -930,8 +929,8 @@ cm_node (void)
 	      free (tag->html_fname);
 	      tag->html_fname = NULL;
 	      output_stream = fopen (filename, "w");
-	      html_output_head_p = 0; /* so that we generate HTML preamble */
-	      html_output_head ();
+	      output_head_p = 0; /* so that we generate HTML preamble */
+	      output_head ();
 	    }
 	  else
 	    {
@@ -950,7 +949,7 @@ cm_node (void)
 				output_stream) == NULL
 		      /* Paranoia: did someone change the way HTML
 			 files are finished up?  */
-		      || strcasecmp (end_line, html_end) != 0)
+		      || mbscasecmp (end_line, html_end) != 0)
 		    {
 		      line_error (_("Unexpected string at end of split-HTML file `%s'"),
 				  fname_for_this_node);
@@ -988,7 +987,7 @@ cm_node (void)
           if (next)
             {
               tem = expansion (next, 0);
-	      add_word ((char *) _("Next:"));
+	      add_word ((char *) gdt("Next:"));
               add_word ("&nbsp;");
               
 	      add_word ("<a rel=\"next\" accesskey=\"n\" href=\"");
@@ -1004,7 +1003,7 @@ cm_node (void)
           if (prev)
             {
               tem = expansion (prev, 0);
-	      add_word ((char *) _("Previous:"));
+	      add_word ((char *) gdt("Previous:"));
               add_word ("&nbsp;");
 	      add_word ("<a rel=\"previous\" accesskey=\"p\" href=\"");
 	      add_anchor_name (tem, 1);
@@ -1018,7 +1017,7 @@ cm_node (void)
           if (up)
             {
               tem = expansion (up, 0);
-	      add_word ((char *) _("Up:"));
+	      add_word ((char *) gdt("Up:"));
               add_word ("&nbsp;");
 	      add_word ("<a rel=\"up\" accesskey=\"u\" href=\"");
 	      add_anchor_name (tem, 1);
@@ -1102,7 +1101,17 @@ cm_anchor (int arg)
   char *fname_for_anchor = NULL;
 
   if (arg == END)
-    return;
+    {
+      /* We want to ignore whitespace following @anchor a la
+         texinfo.tex, but we're sitting at the }.  So advance past it,
+         ignore the whitespace, and then go back one character.  When we
+         return, reader_loop will increment input_text_offset again (see
+         the '}' case).  Sorry.  */
+      input_text_offset++;
+      skip_whitespace_and_newlines ();
+      input_text_offset--;
+      return;
+    }
 
   /* Parse the anchor text.  */
   anchor = get_xref_token (1);
@@ -1118,7 +1127,7 @@ cm_anchor (int arg)
       if (!paragraph_is_open)
 	{
 	  if (!executing_string && html)
-	    html_output_head ();
+	    output_head ();
 	  start_paragraph ();
 	  if (!in_fixed_width_font || in_menu || in_detailmenu)
 	    {
@@ -1219,11 +1228,14 @@ cm_anchor (int arg)
 	    }
 	}
     }
-  else if (xml)
+  else if (xml || docbook)
     {
-      xml_insert_element_with_attribute (ANCHOR, START, "name=\"%s\"", anchor);
+      xml_insert_element_with_attribute (ANCHOR, START,
+					 docbook ? "id=\"%s\"" : "name=\"%s\"",
+					 anchor);
       xml_insert_element (ANCHOR, END);
     }
+
   /* Save it in the tag table.  */
   remember_node (anchor, NULL, NULL, NULL,
                  output_position + output_paragraph_offset,
@@ -1360,9 +1372,9 @@ reftype_type_string (enum reftype type)
   switch (type)
     {
     case menu_reference:
-      return _("Menu");
+      return gdt("Menu");
     case followed_reference:
-      return _("Cross");
+      return gdt("Cross");
     default:
       return "Internal-bad-reference-type";
     }
@@ -1421,7 +1433,7 @@ validate_file (TAG_ENTRY *tag_table)
       /* If this node has a Next, then make sure that the Next exists. */
       if (tags->next)
         {
-          validate (tags->next, tags->line_no, _("Next"));
+          validate (tags->next, tags->line_no, gdt("Next"));
 
           /* If the Next node exists, and there is no Up, then make sure
              that the Prev of the Next points back.  But do nothing if
@@ -1459,7 +1471,7 @@ validate_file (TAG_ENTRY *tag_table)
          field at this stage. */
       if (!(tags->flags & TAG_FLAG_PREV_ERROR) && tags->prev)
         {
-          int valid_p = validate (tags->prev, tags->line_no, _("Prev"));
+          int valid_p = validate (tags->prev, tags->line_no, gdt("Prev"));
 
           if (!valid_p)
             tags->flags |= TAG_FLAG_PREV_ERROR;
@@ -1517,11 +1529,11 @@ validate_file (TAG_ENTRY *tag_table)
 
       if (!tags->up
           && !(tags->flags & TAG_FLAG_ANCHOR)
-          && strcasecmp (tags->node, "Top") != 0)
+          && mbscasecmp (tags->node, "Top") != 0)
         line_error (_("`%s' has no Up field (perhaps incorrect sectioning?)"), tags->node);
       else if (tags->up)
         {
-          int valid_p = validate (tags->up, tags->line_no, _("Up"));
+          int valid_p = validate (tags->up, tags->line_no, gdt("Up"));
 
           /* If node X has Up: Y, then warn if Y fails to have a menu item
              or note pointing at X, if Y isn't of the form "(Y)". */
@@ -1609,17 +1621,6 @@ validate_file (TAG_ENTRY *tag_table)
           continue;
         }
 
-      /* Special hack.  If the node in question appears to have
-         been referenced more than REFERENCE_WARNING_LIMIT times,
-         give a warning. */
-      if (tags->touched > reference_warning_limit)
-        {
-          input_filename = tags->filename;
-          line_number = tags->line_no;
-          warning (_("node `%s' has been referenced %d times"),
-                   tags->node, tags->touched);
-        }
-
       if (tags->touched == 0)
         {
           input_filename = tags->filename;
@@ -1628,7 +1629,7 @@ validate_file (TAG_ENTRY *tag_table)
           /* Notice that the node "Top" is special, and doesn't have to
              be referenced.   Anchors don't have to be referenced
              either, you might define them for another document.  */
-          if (strcasecmp (tags->node, "Top") != 0
+          if (mbscasecmp (tags->node, "Top") != 0
               && !(tags->flags & TAG_FLAG_ANCHOR))
             warning (_("unreferenced node `%s'"), tags->node);
         }
diff --git a/Build/source/utils/texinfo/makeinfo/node.h b/Build/source/utils/texinfo/makeinfo/node.h
index 766c503456e..6f7fc39c964 100644
--- a/Build/source/utils/texinfo/makeinfo/node.h
+++ b/Build/source/utils/texinfo/makeinfo/node.h
@@ -1,12 +1,13 @@
 /* node.h -- declarations for Node.
-   $Id: node.h,v 1.2 2004/04/11 17:56:47 karl Exp $
+   $Id: node.h,v 1.5 2007/07/01 21:20:33 karl Exp $
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2002, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
diff --git a/Build/source/utils/texinfo/makeinfo/sectioning.c b/Build/source/utils/texinfo/makeinfo/sectioning.c
index ce32aeb3a7e..da26ebb2481 100644
--- a/Build/source/utils/texinfo/makeinfo/sectioning.c
+++ b/Build/source/utils/texinfo/makeinfo/sectioning.c
@@ -1,12 +1,13 @@
 /* sectioning.c -- for @chapter, @section, ..., @contents ...
-   $Id: sectioning.c,v 1.25 2004/07/05 22:23:23 karl Exp $
+   $Id: sectioning.c,v 1.29 2007/07/01 21:20:33 karl Exp $
 
-   Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
 
@@ -491,7 +491,7 @@ insert_and_underscore (int level, char *cmd)
      insert it into the TOC.  */
   ending_pos = output_paragraph + output_paragraph_offset;
   if (section_alist[index].toc == TOC_YES)
-    toc_add_entry (substring (starting_pos, ending_pos - 1),
+    toc_add_entry (substring ((char *)starting_pos, (char *)ending_pos - 1),
                    level, current_node, NULL);
 
   free (temp);
@@ -534,8 +534,9 @@ sectioning_html (int level, char *cmd)
 
       starting_pos = output_paragraph + output_paragraph_offset;
       add_word_args ("%sTOC%d\">", a_name, toc_ref_count++);
-      toc_anchor = substring (starting_pos + sizeof (a_name) - 1,
-                              output_paragraph + output_paragraph_offset);
+      toc_anchor = substring ((char *)starting_pos + sizeof (a_name) - 1,
+                              (char *)output_paragraph
+			      + output_paragraph_offset);
       /* This must be added after toc_anchor is extracted, since
          toc_anchor cannot include the closing </a>.  For details,
          see toc.c:toc_add_entry and toc.c:contents_update_html.
@@ -585,7 +586,7 @@ sectioning_html (int level, char *cmd)
   /* Pluck ``X.Y SECTION-NAME'' from the output buffer and insert it
      into the TOC.  */
   if (section_alist[index].toc == TOC_YES)
-    toc_add_entry (substring (starting_pos, ending_pos),
+    toc_add_entry (substring ((char *)starting_pos, (char *)ending_pos),
                    level, current_node, toc_anchor);
 
   free (temp);
diff --git a/Build/source/utils/texinfo/makeinfo/sectioning.h b/Build/source/utils/texinfo/makeinfo/sectioning.h
index 8c3f2201654..30b4451ab0e 100644
--- a/Build/source/utils/texinfo/makeinfo/sectioning.h
+++ b/Build/source/utils/texinfo/makeinfo/sectioning.h
@@ -1,12 +1,12 @@
 /* sectioning.h -- all related stuff @chapter, @section... @contents
-   $Id: sectioning.h,v 1.5 2004/04/11 17:56:47 karl Exp $
+   $Id: sectioning.h,v 1.8 2007/07/01 21:20:33 karl Exp $
 
-   Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
 
diff --git a/Build/source/utils/texinfo/makeinfo/tests/Makefile.am b/Build/source/utils/texinfo/makeinfo/tests/Makefile.am
index 6e58451b060..353a822ae01 100644
--- a/Build/source/utils/texinfo/makeinfo/tests/Makefile.am
+++ b/Build/source/utils/texinfo/makeinfo/tests/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.5 2004/04/11 17:56:47 karl Exp $
+# $Id: Makefile.am,v 1.7 2006/07/10 23:07:12 karl Exp $
 # Makefile.am for texinfo/tests/makeinfo.
 #
 # This file is free software; as a special exception the author gives
@@ -13,12 +13,14 @@ TESTS = accent accentenc \
   cond \
   copying \
   defxcond \
+  emph-option \
   html-docdesc html-extrali html-min html-manuals html-para html-title \
   html-top \
   include-value \
   macro-at menu-whitespace \
   no-headers \
   node-expand node-value node-whitespace \
+  quote-args \
   top \
   twofiles
 
@@ -28,9 +30,11 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
   accent.txi accentenc.txi accent-text.txi \
   cond.txi copying.txi \
   defxcond.txi \
+  emph-option.txi \
   html-docdesc.txi html-extrali.txi html-min.txi html-para.txi html-title.txi \
   html-top.txi \
   include-value.txi incl-incl.txi \
   macro-at.txi menu-whitespace.txi \
   node-expand.txi node-value.txi node-whitespace.txi \
+  quote-args.txi \
   top.txi # top2.txi
diff --git a/Build/source/utils/texinfo/makeinfo/tests/Makefile.in b/Build/source/utils/texinfo/makeinfo/tests/Makefile.in
index 828a02b557f..1d210b4ee91 100644
--- a/Build/source/utils/texinfo/makeinfo/tests/Makefile.in
+++ b/Build/source/utils/texinfo/makeinfo/tests/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am,v 1.5 2004/04/11 17:56:47 karl Exp $
+# $Id: Makefile.am,v 1.7 2006/07/10 23:07:12 karl Exp $
 # Makefile.am for texinfo/tests/makeinfo.
 #
 # This file is free software; as a special exception the author gives
@@ -25,15 +25,11 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -50,26 +46,66 @@ host_triplet = @host@
 subdir = makeinfo/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
-	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \
-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mkstemp.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/onceonly_2_57.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
+	$(top_srcdir)/gnulib/m4/argz.m4 \
+	$(top_srcdir)/gnulib/m4/codeset.m4 \
+	$(top_srcdir)/gnulib/m4/eealloc.m4 \
+	$(top_srcdir)/gnulib/m4/environ.m4 \
+	$(top_srcdir)/gnulib/m4/error.m4 \
+	$(top_srcdir)/gnulib/m4/exitfail.m4 \
+	$(top_srcdir)/gnulib/m4/extensions.m4 \
+	$(top_srcdir)/gnulib/m4/getopt.m4 \
+	$(top_srcdir)/gnulib/m4/gettext.m4 \
+	$(top_srcdir)/gnulib/m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib/m4/glibc21.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib/m4/iconv.m4 \
+	$(top_srcdir)/gnulib/m4/include_next.m4 \
+	$(top_srcdir)/gnulib/m4/inline.m4 \
+	$(top_srcdir)/gnulib/m4/intlmacosx.m4 \
+	$(top_srcdir)/gnulib/m4/lib-ld.m4 \
+	$(top_srcdir)/gnulib/m4/lib-link.m4 \
+	$(top_srcdir)/gnulib/m4/lib-prefix.m4 \
+	$(top_srcdir)/gnulib/m4/localcharset.m4 \
+	$(top_srcdir)/gnulib/m4/longlong.m4 \
+	$(top_srcdir)/gnulib/m4/malloc.m4 \
+	$(top_srcdir)/gnulib/m4/malloca.m4 \
+	$(top_srcdir)/gnulib/m4/mbchar.m4 \
+	$(top_srcdir)/gnulib/m4/mbiter.m4 \
+	$(top_srcdir)/gnulib/m4/mbrtowc.m4 \
+	$(top_srcdir)/gnulib/m4/mbscasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbsncasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbstate_t.m4 \
+	$(top_srcdir)/gnulib/m4/mbswidth.m4 \
+	$(top_srcdir)/gnulib/m4/memchr.m4 \
+	$(top_srcdir)/gnulib/m4/memcpy.m4 \
+	$(top_srcdir)/gnulib/m4/memmove.m4 \
+	$(top_srcdir)/gnulib/m4/mkstemp.m4 \
+	$(top_srcdir)/gnulib/m4/nls.m4 \
+	$(top_srcdir)/gnulib/m4/onceonly.m4 \
+	$(top_srcdir)/gnulib/m4/po.m4 \
+	$(top_srcdir)/gnulib/m4/progtest.m4 \
+	$(top_srcdir)/gnulib/m4/setenv.m4 \
+	$(top_srcdir)/gnulib/m4/stdbool.m4 \
+	$(top_srcdir)/gnulib/m4/stdint.m4 \
+	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
+	$(top_srcdir)/gnulib/m4/strdup.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
+	$(top_srcdir)/gnulib/m4/string_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_time_h.m4 \
+	$(top_srcdir)/gnulib/m4/tempname.m4 \
+	$(top_srcdir)/gnulib/m4/unistd_h.m4 \
+	$(top_srcdir)/gnulib/m4/wchar.m4 \
+	$(top_srcdir)/gnulib/m4/wchar_t.m4 \
+	$(top_srcdir)/gnulib/m4/wctype.m4 \
+	$(top_srcdir)/gnulib/m4/wcwidth.m4 \
+	$(top_srcdir)/gnulib/m4/wint_t.m4 \
+	$(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SCRIPTS = $(noinst_SCRIPTS)
@@ -78,22 +114,24 @@ DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+ARGZ_H = @ARGZ_H@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -101,41 +139,155 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
+GETOPT_H = @GETOPT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_IO_H = @HAVE_IO_H@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRNDUP = @HAVE_STRNDUP@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRSEP = @HAVE_STRSEP@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNSETENV = @HAVE_UNSETENV@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
+HEVEA = @HEVEA@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@
-INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -145,20 +297,50 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
 RANLIB = @RANLIB@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDINT_H = @STDINT_H@
 STRIP = @STRIP@
+SYS_STAT_H = @SYS_STAT_H@
+SYS_TIME_H = @SYS_TIME_H@
 TERMLIBS = @TERMLIBS@
-TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@
-TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+TEX = @TEX@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VOID_UNSETENV = @VOID_UNSETENV@
+WCHAR_H = @WCHAR_H@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WCTYPE_H = @WCTYPE_H@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -170,11 +352,16 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -198,18 +385,24 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 TESTS = accent accentenc \
   cond \
   copying \
   defxcond \
+  emph-option \
   html-docdesc html-extrali html-min html-manuals html-para html-title \
   html-top \
   include-value \
   macro-at menu-whitespace \
   no-headers \
   node-expand node-value node-whitespace \
+  quote-args \
   top \
   twofiles
 
@@ -218,11 +411,13 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
   accent.txi accentenc.txi accent-text.txi \
   cond.txi copying.txi \
   defxcond.txi \
+  emph-option.txi \
   html-docdesc.txi html-extrali.txi html-min.txi html-para.txi html-title.txi \
   html-top.txi \
   include-value.txi incl-incl.txi \
   macro-at.txi menu-whitespace.txi \
   node-expand.txi node-value.txi node-whitespace.txi \
+  quote-args.txi \
   top.txi # top2.txi
 
 all: all-am
@@ -257,7 +452,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -266,9 +460,9 @@ CTAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -277,7 +471,7 @@ check-TESTS: $(TESTS)
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -289,7 +483,7 @@ check-TESTS: $(TESTS)
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -339,22 +533,21 @@ check-TESTS: $(TESTS)
 	else :; fi
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -414,12 +607,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -438,16 +639,20 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am html html-am \
 	info info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am
+	uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/utils/texinfo/makeinfo/tests/cond b/Build/source/utils/texinfo/makeinfo/tests/cond
index 24a1cd4cb3a..41f5920db7a 100755
--- a/Build/source/utils/texinfo/makeinfo/tests/cond
+++ b/Build/source/utils/texinfo/makeinfo/tests/cond
@@ -8,19 +8,19 @@ unset TEXINFO_OUTPUT
 ../makeinfo -o cond.out $srcdir/cond.txi || exit 1
 egrep 'This is (ifnothtml|ifinfo|ifnottex) text' cond.out >/dev/null \
   || exit 2
-test `fgrep ' text.' cond.out | wc -l` -eq 3 || exit 3
+test `fgrep -c ' text.' cond.out` -eq 3 || exit 3
 
 # Default HTML output.
 ../makeinfo --no-split --html -o cond.out $srcdir/cond.txi || exit 1
 egrep 'This is (html|ifhtml|ifnotinfo|ifnottex) text' cond.out >/dev/null \
  || exit 2
-test `fgrep ' text.' cond.out | wc -l` -eq 4 || exit 3
+test `fgrep -c ' text.' cond.out` -eq 4 || exit 3
 
 # --ifhtml off, --ifinfo off, --iftex off.
 ../makeinfo --no-ifhtml --no-ifinfo --no-iftex -o cond.out $srcdir/cond.txi || exit 1
 egrep 'This is ifnot(html|info|tex) text' cond.out >/dev/null \
  || exit 2
-test `fgrep ' text.' cond.out | wc -l` -eq 3 || exit 3
+test `fgrep -c ' text.' cond.out` -eq 3 || exit 3
 
 # Do we really need to test all the other permutations?
 
@@ -28,6 +28,6 @@ test `fgrep ' text.' cond.out | wc -l` -eq 3 || exit 3
 ../makeinfo --ifhtml --ifinfo --iftex -o cond.out $srcdir/cond.txi || exit 1
 egrep 'This is (html|ifhtml|ifinfo|tex|iftex) text' cond.out >/dev/null \
  || exit 2
-test `fgrep ' text.' cond.out | wc -l` -eq 5 || exit 3
+test `fgrep -c ' text.' cond.out` -eq 5 || exit 3
 
 rm -f cond.out cond.info
diff --git a/Build/source/utils/texinfo/makeinfo/tests/copying b/Build/source/utils/texinfo/makeinfo/tests/copying
index 4fa77d607de..4a033f0e56e 100755
--- a/Build/source/utils/texinfo/makeinfo/tests/copying
+++ b/Build/source/utils/texinfo/makeinfo/tests/copying
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: copying,v 1.2 2004/04/20 13:26:00 karl Exp $
+# $Id: copying,v 1.4 2007/07/01 18:38:52 karl Exp $
 # Test @copying.  The configure script for tramp uses this to make sure
 # the makeinfo that is present supports @copying.
 
diff --git a/Build/source/utils/texinfo/makeinfo/tests/copying.txi b/Build/source/utils/texinfo/makeinfo/tests/copying.txi
index 3b836795050..4981170b72b 100644
--- a/Build/source/utils/texinfo/makeinfo/tests/copying.txi
+++ b/Build/source/utils/texinfo/makeinfo/tests/copying.txi
@@ -1,4 +1,8 @@
 \input texinfo   @c -*-texinfo-*-
 @copying
+Public domain.
 @end copying
+
+@insertcopying
+
 @bye
diff --git a/Build/source/utils/texinfo/makeinfo/tests/emph-option b/Build/source/utils/texinfo/makeinfo/tests/emph-option
new file mode 100755
index 00000000000..2dfb1506fcd
--- /dev/null
+++ b/Build/source/utils/texinfo/makeinfo/tests/emph-option
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Test @option inside @emph. 
+
+unset TEXINFO_OUTPUT
+: ${srcdir=.}
+
+../makeinfo --no-split --html -o emph-option.out $srcdir/emph-option.txi || exit 1
+fgrep '<em>emphasized and referring to <samp></em>' emph-option.out && exit 3
+
+rm -f emph-option.out
diff --git a/Build/source/utils/texinfo/makeinfo/tests/emph-option.txi b/Build/source/utils/texinfo/makeinfo/tests/emph-option.txi
new file mode 100644
index 00000000000..601c9f3676b
--- /dev/null
+++ b/Build/source/utils/texinfo/makeinfo/tests/emph-option.txi
@@ -0,0 +1,8 @@
+\input texinfo
+@setfilename cond.info
+
+@node Top
+
+Foo @emph{emphasized and referring to @option{--some} option}.
+
+@bye
diff --git a/Build/source/utils/texinfo/makeinfo/tests/html-extrali b/Build/source/utils/texinfo/makeinfo/tests/html-extrali
index c3ec9ca08d5..7d0e5f9c5f8 100755
--- a/Build/source/utils/texinfo/makeinfo/tests/html-extrali
+++ b/Build/source/utils/texinfo/makeinfo/tests/html-extrali
@@ -4,8 +4,7 @@
 : ${srcdir=.}
 
 li_count=`../makeinfo --no-split --html -o - $srcdir/html-extrali.txi 2>/dev/null \
-| grep '<li>' \
-| wc -l`
+| grep -c '<li>'`
 
 if test "$li_count" -ne 1; then
   echo "$li_count <li>s instead of one." >&2
diff --git a/Build/source/utils/texinfo/makeinfo/tests/include-value b/Build/source/utils/texinfo/makeinfo/tests/include-value
index 2c4ca60eff5..3cef57723b0 100755
--- a/Build/source/utils/texinfo/makeinfo/tests/include-value
+++ b/Build/source/utils/texinfo/makeinfo/tests/include-value
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: include-value,v 1.3 2004/04/11 17:56:47 karl Exp $
+# $Id: include-value,v 1.4 2005/04/05 21:04:16 karl Exp $
 # Test @value expansion in @include and @verbatiminclude names.
 
 unset TEXINFO_OUTPUT
@@ -11,10 +11,10 @@ exit_status=$?
 if test $exit_status = 0; then
   # should have three instances of _included_,
   # and three of {included}.
-  count=`grep _included_ include-value.info | wc -l`
+  count=`grep -c _included_ include-value.info`
   test $count = 3 || exit_status=`expr $exit_status + 1`
 
-  count=`grep '{included}' include-value.info | wc -l`
+  count=`grep -c '{included}' include-value.info`
   test $count = 3 || exit_status=`expr $exit_status + 1`
 fi
 
diff --git a/Build/source/utils/texinfo/makeinfo/tests/no-headers b/Build/source/utils/texinfo/makeinfo/tests/no-headers
index e0718713f32..6b961846f38 100755
--- a/Build/source/utils/texinfo/makeinfo/tests/no-headers
+++ b/Build/source/utils/texinfo/makeinfo/tests/no-headers
@@ -2,8 +2,11 @@
 # Test that info.texi works with --no-headers (this includes node
 # pointer defaulting).
 
+# maybe need "nul" sometimes?  Not clear.
+: ${nulldev=/dev/null}
+
 unset TEXINFO_OUTPUT
 : ${srcdir=.}
 docdir=$srcdir/../../doc
 
-../makeinfo --no-headers -o /dev/null -I$docdir info.texi
+../makeinfo --no-headers -o $nulldev -I$docdir info.texi
diff --git a/Build/source/utils/texinfo/makeinfo/tests/quote-args b/Build/source/utils/texinfo/makeinfo/tests/quote-args
new file mode 100755
index 00000000000..6940c0cd39a
--- /dev/null
+++ b/Build/source/utils/texinfo/makeinfo/tests/quote-args
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Test @quote-args facility.
+
+: ${srcdir=.}
+
+unset TEXINFO_OUTPUT
+TMP=quote-args.out
+
+cat > quote-args.samp <<EOT
+*FIXME: Many arguments, separated by commas, are processed here*
+natopocotuototam
+
+EOT
+
+../makeinfo --plaintex $srcdir/quote-args.txi | diff - quote-args.samp
+exit_code=$?
+
+rm quote-args.samp
+exit $exit_code
diff --git a/Build/source/utils/texinfo/makeinfo/tests/quote-args.txi b/Build/source/utils/texinfo/makeinfo/tests/quote-args.txi
new file mode 100644
index 00000000000..4f78d1d9d44
--- /dev/null
+++ b/Build/source/utils/texinfo/makeinfo/tests/quote-args.txi
@@ -0,0 +1,20 @@
+\input texinfo 
+@smallbook
+@setfilename quote-args.info
+@settitle Quote-args facility in macros
+
+@rmacro cat{a,b}
+\a\\b\
+@end rmacro
+
+@macro FIXME{a}
+@strong{FIXME: \a\}
+@end macro
+
+@node Top, , (dir), (dir)
+
+@noindent
+@FIXME{Many arguments, separated by commas, are processed here}
+@cat{@cat{@cat{@cat{@cat{@cat{na, to}, po}, co}, tu}, oto},tam}
+@bye
+
diff --git a/Build/source/utils/texinfo/makeinfo/toc.c b/Build/source/utils/texinfo/makeinfo/toc.c
index fa3d8e07382..7e93a6f4721 100644
--- a/Build/source/utils/texinfo/makeinfo/toc.c
+++ b/Build/source/utils/texinfo/makeinfo/toc.c
@@ -1,12 +1,13 @@
 /* toc.c -- table of contents handling.
-   $Id: toc.c,v 1.6 2004/04/11 17:56:47 karl Exp $
+   $Id: toc.c,v 1.11 2007/09/15 23:48:46 karl Exp $
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
 
@@ -194,7 +194,7 @@ contents_update_html (void)
       /* no, so return to sender ;-) */
       return;
 
-  add_html_block_elt_args ("\n<div class=\"contents\">\n<h2>%s</h2>\n<ul>\n", _("Table of Contents"));
+  add_html_block_elt_args ("\n<div class=\"contents\">\n<h2>%s</h2>\n<ul>\n", gdt("Table of Contents"));
 
   last_level = toc_entry_alist[0]->level;
 
@@ -268,9 +268,9 @@ contents_update_info (void)
   if (!toc_counter)
       return;
 
-  insert_string ((char *) _("Table of Contents"));
+  insert_string ((char *) gdt("Table of Contents"));
   insert ('\n');
-  for (i = 0; i < strlen (_("Table of Contents")); i++)
+  for (i = 0; i < strlen (gdt("Table of Contents")); i++)
     insert ('*');
   insert_string ("\n\n");
 
@@ -301,7 +301,7 @@ shortcontents_update_html (char *contents_filename)
   if (!toc_counter)
     return;
 
-  add_html_block_elt_args ("\n<div class=\"shortcontents\">\n<h2>%s</h2>\n<ul>\n", _("Short Contents"));
+  add_html_block_elt_args ("\n<div class=\"shortcontents\">\n<h2>%s</h2>\n<ul>\n", gdt("Short Contents"));
 
   if (contents_filename)
     toc_file = filename_part (contents_filename);
@@ -334,9 +334,9 @@ shortcontents_update_info (void)
   if (!toc_counter)
       return;
 
-  insert_string ((char *) _("Short Contents"));
+  insert_string ((char *) gdt("Short Contents"));
   insert ('\n');
-  for (i = 0; i < strlen (_("Short Contents")); i++)
+  for (i = 0; i < strlen (gdt("Short Contents")); i++)
     insert ('*');
   insert_string ("\n\n");
 
diff --git a/Build/source/utils/texinfo/makeinfo/toc.h b/Build/source/utils/texinfo/makeinfo/toc.h
index 854f6fc7ddc..788420c1d10 100644
--- a/Build/source/utils/texinfo/makeinfo/toc.h
+++ b/Build/source/utils/texinfo/makeinfo/toc.h
@@ -1,12 +1,12 @@
 /* toc.h -- table of contents handling.
-   $Id: toc.h,v 1.2 2004/04/11 17:56:47 karl Exp $
+   $Id: toc.h,v 1.5 2007/07/01 21:20:33 karl Exp $
 
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
 
diff --git a/Build/source/utils/texinfo/makeinfo/xml.c b/Build/source/utils/texinfo/makeinfo/xml.c
index cdbec1fc525..88c452a2c65 100644
--- a/Build/source/utils/texinfo/makeinfo/xml.c
+++ b/Build/source/utils/texinfo/makeinfo/xml.c
@@ -1,12 +1,13 @@
-/* xml.c -- xml output.
-   $Id: xml.c,v 1.52 2004/12/19 17:02:23 karl Exp $
+/* xml.c -- xml output, both TexinfoML and Docbook.
+   $Id: xml.c,v 1.75 2008/01/31 18:33:27 karl Exp $
 
-   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Philippe Martin <feloy@free.fr>.  */
 
@@ -30,8 +30,12 @@
 
 #include "xml.h"
 
-/* Options */
-int xml_index_divisions = 1;
+#include <assert.h>
+
+#if !__OPTIMIZE__
+/* To make enum names available to debugger. */
+static enum xml_element xml_element_dummy;
+#endif
 
 typedef struct _element
 {
@@ -161,6 +165,9 @@ element texinfoml_element_list [] = {
 
   { "dmn",                 0, 1, 0 },
 
+  { "clicksequence",       0, 1, 0 },
+  { "click",               0, 1, 0 },
+
   { "xref",                0, 1, 0 },
   { "xrefnodename",        0, 1, 0 },
   { "xrefinfoname",        0, 1, 0 },
@@ -249,6 +256,7 @@ element texinfoml_element_list [] = {
   { "defclass",            0, 0, 0 },
   { "defclassvar",         0, 0, 0 },
   { "defoperation",        0, 0, 0 },
+  { "frenchspacing",       0, 0, 0 },
 
   { "para",                0, 0, 0 } /* Must be last */
   /* name / contains para / contained in para / preserve space */
@@ -329,6 +337,8 @@ element docbook_element_list [] = {
   { "wordasword",          0, 1, 0 }, /* I */
   { "emphasis",            0, 1, 0 }, /* B */
   { "",                    0, 1, 0 }, /* R */
+  { "",                    0, 1, 0 }, /* SLANTED */
+  { "",                    0, 1, 0 }, /* SANSSERIF */
 
   { "",                    0, 0, 0 }, /* EXDENT */
 
@@ -372,6 +382,9 @@ element docbook_element_list [] = {
 
   { "",                    0, 1, 0 }, /* DIMENSION */
 
+  { "",                    0, 1, 0 }, /* CLICKSEQUENCE */
+  { "",                    0, 1, 0 }, /* CLICK */
+
   { "xref",                0, 1, 0 }, /* XREF */
   { "link",                0, 1, 0 }, /* XREFNODENAME */
   { "",                    0, 1, 0 }, /* XREFINFONAME */
@@ -390,7 +403,7 @@ element docbook_element_list [] = {
   { "",                    0, 1, 0 }, /* UREFREPLACEMENT */
 
   { "ulink",               0, 1, 0 }, /* EMAIL */
-  { "",                    0, 1, 0 }, /* EMAILADDRESS */
+  { "email",               0, 1, 0 }, /* EMAILADDRESS */
   { "",                    0, 1, 0 }, /* EMAILNAME */
 
   { "",                    0, 0, 0 }, /* GROUP */
@@ -405,9 +418,9 @@ element docbook_element_list [] = {
   { "example",             1, 1, 0 },
   { "sidebar",             1, 0, 0 },
 
-  { "index",               0, 1, 0 }, /* PRINTINDEX */
+  { "index",               0, 0, 0 }, /* PRINTINDEX */
   { "",                    0, 1, 0 }, /* LISTOFFLOATS */
-  { "",                    0, 1, 0 }, /* ANCHOR */
+  { "anchor",              0, 1, 0 }, /* ANCHOR */
 
   { "",                    0, 0, 0 }, /* IMAGE */
   { "inlinemediaobject",   0, 1, 0 }, /* INLINEIMAGE */
@@ -446,13 +459,13 @@ element docbook_element_list [] = {
   { "",                    0, 0, 0 }, /* SETVALUE (xml) */
   { "",                    0, 0, 0 }, /* CLEARVALUE (xml) */
 
-  { "blockquote",          1, 0, 0 }, /* DEFINITION */
-  { "screen",              0, 0, 1 }, /* DEFINITIONTERM */
-  { "",                    0, 0, 0 }, /* DEFINITIONITEM (xml) */
+  { "informalfigure",      1, 0, 0 }, /* DEFINITION */
+  { "synopsis",            0, 0, 1 }, /* DEFINITIONTERM */
+  { "blockquote",          1, 0, 0 }, /* DEFINITIONITEM (xml) */
   { "",                    0, 0, 0 }, /* DEFCATEGORY (xml) */
   { "function",            0, 0, 0 }, /* DEFFUNCTION */
   { "varname",             0, 0, 0 }, /* DEFVARIABLE */
-  { "varname",             0, 0, 0 }, /* DEFPARAM */
+  { "replaceable",         0, 0, 0 }, /* DEFPARAM */
   { "",                    0, 0, 0 }, /* DEFDELIMITER (xml) */
   { "returnvalue",         0, 0, 0 }, /* DEFTYPE */
   { "type",                0, 0, 0 }, /* DEFPARAMTYPE */
@@ -460,6 +473,7 @@ element docbook_element_list [] = {
   { "classname",           0, 0, 0 }, /* DEFCLASS */
   { "property",            0, 0, 0 }, /* DEFCLASSVAR */
   { "methodname",          0, 0, 0 }, /* DEFOPERATION */
+  { "",                    0, 0, 0 }, /* FRENCHSPACING */
 
   { "para",                0, 0, 0 } /* Must be last */
   /* name / contains para / contained in para / preserve space */
@@ -525,6 +539,8 @@ int xml_no_indent = 0;
 
 int xml_no_para = 0;
 char *xml_node_id = NULL;
+
+/* Currently sorting the index. */
 int xml_sort_index = 0;
 
 int xml_in_xref_token = 0;
@@ -558,6 +574,15 @@ static int in_indexentry = 0;
 static int in_secondary = 0;
 static int in_indexterm = 0;
 
+/* Technically there are certain Unicode characters which cannot
+   appear.  Trying to implement the real rules would lead to deep
+   waters.  So essentially just pass along what we are given.  Some
+   references:
+   http://www.w3.org/TR/xml-id/ 
+   -> http://www.w3.org/TR/xml-names11/#NT-NCName
+   -> http://www.w3.org/TR/xml11/#NT-NameChar
+*/
+
 char *
 xml_id (char *id)
 {
@@ -565,17 +590,18 @@ xml_id (char *id)
   char *p = tem;
   strcpy (tem, id);
   while (*p)
-    { /* Check if a character is allowed in ID attributes.  This list differs
-         slightly from XML specs that it doesn't contain underscores.
-         See http://xml.coverpages.org/sgmlsyn/sgmlsyn.htm, ``9.3 Name''  */
-      if (!strchr ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-.", *p))
+    {
+      if (strchr (":\" \t\f\r\n", *p))
         *p = '-';
       p++;
     }
   p = tem;
-  /* First character can only be a letter.  */
-  if (!strchr ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", *p))
+
+  /* First character cannot be a number.  Clearly we should make this
+     dependent on the actual numeral found.  */
+  if (strchr ("0123456789", *p))
     *p = 'i';
+
   return tem;
 }
 
@@ -583,9 +609,9 @@ int
 xml_element (char *name)
 {
   int i;
-  for (i=0; i<=PARA; i++)
+  for (i = 0; i<=PARA; i++)
     {
-      if (strcasecmp (name, texinfoml_element_list[i].name) == 0)
+      if (mbscasecmp (name, texinfoml_element_list[i].name) == 0)
         return i;
     }
   printf ("Error xml_element\n");
@@ -593,7 +619,7 @@ xml_element (char *name)
 }
 
 void
-xml_begin_document (char *output_filename)
+xml_begin_document (const char *output_basename)
 {
   if (book_started)
     return;
@@ -635,17 +661,32 @@ xml_begin_document (char *output_filename)
       insert_string ("/texinfo.dtd\">");
       xml_element_list = texinfoml_element_list;
     }
+
+  if (strcmp (xml_element_list[PARA].name, "para"))
+    {
+      warning ("internal error: xml_element_list table inconsistent");
+      xexit (-1);
+    }
+
   if (language_code != last_language_code)
     {
       if (docbook)
-        xml_insert_element_with_attribute (TEXINFO, START, "lang=\"%s\"", language_table[language_code].abbrev);
+	/* The toplevel <book> element needs an id attribute if you want
+           to use the chunk.xml feature of the Docbook-XSL stylesheets.
+           Might as well use the output filename?  */
+        xml_insert_element_with_attribute (TEXINFO, START,
+                                           "id=\"%s\" lang=\"%s\"",
+                                         output_basename,
+                                         language_table[language_code].abbrev);
       else
-	xml_insert_element_with_attribute (TEXINFO, START, "xml:lang=\"%s\"", language_table[language_code].abbrev);
+	xml_insert_element_with_attribute (TEXINFO, START,
+                                           "xml:lang=\"%s\"",
+                                         language_table[language_code].abbrev);
     }
   if (!docbook)
     {
       xml_insert_element (SETFILENAME, START);
-      insert_string (output_filename);
+      insert_string (output_basename);
       xml_insert_element (SETFILENAME, END);
     }
 }
@@ -657,6 +698,7 @@ static int element_stack_index = 0;
 static int
 xml_current_element (void)
 {
+  assert (element_stack_index > 0);
   return element_stack[element_stack_index-1];
 }
 
@@ -664,10 +706,9 @@ static void
 xml_push_current_element (int elt)
 {
   element_stack[element_stack_index++] = elt;
-  if (element_stack_index > 200)
-    printf ("*** stack overflow (%d - %s) ***\n",
-            element_stack_index,
-            xml_element_list[elt].name);
+  if (element_stack_index > 200)  /* fixxme, no hard limits */
+    warning ("internal error: xml stack overflow (%d - %s)",
+             element_stack_index, xml_element_list[elt].name);
 }
 
 static void
@@ -675,9 +716,11 @@ xml_pop_current_element (void)
 {
   element_stack_index--;
   if (element_stack_index < 0)
-    printf ("*** stack underflow (%d - %d) ***\n",
-            element_stack_index,
-            xml_current_element());
+    {
+      warning ("internal error: xml stack underflow (index %d)",
+               element_stack_index);
+      element_stack_index = 0;
+    }
 }
 
 int
@@ -712,7 +755,8 @@ xml_start_para (void)
       || !xml_element_list[xml_current_element()].contains_para)
     return;
 
-  while (output_paragraph[output_paragraph_offset-1] == '\n')
+  while (output_paragraph_offset > 0
+	 && output_paragraph[output_paragraph_offset-1] == '\n')
     output_paragraph_offset--;
   xml_indent ();
 
@@ -730,7 +774,8 @@ xml_end_para (void)
   if (!xml_in_para || xml_in_footnote)
     return;
 
-  while (cr_or_whitespace(output_paragraph[output_paragraph_offset-1]))
+  while (output_paragraph_offset > 0
+	 && cr_or_whitespace(output_paragraph[output_paragraph_offset-1]))
     output_paragraph_offset--;
 
   insert_string ("</para>");
@@ -789,7 +834,7 @@ xml_insert_element_with_attribute (elt, arg, format, va_alist)
   /* Look at the replace_elements table to see if we have to change the element */
   if (xml_sort_index)
       return;
-  if (docbook)
+  if (docbook && element_stack_index > 0)
     {
       replace_element *element_list = replace_elements;
       while (element_list->element_to_replace >= 0)
@@ -884,6 +929,20 @@ xml_insert_element_with_attribute (elt, arg, format, va_alist)
   if (arg == END && xml_in_para && !xml_element_list[elt].contained_in_para)
     xml_end_para ();
 
+  /* Oddly, we want to do the same thing whether we starting or ending
+     the detailmenu -- close any existing menu elements before inserting
+     the detailmenu element.  */
+  if (elt == DETAILMENU && xml_in_menu_entry)
+    {
+      if (xml_in_menu_entry_comment)
+        {
+          xml_insert_element (MENUCOMMENT, END);
+          xml_in_menu_entry_comment = 0;
+        }
+      xml_insert_element (MENUENTRY, END);
+      xml_in_menu_entry = 0;
+    }
+    
   if (docbook && xml_table_level && !in_table_title
       && !xml_in_tableitem[xml_table_level] && !xml_in_item[xml_table_level]
       && arg == START && elt != TABLEITEM && elt != TABLETERM
@@ -905,13 +964,15 @@ xml_insert_element_with_attribute (elt, arg, format, va_alist)
   /* Eat one newline before </example> and the like.  */
   if (!docbook && arg == END
       && (xml_element_list[elt].keep_space || elt == GROUP)
+      && output_paragraph_offset > 0
       && output_paragraph[output_paragraph_offset-1] == '\n')
     output_paragraph_offset--;
 
   /* And eat whitespace before </entry> in @multitables.  */
   if (arg == END && elt == ENTRY)
-      while (cr_or_whitespace(output_paragraph[output_paragraph_offset-1]))
-    output_paragraph_offset--;
+      while (output_paragraph_offset > 0 &&
+	     cr_or_whitespace(output_paragraph[output_paragraph_offset-1]))
+        output_paragraph_offset--;
 
   /* Indent elements that can contain <para>.  */
   if (arg == END && !xml_in_para && !xml_keep_space
@@ -995,15 +1056,18 @@ xml_insert_entity (char *entity_name)
 {
   int saved_escape_html = escape_html;
 
-  if (!book_started)
-    return;
-  if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
-    return;
+  if (xml)
+    {
+    if (!book_started)
+      return;
+    if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
+      return;
 
-  if (!xml_in_para && !xml_no_para && !only_macro_expansion
-      && xml_element_list[xml_current_element ()].contains_para
-      && !in_fixed_width_font)
-    xml_start_para ();
+    if (!xml_in_para && !xml_no_para && !only_macro_expansion
+        && xml_element_list[xml_current_element ()].contains_para
+        && !in_fixed_width_font)
+      xml_start_para ();
+  }
 
   escape_html = 0;
   add_char ('&');
@@ -1035,7 +1099,7 @@ xml_begin_node (void)
       xml_insert_element (BOOKINFO, END);
       xml_in_bookinfo = 0;
     }
-  if (xml_node_open && ! docbook)
+  if (xml_node_open && !docbook)
     {
       if (xml_node_level != -1)
         {
@@ -1107,13 +1171,13 @@ xml_start_menu_entry (char *tem)
       if (xml_in_menu_entry_comment)
         {
           xml_insert_element (MENUCOMMENT, END);
-          xml_in_menu_entry_comment=0;
+          xml_in_menu_entry_comment = 0;
         }
       xml_insert_element (MENUENTRY, END);
-      xml_in_menu_entry=0;
+      xml_in_menu_entry = 0;
     }
   xml_insert_element (MENUENTRY, START);
-  xml_in_menu_entry=1;
+  xml_in_menu_entry = 1;
 
   xml_insert_element (MENUNODE, START);
   string = expansion (tem, 0);
@@ -1214,7 +1278,8 @@ xml_add_char (int character)
       xml_just_after_element = 0;
     }
 
-  if (xml_element_list[xml_current_element()].contains_para
+  if (element_stack_index > 0
+      && xml_element_list[xml_current_element()].contains_para
       && !xml_in_para && !only_macro_expansion && !xml_no_para
       && !cr_or_whitespace (character) && !in_fixed_width_font)
     xml_start_para ();
@@ -1249,6 +1314,8 @@ xml_add_char (int character)
       insert_string ("&amp;");
   else if (character == '<' && escape_html)
       insert_string ("&lt;");
+  else if (character == '>' && escape_html)
+      insert_string ("&gt;");
   else if (character == '\n' && !xml_keep_space)
     {
       if (!xml_in_para && xml_just_after_element && !multitable_active)
@@ -1304,20 +1371,20 @@ xml_insert_quotation (char *type, int arg)
     type = quotation_stack->type;
 
   /* Make use of special quotation styles of Docbook if we can.  */
-  if (docbook && strlen(type))
+  if (docbook && strlen (type))
     {
       /* Let's assume it started.  */
       quotation_started = 1;
 
-      if (strcasecmp (type, "tip") == 0)
+      if (mbscasecmp (type, "tip") == 0)
         xml_insert_element (TIP, arg);
-      else if (strcasecmp (type, "note") == 0)
+      else if (mbscasecmp (type, "note") == 0)
         xml_insert_element (NOTE, arg);
-      else if (strcasecmp (type, "important") == 0)
+      else if (mbscasecmp (type, "important") == 0)
         xml_insert_element (IMPORTANT, arg);
-      else if (strcasecmp (type, "warning") == 0)
+      else if (mbscasecmp (type, "warning") == 0)
         xml_insert_element (WARNING, arg);
-      else if (strcasecmp (type, "caution") == 0)
+      else if (mbscasecmp (type, "caution") == 0)
         xml_insert_element (CAUTION, arg);
       else
         /* Didn't find a known quotation type :\ */
@@ -1398,11 +1465,17 @@ xml_begin_table (int type, char *item_function)
         }
       break;
     case itemize:
+      if (!docbook || item_function==default_item_function)
+	xml_insert_element (ITEMIZE, START);
+      else
+	xml_insert_element_with_attribute (ITEMIZE, START,
+					   "mark=\"%s\"",
+					   (*item_function == COMMAND_PREFIX) ?
+					   &item_function[1] : item_function);
+      xml_table_level ++;
+      xml_in_item[xml_table_level] = 0;
       if (!docbook)
         {
-          xml_insert_element (ITEMIZE, START);
-          xml_table_level ++;
-          xml_in_item[xml_table_level] = 0;
           xml_insert_element (ITEMFUNCTION, START);
           if (*item_function == COMMAND_PREFIX
               && item_function[strlen (item_function) - 1] != '}'
@@ -1412,15 +1485,6 @@ xml_begin_table (int type, char *item_function)
             execute_string ("%s", item_function);
           xml_insert_element (ITEMFUNCTION, END);
         }
-      else
-        {
-          xml_insert_element_with_attribute (ITEMIZE, START,
-                                             "mark=\"%s\"",
-                                             (*item_function == COMMAND_PREFIX) ?
-                                             &item_function[1] : item_function);
-          xml_table_level ++;
-          xml_in_item[xml_table_level] = 0;
-        }
       break;
     }
 }
@@ -1773,94 +1837,16 @@ xml_close_indexentry (void)
 void
 xml_begin_index (void)
 {
-  typedef struct xml_index_title {
-      struct xml_index_title *next;
-      char *title;
-  } XML_INDEX_TITLE;
-
-  static XML_INDEX_TITLE *xml_index_titles = NULL;
-
-  if (!handling_delayed_writes)
-    { /* We assume that we just opened a section, and so that the last output is
-         <SECTION ID="node-name"><TITLE>Title</TITLE>
-         where SECTION can be CHAPTER, ...  */
-
-      XML_INDEX_TITLE *new = xmalloc (sizeof (XML_INDEX_TITLE));
-      xml_section *temp = last_section;
-
-      int l = output_paragraph_offset-xml_last_section_output_position;
-      char *tmp = xmalloc (l+1);
-      char *p = tmp;
-      strncpy (tmp, (char *) output_paragraph, l);
-
-      /* We remove <SECTION */
-      tmp[l] = '\0';
-      while (*p != '<')
-        p++;
-      while (*p != ' ')
-        p++;
-      /* ... and its label attribute.  */
-      if (strncmp (p, " label=", 7) == 0)
-        {
-          p++;
-          while (*p != ' ')
-            p++;
-        }
-
-      output_paragraph_offset = xml_last_section_output_position;
-      xml_last_section_output_position = 0;
-
-      xml_pop_current_element (); /* remove section element from elements stack */
-
-      if (last_section)
-        last_section = last_section->prev; /* remove section from sections stack */
-      if (temp)
-        {
-          free (temp->name);
-          free (temp);
-        }
-
-      new->title = xstrdup (p);
-      new->next = xml_index_titles;
-      xml_index_titles = new;
-    }
-  else
+  if (handling_delayed_writes)
     {
-      static int xml_index_titles_reversed = 0;
-
-      if (!xml_index_titles_reversed)
-        {
-          xml_index_titles = (XML_INDEX_TITLE *) reverse_list
-            ((GENERIC_LIST *) xml_index_titles);
-          xml_index_titles_reversed = 1;
-        }
-
       /* We put <INDEX> */
       xml_insert_element (PRINTINDEX, START);
-      if (xml_index_titles)
-        {
-          /* Remove the final > */
-          output_paragraph_offset--;
-          /* and put  ID="node-name"><TITLE>Title</TITLE> */
-          insert_string (xml_index_titles->title);
-          free (xml_index_titles->title);
-          xml_index_titles = xml_index_titles->next;
-        }
-
-      if (xml_index_divisions)
-        {
-          xml_insert_element (INDEXDIV, START);
-          indexdivempty = 1;
-        }
     }
 }
 
 void
 xml_end_index (void)
 {
-  xml_close_indexentry ();
-  if (xml_index_divisions)
-    xml_insert_element (INDEXDIV, END);
   xml_insert_element (PRINTINDEX, END);
 }
 
@@ -1889,75 +1875,6 @@ xml_index_divide (char *entry)
 }
 
 void
-xml_insert_indexentry (char *entry, char *node)
-{
-  char *primary = NULL, *secondary;
-  if (xml_index_divisions)
-    xml_index_divide (entry);
-
-  indexdivempty = 0;
-  if (strstr (entry+1, INDEX_SEP))
-    {
-      primary = xmalloc (strlen (entry) + 1);
-      strcpy (primary, entry);
-      secondary = strstr (primary+1, INDEX_SEP);
-      *secondary = '\0';
-      secondary += strlen (INDEX_SEP);
-
-      if (in_secondary && strcmp (primary, index_primary) == 0)
-        {
-          xml_insert_element (SECONDARYIE, END);
-          xml_insert_element (SECONDARYIE, START);
-          execute_string ("%s", secondary);
-        }
-      else
-        {
-          xml_close_indexentry ();
-          xml_insert_element (INDEXENTRY, START);
-          in_indexentry = 1;
-          xml_insert_element (PRIMARYIE, START);
-          execute_string ("%s", primary);
-          xml_insert_element (PRIMARYIE, END);
-          xml_insert_element (SECONDARYIE, START);
-          execute_string ("%s", secondary);
-          in_secondary = 1;
-        }
-    }
-  else
-    {
-      xml_close_indexentry ();
-      xml_insert_element (INDEXENTRY, START);
-      in_indexentry = 1;
-      xml_insert_element (PRIMARYIE, START);
-      execute_string ("%s", entry);
-    }
-  add_word (", ");
-
-  /* Don't link to @unnumbered sections directly.
-     We are disabling warnings temporarily, otherwise these xrefs
-     will cause bogus warnings about missing punctuation.  */
-  {
-    extern int print_warnings;
-    int save_print_warnings = print_warnings;
-    print_warnings = 0;
-    execute_string ("%cxref{%s}", COMMAND_PREFIX, xstrdup (node));
-    print_warnings = save_print_warnings;
-  }
-
-  if (primary)
-    {
-      strcpy (index_primary, primary);
-      /*      xml_insert_element (SECONDARYIE, END);*/
-      /*     *(secondary-1) = ',';*/ /* necessary ? */
-      free (primary);
-    }
-  else
-    xml_insert_element (PRIMARYIE, END);
-
-  /*  xml_insert_element (INDEXENTRY, END); */
-}
-
-void
 xml_synindex (char *from, char *to)
 {
   int i, slot;
@@ -2012,7 +1929,7 @@ xml_begin_multitable (int ncolumns, int *column_widths)
   else
     {
       xml_insert_element (MULTITABLE, START);
-      for (i=0; i<ncolumns; i++)
+      for (i = 0; i < ncolumns; i++)
         {
           xml_insert_element (COLSPEC, START);
           add_word_args ("%d", column_widths[i]);
@@ -2030,7 +1947,7 @@ xml_begin_multitable_group (void)
   xml_insert_element_with_attribute (TGROUP, START, "cols=\"%d\"",
       multitable_columns_count);
 
-  for (i=0; i < multitable_columns_count; i++)
+  for (i = 0; i < multitable_columns_count; i++)
     {
       xml_insert_element_with_attribute (COLSPEC, START,
           "colwidth=\"%d*\"", multitable_column_widths[i]);
@@ -2210,7 +2127,11 @@ xml_begin_def_term (int base_type, const char *category,
     char *defined_name, char *type_name, char *type_name2)
 {
   xml_after_def_term = 0;
-  xml_insert_element (DEFINITIONTERM, START);
+  if (docbook)
+    xml_insert_element_with_attribute (DEFINITIONTERM, START,
+				       "role=\"%s\"", category);
+  else
+    xml_insert_element (DEFINITIONTERM, START);
 
   /* Index entry */
   switch (base_type)
@@ -2239,10 +2160,13 @@ xml_begin_def_term (int base_type, const char *category,
     }
 
   /* Start with category.  */
-  xml_insert_element (DEFCATEGORY, START);
-  execute_string (docbook ? "--- %s:" : "%s", category);
-  xml_insert_element (DEFCATEGORY, END);
-  add_char(' ');
+  if (! docbook)
+    {
+      xml_insert_element (DEFCATEGORY, START);
+      execute_string (docbook ? "[%s]" : "%s", category);
+      xml_insert_element (DEFCATEGORY, END);
+      add_char(' ');
+    }
 
   /* Output type name first for typed definitions.  */
   switch (base_type)
diff --git a/Build/source/utils/texinfo/makeinfo/xml.h b/Build/source/utils/texinfo/makeinfo/xml.h
index f82b483e381..5d18ff56603 100644
--- a/Build/source/utils/texinfo/makeinfo/xml.h
+++ b/Build/source/utils/texinfo/makeinfo/xml.h
@@ -1,12 +1,13 @@
-/* xml.h -- xml output declarations.
-   $Id: xml.h,v 1.24 2004/11/26 00:48:35 karl Exp $
+/* xml.h -- xml (including Docbook) output declarations.
+   $Id: xml.h,v 1.32 2008/01/31 18:33:28 karl Exp $
 
-   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,20 +15,18 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Philippe Martin <feloy@free.fr>.  */
 
 #ifndef XML_H
 #define XML_H
 
-/* Options. */
-
-/* Separate index entries into divisions for each letters. */
-extern int xml_index_divisions;
+/* Currently sorting the index. */
 extern int xml_sort_index;
 
+/* Options. */
+
 extern int xml_no_indent;
 
 extern int xml_node_open;
@@ -80,6 +79,7 @@ enum xml_element
   ITEMIZE, ITEMFUNCTION, ITEM, ENUMERATE, TABLE, TABLEITEM, TABLETERM,
   INDEXTERM, 
   MATH, DIMENSION,
+  CLICKSEQUENCE, CLICK,
   XREF, XREFNODENAME, XREFINFONAME, XREFPRINTEDDESC, XREFINFOFILE,
     XREFPRINTEDNAME, 
   INFOREF, INFOREFNODENAME, INFOREFREFNAME, INFOREFINFONAME, 
@@ -100,6 +100,7 @@ enum xml_element
   DEFINITION, DEFINITIONTERM, DEFINITIONITEM,
   DEFCATEGORY, DEFFUNCTION, DEFVARIABLE, DEFPARAM, DEFDELIMITER, DEFTYPE,
   DEFPARAMTYPE, DEFDATATYPE, DEFCLASS, DEFCLASSVAR, DEFOPERATION,
+  FRENCHSPACING,
   PARA
 };
 
@@ -109,13 +110,12 @@ extern void xml_add_char (int character),
   xml_insert_entity (char *entity_name),
   xml_insert_footnote (char *note),
   xml_insert_quotation (char *type, int arg),
-  xml_insert_indexentry (char *entry, char *node),
   xml_insert_indexterm (char *indexterm, char *index),
   xml_insert_docbook_image (char *name_arg),
   xml_synindex (char *from, char *to),
   xml_start_para (void),
   xml_end_para (void),
-  xml_begin_document (char *output_filename),
+  xml_begin_document (const char *output_basename),
   xml_end_document (void),
   xml_start_menu_entry (char *tem),
   xml_end_menu (void),
diff --git a/Build/source/utils/texinfo/makeinfo/xref.c b/Build/source/utils/texinfo/makeinfo/xref.c
index 314d4a0fb64..43e9ae94c4d 100644
--- a/Build/source/utils/texinfo/makeinfo/xref.c
+++ b/Build/source/utils/texinfo/makeinfo/xref.c
@@ -1,12 +1,12 @@
 /* xref.c -- cross references for Texinfo.
-   $Id: xref.c,v 1.4 2004/12/21 17:28:35 karl Exp $
+   $Id: xref.c,v 1.14 2007/09/26 20:53:40 karl Exp $
 
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "cmds.h"
@@ -131,7 +130,7 @@ cm_xref (int arg)
         {
           if (!ref_flag)
             add_word (px_ref_flag || printing_index
-                ? (char *) _("see ") : (char *) _("See "));
+                ? (char *) gdt("see ") : (char *) gdt("See "));
 
           if (!*arg4 && !*arg5)
             {
@@ -155,7 +154,7 @@ cm_xref (int arg)
             }
           else if (*arg5)
             {
-              add_word_args (_("See section ``%s'' in "), *arg3 ? arg3 : arg1);
+              add_word_args (gdt("See section ``%s'' in "), *arg3 ? arg3 : arg1);
               xml_insert_element (CITE, START);
               add_word (arg5);
               xml_insert_element (CITE, END);
@@ -168,7 +167,7 @@ cm_xref (int arg)
       else if (xml)
         {
           if (!ref_flag)
-            add_word_args ("%s", px_ref_flag ? _("see ") : _("See "));
+            add_word_args ("%s", px_ref_flag ? gdt("see ") : gdt("See "));
 
           xml_insert_element (XREF, START);
           xml_insert_element (XREFNODENAME, START);
@@ -203,10 +202,10 @@ cm_xref (int arg)
       else if (html)
         {
           if (!ref_flag)
-            add_word_args ("%s", px_ref_flag ? _("see ") : _("See "));
+            add_word_args ("%s", px_ref_flag ? gdt("see ") : gdt("See "));
         }
       else
-        add_word_args ("%s", px_ref_flag ? "*note " : "*Note ");
+        add_word_args ("%s", px_ref_flag || ref_flag ? "*note " : "*Note ");
 
       if (!xml)
         {
@@ -387,7 +386,11 @@ cm_xref (int arg)
       if (temp == -1)
         warning (_("End of file reached while looking for `.' or `,'"));
       else if (temp != '.' && temp != ',')
-        warning (_("`.' or `,' must follow @%s, not `%c'"), command, temp);
+        {
+          warning (_("`.' or `,' must follow @%s, not `%c'"), command, temp);
+          if (temp == ')')
+            warning (_("for cross-references in parentheses, use @pxref"));
+        }
     }
 }
 
@@ -453,7 +456,7 @@ cm_inforef (int arg)
         {
           char *tem;
 
-          add_word ((char *) _("see "));
+          add_word ((char *) gdt("see "));
           /* html fixxme: revisit this */
           add_html_elt ("<a href=");
           if (splitting)
@@ -487,7 +490,6 @@ cm_uref (int arg)
 {
   if (arg == START)
     {
-      extern int printing_index;
       char *url  = get_xref_token (1); /* expands all macros in uref */
       char *desc = get_xref_token (0);
       char *replacement = get_xref_token (0);
@@ -495,7 +497,7 @@ cm_uref (int arg)
       if (docbook)
         {
           xml_insert_element_with_attribute (UREF, START, "url=\"%s\"",
-              text_expansion (url));
+					     maybe_escaped_expansion (url, 0, 1));
           if (*replacement)
             execute_string ("%s", replacement);
           else if (*desc)
@@ -574,10 +576,20 @@ cm_email (int arg)
 
       if (xml && docbook)
         {
-          xml_insert_element_with_attribute (EMAIL, START, "url=\"mailto:%s\"", addr);
-          if (*name)
+	  if (*name)
+	    {
+	      xml_insert_element_with_attribute (EMAIL, START,
+						 "url=\"mailto:%s\"",
+						 maybe_escaped_expansion (addr, 0, 1));
               execute_string ("%s", name);
-          xml_insert_element (EMAIL, END);
+	      xml_insert_element (EMAIL, END);
+	    }
+	  else
+	    {
+	      xml_insert_element (EMAILADDRESS, START);
+	      execute_string ("%s", addr);
+	      xml_insert_element (EMAILADDRESS, END);
+	    }
         }
       else if (xml)
         {
diff --git a/Build/source/utils/texinfo/makeinfo/xref.h b/Build/source/utils/texinfo/makeinfo/xref.h
index 8f2711b63af..a6fc87411bb 100644
--- a/Build/source/utils/texinfo/makeinfo/xref.h
+++ b/Build/source/utils/texinfo/makeinfo/xref.h
@@ -1,12 +1,12 @@
 /* xref.h -- declarations for the cross references.
-   $Id: xref.h,v 1.1 2004/04/11 17:56:47 karl Exp $
+   $Id: xref.h,v 1.4 2007/07/01 21:20:33 karl Exp $
 
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef XREF_H
 #define XREF_H
diff --git a/Build/source/utils/texinfo/po/ChangeLog b/Build/source/utils/texinfo/po/ChangeLog
index b965d4e334d..a540c5c4b1e 100644
--- a/Build/source/utils/texinfo/po/ChangeLog
+++ b/Build/source/utils/texinfo/po/ChangeLog
@@ -1,3 +1,25 @@
+2007-12-23  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.17.
+	* ORIG: New file, from gettext-0.17.
+
+2007-02-10  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.16.
+
+2005-05-28  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* ORIG: New file, from gettext-0.14.5.
+
+2005-03-15  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* ORIG: New file, from gettext-0.14.3.
+
+2005-03-12  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.14.2.
+	* ORIG: New file, from gettext-0.14.2.
+
 2004-02-05  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* Makefile.in.in: Upgrade to gettext-0.14.1.
diff --git a/Build/source/utils/texinfo/po/LINGUAS b/Build/source/utils/texinfo/po/LINGUAS
index 295325dee2e..2c0c5f7acf6 100644
--- a/Build/source/utils/texinfo/po/LINGUAS
+++ b/Build/source/utils/texinfo/po/LINGUAS
@@ -3,17 +3,20 @@ da
 de
 de_AT
 eo
+es
 fr
 he
 hr
+hu
 ja
 nl
 nb
-no
 pl
 ro
 ru
+rw
 sv
 tr
+vi
 zh_CN
 zh_TW
diff --git a/Build/source/utils/texinfo/po/Makefile.in.in b/Build/source/utils/texinfo/po/Makefile.in.in
index 53efc5e16e6..fecf500f3f3 100644
--- a/Build/source/utils/texinfo/po/Makefile.in.in
+++ b/Build/source/utils/texinfo/po/Makefile.in.in
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
@@ -8,10 +8,12 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.14
+# Origin: gettext-0.17
+GETTEXT_MACRO_VERSION = 0.17
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
 SHELL = /bin/sh
 @SET_MAKE@
@@ -22,18 +24,38 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit
@@ -46,7 +68,7 @@ UPDATEPOFILES = @UPDATEPOFILES@
 DUMMYPOFILES = @DUMMYPOFILES@
 DISTFILES.common = Makefile.in.in remove-potcdate.sin \
 $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
 $(POFILES) $(GMOFILES) \
 $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
 
@@ -74,11 +96,24 @@ CATALOGS = @CATALOGS@
 	mv t-$@ $@
 
 
-all: all-@USE_NLS@
+all: check-macro-version all-@USE_NLS@
 
 all-yes: stamp-po
 all-no:
 
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	       exit 1; \
+	     }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
 # stamp-po is a timestamp denoting the last time at which the CATALOGS have
 # been loosely updated. Its purpose is that when a developer or translator
 # checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
@@ -88,10 +123,13 @@ all-no:
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
-	test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
-	@echo "touch stamp-po"
-	@echo timestamp > stamp-poT
-	@mv stamp-poT stamp-po
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
 
 # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
 # otherwise packages like GCC can not be built if only parts of the source
@@ -100,11 +138,34 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-	  --files-from=$(srcdir)/POTFILES.in \
-	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	  --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
+	if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+	  package_gnu='GNU '; \
+	else \
+	  package_gnu=''; \
+	fi; \
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	  '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	  *) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --package-name="$${package_gnu}@PACKAGE@" \
+	      --package-version='@VERSION@' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	esac
 	test ! -f $(DOMAIN).po || { \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \
 	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -143,7 +204,7 @@ install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	  for file in $(DISTFILES.common) Makevars.template; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -156,13 +217,13 @@ install-data: install-data-@USE_NLS@
 	fi
 install-data-no: all
 install-data-yes: all
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -202,19 +263,19 @@ installdirs: installdirs-exec installdirs-data
 installdirs-exec:
 installdirs-data: installdirs-data-@USE_NLS@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	else \
 	  : ; \
 	fi
 installdirs-data-no:
 installdirs-data-yes:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
@@ -289,11 +350,14 @@ dist distdir:
 	$(MAKE) update-po
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
-dist2: $(DISTFILES)
+dist2: stamp-po $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	if test "$(PACKAGE)" = "gettext-tools"; then \
 	  dists="$$dists Makevars.template"; \
 	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
 	if test -f $(srcdir)/ChangeLog; then \
 	  dists="$$dists ChangeLog"; \
 	fi; \
@@ -305,9 +369,9 @@ dist2: $(DISTFILES)
 	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
 	for file in $$dists; do \
 	  if test -f $$file; then \
-	    cp -p $$file $(distdir); \
+	    cp -p $$file $(distdir) || exit 1; \
 	  else \
-	    cp -p $(srcdir)/$$file $(distdir); \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
 	  fi; \
 	done
 
@@ -354,10 +418,9 @@ $(DUMMYPOFILES):
 update-gmo: Makefile $(GMOFILES)
 	@:
 
-Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
+	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories
 
 force:
 
diff --git a/Build/source/utils/texinfo/po/Makevars b/Build/source/utils/texinfo/po/Makevars
index cf1c228c12f..895f216c0bb 100644
--- a/Build/source/utils/texinfo/po/Makevars
+++ b/Build/source/utils/texinfo/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=__
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
diff --git a/Build/source/utils/texinfo/po/POTFILES.in b/Build/source/utils/texinfo/po/POTFILES.in
index e19e34e7f71..1016e2f67cc 100644
--- a/Build/source/utils/texinfo/po/POTFILES.in
+++ b/Build/source/utils/texinfo/po/POTFILES.in
@@ -1,36 +1,37 @@
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#  
 # List of source files containing translatable strings.
-# The last line must not be a comment.
 
+gnulib/lib/error.c
+gnulib/lib/getopt.c
+gnulib/lib/xalloc-die.c
+gnulib/lib/xsetenv.c
 info/echo-area.c
 info/footnotes.c
 info/footnotes.h
 info/indices.c
 info/info.c
-info/info.h
 info/infodoc.c
 info/infokey.c
 info/infomap.c
 info/m-x.c
 info/makedoc.c
 info/nodemenu.c
-info/pcterm.c
+info/search.c
 info/session.c
 info/tilde.c
 info/variables.c
 info/window.c
-lib/getopt.c
-lib/system.h
+install-info/install-info.c
+lib/xexit.c
 makeinfo/cmds.c
 makeinfo/defun.c
 makeinfo/files.c
+makeinfo/float.c
 makeinfo/footnote.c
 makeinfo/html.c
 makeinfo/index.c
@@ -41,7 +42,6 @@ makeinfo/makeinfo.c
 makeinfo/multi.c
 makeinfo/node.c
 makeinfo/sectioning.c
-makeinfo/toc.c
 makeinfo/xml.c
-util/install-info.c
+makeinfo/xref.c
 util/texindex.c
diff --git a/Build/source/utils/texinfo/po/cs.gmo b/Build/source/utils/texinfo/po/cs.gmo
index 03297906b1c..4df443282a5 100644
--- a/Build/source/utils/texinfo/po/cs.gmo
+++ b/Build/source/utils/texinfo/po/cs.gmo
diff --git a/Build/source/utils/texinfo/po/cs.po b/Build/source/utils/texinfo/po/cs.po
index 14c7d5ef5b3..8c959d49844 100644
--- a/Build/source/utils/texinfo/po/cs.po
+++ b/Build/source/utils/texinfo/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.0\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
 "PO-Revision-Date: 2000-10-31 15:17+01:00\n"
 "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16,132 +16,198 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: pøepínaè `%s' není jednoznaèný\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: pøepínaè `--%s' musí být zadán bez argumentu\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: pøepínaè `%c%s' musí být zadán bez argumentu\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: pøepínaè `%s' vy¾aduje argument\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: neznámý pøepínaè `--%s'\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: neznámý pøepínaè `%c%s'\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: neznámý pøepínaè -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: neznámý pøepínaè -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: pøepínaè vy¾aduje argument -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: pøepínaè `-W %s' musí být zadán bez argumentu\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, fuzzy, c-format
+msgid "memory exhausted"
+msgstr "virtuální pamì» vyèerpána"
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "Posun na následující znak"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "Posun na pøedcházející znak"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "Pøesun na zaèátek tohoto øádku"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "Pøesun na konec tohoto øádku"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "Posun na následující slovo"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "Posun na pøedcházející slovo"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Smazání znaku pod kurzorem"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "Smazání prvního znaku vlevo od kurzoru"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Zru¹ení nebo pøeru¹ení operace"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Akceptování (nebo vnucené dokonèení) tohoto øádku"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Vlo¾ení dal¹ího znaku bez interpretace jeho funkce"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Vlo¾ení tohoto znaku"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Vlo¾ení tabelátoru"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Pøemístìní znaku na pozici"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Vlo¾ení toho co bylo naposled smazáno"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "Kruhový buffer smazaných oblastí je prázdný"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Vlo¾ení naposledy smazaného úseku"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "Smazání v¹eho od kurzoru a¾ do konce øádku"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "Smazání v¹eho od zaèátku øádku do kurzoru"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "Smazání slova, od kurzoru do konce slova"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "Smazání slova, od zaèátku slova do kurzoru"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Doplnìní neexistují"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Nekompletní"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "Seznam mo¾ných doplnìní"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "Jedinné doplnìní"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "Jedno doplnìní:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d doplnìní:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "Vlo¾ení doplnìní"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "Hledám doplnìní..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "Odrolování obsahu okna s doplnìními"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "Poznámky pod èarou nelze zobrazit"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr ""
 "Zobrazení poznámek pod èarou, vztahujících se k tomuto uzlu, v jiném oknì"
@@ -151,75 +217,75 @@ msgstr ""
 msgid "---------- Footnotes ----------"
 msgstr "---------------------\n"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "Vyhledání øetìzce v rejstøíku tohoto souboru"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "Jsou hledány polo¾ky rejstøíku..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "®ádný rejstøík nebyl nalezen."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Polo¾ka rejstøíku: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Posun na dal¹í polo¾ku rejstøíku, odpovídající øetìzci z minulého pøíkazu `"
 "\\[index-search]'"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "Není zadán øetìzec, který se má vyhledávat v rejstøíku(cích)."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Nejsou polo¾ky rejstøíku."
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, fuzzy, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "Ji¾ není %spolo¾ka rejstøíku, která obsahuje \"%s\"."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "dal¹í "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "TOTO NELZE VIDÌT"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, fuzzy, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr "Nalezeno \"%s\" v %s. (`\\[next-index-match]' - hledání dal¹í.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, fuzzy, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "Prohledávám tyto rejstøíky \"%s\"..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr ""
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Vyhledání øetìzce ve v¹ech známých rejstøících info souborù a vytvoøení menu"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Hledat v rejstøíku odkaz na:"
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -228,120 +294,97 @@ msgstr ""
 "\n"
 "* Menu: Uzly jejich¾ rejstøíky obsahují \"%s\":\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Více informací mù¾ete získat pomocí pøepínaèe --help.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
-#, fuzzy, c-format
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"  Copyright (C) %s 1996 Free Software Foundation, Inc.\n"
-"  Toto je volné programové vybavení, které je zcela BEZ ZÁRUKY. Podmínky "
-"pro\n"
-"kopírování a roz¹iøování naleznete v Obecné veøejné licenci GNU (GNU "
-"General\n"
-"Public Licence). Více informací získáte ve zdrojových textech v souboru\n"
-"COPYING.\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "odpovídající polo¾ky rejstøíku nebyly pro `%s' nalezeny\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-
-#: info/info.c:597
-#, fuzzy, c-format
+#: info/info.c:598
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Pou¾ití: %s [PØEPÍNAÈ]... [POLO®KA-MENU...]\n"
-"\n"
-"  Umo¾òuje èíst dokumentaci v Info formátu.\n"
-"\n"
-"Pøepínaèe:\n"
-"--apropos=SUBJEKT           hledá SUBJEKT ve v¹ech odkazech v¹ech manuálù\n"
-"--directory=ADRESÁØ         kromì promìnné INFOPATH prohledává i tento\n"
-"                            ADRESÁØ\n"
-"--dribble=SOUBOR            ulo¾í klávesy, které stiskl u¾ivatel do SOUBORu\n"
-"--file=SOUBOR               zadání info souboru, který se má prohlí¾et\n"
-"--help                      vypí¹e tuto nápovìdu a skonèí\n"
-"--index-search=ØETÌZEC      skok na uzel urèený v rejstøíku ØETÌZCEM\n"
-"--node=JMÉNO_UZLU           zadání uzlù, v prvním nav¹tíveném info souboru\n"
-"--output=SOUBOR             vypí¹e nav¹tívené uzly do SOUBORu\n"
-"--restore=SOUBOR            klávesy, které mají být automaticky po\n"
-"                            spu¹tení infa stisknuty, ète ze SOUBORu\n"
-"--show-options, --usage     zobrazuje pøepínaèe pøíkazové øádky\n"
-"--subnodes                  rekurzivnì vypí¹e polo¾ky menu\n"
-"%s --vi=keys                  pou¾ije ovládání klávesami jako ve vi a less\n"
-"--version                   vypí¹e oznaèení verze a skonèí\n"
-"\n"
-"  První nepøepínaèový argument, jestli¾e je zadán, je polo¾ka menu, která\n"
-"má být po spu¹tìní nav¹tívena; tato polo¾ka je vyhledávána ve v¹ech `dir'\n"
-"souborech podle INFOPATH.\n"
-"  Jestli¾e tato polo¾ka není zadána, info spojí v¹echny `dir' soubory a "
-"uká¾e\n"
-"výsledek. V¹echny zbývající argumenty jsou brány jako názvy polo¾ek menu,\n"
-"relativnì k prvnímu nav¹tívenému uzlu.\n"
-"\n"
-"Pøíklady:\n"
-"  info                       zobrazí seznam dokumentace\n"
-"  info emacs                 zobrazí uzel emacs ze seznamu dokumentace\n"
-"  info emacs buffers         zobrazí uzel buffers z emacsového manuálu\n"
-"  info --show-options emacs  zobrazí uzel s pøepínaèi pøíkazového øádku\n"
-"                              pro emacs\n"
-"  info -f ./foo.info         zobrazí soubor ./foo.info, nehledá v `dir' "
-"soub.\n"
-"\n"
-"  Chyby v programu oznamujte na adrese <bug-texinfo@gnu.org> (pouze "
-"anglicky),\n"
-"obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n"
-"zasílejte na adresu <cs@li.org> (èesky).\n"
 
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 #, fuzzy
 msgid ""
 "\n"
@@ -355,422 +398,405 @@ msgstr ""
 "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n"
 "zasílejte na <cs@li.org> (èesky).\n"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Uzel `%s' nelze nalézt."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Uzel `(%s)%s' nelze nalézt."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "Nelze nalézt okno!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "Bod se nevyskutuje v oknì tohoto uzlu!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "Poslední okno nelze smazat."
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "V tomto uzlu není menu."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "V tomto nejsou poznámky pod èarou."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "V tomto uzlu není køí¾ový odkaz."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Pro tento uzel není `%s' ukazatel."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Neznámý Info pøíkaz `%c'; zkuste `?' pro nápovìdu."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Typ terminálu `%s' není dostateènì inteligentní pro provoz Infa."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "Ji¾ jste na poslední stránce tohoto uzlu."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "Ji¾ jste na první stránce tohoto uzlu."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "Pouze jedno okno."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "Výsledné okno by bylo pøíli¹ malé."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Není volné místo pro okno nápovìdy, prosím sma¾te nìkteré okno."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-#, fuzzy
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
-msgstr "Základní pøíkazy v Info oknech\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
+msgstr ""
 
-#: info/infodoc.c:49
+#: info/infodoc.c:47
 #, fuzzy
-msgid "\\%-10[quit-help]  Quit this help.\n"
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "  %-10s  Ukonèení prohlí¾ení nápovìdy.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 #, fuzzy
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "  %-10s  Celkové ukonèení Infa.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 #, fuzzy
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Vyvolání prùvodce Infem.\n"
 
-# Udìlat patch na podtr¾ení
-#: info/infodoc.c:53 info/infodoc.c:102
+#: info/infodoc.c:51
 #, fuzzy
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr "Výbìr dal¹ích uzlù:\n"
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "  %-10s  Posun o jeden øádek dozadu.\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:52
 #, fuzzy
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "  %-10s  Pøesun na \"dal¹í\" uzel tohoto uzlu.\n"
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "  %-10s  Posun o jeden øádek dopøedu.\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:53
 #, fuzzy
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "  %-10s  Pøesun na \"pøedchozí\" uzel tohoto uzlu.\n"
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "  %-10s  Pøedchozí stránka.\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:54
 #, fuzzy
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "  %-10s  Pøesun \"nahoru\" z aktuálního uzlu.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "  %-10s  Následující stránka.\n"
+
+#: info/infodoc.c:55
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "  %-10s  Pøesun na zaèátek aktuálního uzlu.\n"
+
+#: info/infodoc.c:56
+#, fuzzy
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "  %-10s  Pøesun na konec tohoto uzlu.\n"
 
 #: info/infodoc.c:58
 #, fuzzy
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
-msgstr "              Vybírání polo¾ky menu zpùsobí zobrazení tohoto uzlu.\n"
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr "  %-10s  Skok na následující hypertextový odkaz v tomto uzlu.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
 #, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
-msgstr "  %-10s  Následování køí¾ového odkazu. Ète název odkazu.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr "  %-10s  Následování hypertextového odkazu pod kurzorem.\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:60
 #, fuzzy
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr "  %-10s  Pøesun na poslední uzel zobrazený v tomto oknì.\n"
 
 #: info/infodoc.c:62
 #, fuzzy
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr "  %-10s  Skok na následující hypertextový odkaz v tomto uzlu.\n"
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "  %-10s  Pøesun na \"pøedchozí\" uzel tohoto uzlu.\n"
 
 #: info/infodoc.c:63
 #, fuzzy
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr "  %-10s  Skok na následující hypertextový odkaz v tomto uzlu.\n"
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "  %-10s  Pøesun na \"dal¹í\" uzel tohoto uzlu.\n"
 
 #: info/infodoc.c:64
 #, fuzzy
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr "  %-10s  Následování hypertextového odkazu pod kurzorem.\n"
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "  %-10s  Pøesun na \"pøedchozí\" uzel tohoto uzlu.\n"
 
 #: info/infodoc.c:65
 #, fuzzy
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr "  %-10s  Pøesun do `adresáøového' uzlu. Rovnocenné s `g (DIR)'.\n"
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "  %-10s  Pøesun na \"dal¹í\" uzel tohoto uzlu.\n"
 
 #: info/infodoc.c:66
 #, fuzzy
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr "  %-10s  Pøesun do nejvy¹¹ího (Top) uzlu. Rovnocenné s `g Top'.\n"
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "  %-10s  Pøesun \"nahoru\" z aktuálního uzlu.\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
+#: info/infodoc.c:67
 #, fuzzy
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr "Pøesun uvnitø uzlu:\n"
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "  %-10s  Pøesun na konec tohoto uzlu.\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "  %-10s  Pøesun na konec tohoto uzlu.\n"
 
 #: info/infodoc.c:70
 #, fuzzy
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "  %-10s  Pøesun na zaèátek aktuálního uzlu.\n"
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "  %-10s  Výbìr první ... deváté polo¾ky menu uzlu.\n"
 
 #: info/infodoc.c:71
 #, fuzzy
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "  %-10s  Pøesun na konec tohoto uzlu.\n"
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "  %-10s  Zobrazení poslední polo¾ky menu uzlu.\n"
 
 #: info/infodoc.c:72
 #, fuzzy
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "  %-10s  Posun o jeden øádek dopøedu.\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  Vybrání polo¾ky menu zadané pomocí názvu.\n"
 
 #: info/infodoc.c:73
 #, fuzzy
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "  %-10s  Posun o jeden øádek dozadu.\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "  %-10s  Následování køí¾ového odkazu. Ète název odkazu.\n"
 
 #: info/infodoc.c:74
 #, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "  %-10s  Následující stránka.\n"
-
-#: info/infodoc.c:75
-#, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "  %-10s  Pøedchozí stránka.\n"
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  Pøesun na uzel zadaný pomocí jména.\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
+#: info/infodoc.c:76
 #, fuzzy
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr "Dal¹í pøíkazy:\n"
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  Hledání zadaného øetìzce v tomto Info souboru.\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:77
 #, fuzzy
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "  %-10s  Výbìr první ... deváté polo¾ky menu uzlu.\n"
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "  %-10s  Pøesun na \"pøedchozí\" uzel tohoto uzlu.\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:78
 #, fuzzy
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "  %-10s  Zobrazení poslední polo¾ky menu uzlu.\n"
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr ""
+"  %-10s  Hledání zadaného øetìzce v rejstøíku tohoto Info souboru a výbìr\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
 #, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr "              uzlu, na který ukazuje první nalezená polo¾ka.\n"
 
-#: info/infodoc.c:83
-#, fuzzy
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr "              Také mù¾ete zadat jméno souboru ve tvaru (SOUBOR)UZEL.\n"
-
-#: info/infodoc.c:85
+#: info/infodoc.c:81
 #, fuzzy
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"      a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce.\n"
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "Zru¹ení aktuální operace"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 #, fuzzy
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
-msgstr ""
-"      a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr "Základní pøíkazy v Info oknech\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Ukonèení prohlí¾ení nápovìdy.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Celkové ukonèení Infa.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Vyvolání prùvodce Infem.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Pøesun na \"dal¹í\" uzel tohoto uzlu.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Pøesun na \"pøedchozí\" uzel tohoto uzlu.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Pøesun \"nahoru\" z aktuálního uzlu.\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Vybrání polo¾ky menu zadané pomocí názvu.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr "              Vybírání polo¾ky menu zpùsobí zobrazení tohoto uzlu.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Následování køí¾ového odkazu. Ète název odkazu.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Pøesun na poslední uzel zobrazený v tomto oknì.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Skok na následující hypertextový odkaz v tomto uzlu.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Následování hypertextového odkazu pod kurzorem.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Pøesun do `adresáøového' uzlu. Rovnocenné s `g (DIR)'.\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Pøesun do nejvy¹¹ího (Top) uzlu. Rovnocenné s `g Top'.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+#, fuzzy
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr "Pøesun uvnitø uzlu:\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Následující stránka.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Pøedchozí stránka.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Pøesun na zaèátek aktuálního uzlu.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Pøesun na konec tohoto uzlu.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Posun o jeden øádek dopøedu.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Posun o jeden øádek dozadu.\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:119
+#, fuzzy
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr "Dal¹í pøíkazy:\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  Výbìr první ... deváté polo¾ky menu uzlu.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Zobrazení poslední polo¾ky menu uzlu.\n"
 
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-"  %-10s  Hledání zadaného øetìzce v rejstøíku tohoto Info souboru a výbìr\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr "              uzlu, na který ukazuje první nalezená polo¾ka.\n"
 
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Pøesun na uzel zadaný pomocí jména.\n"
-
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr "              Také mù¾ete zadat jméno souboru ve tvaru (SOUBOR)UZEL.\n"
 
-#: info/infodoc.c:133
+#: info/infodoc.c:129
 #, fuzzy, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Hledání zadaného øetìzce v tomto Info souboru.\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 "      a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce.\n"
 
-#: info/infodoc.c:135
+#: info/infodoc.c:131
 #, fuzzy, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Hledání zadaného øetìzce v tomto Info souboru.\n"
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"      a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "Aktuální hledací cesta je:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
 msgstr "Pøíkazy dostupné v Info oknech:\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr "Pøíkazy dostupné v zobrazovacím poli:\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, fuzzy, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -779,7 +805,7 @@ msgstr ""
 "Následující pøíkazy mohou být vykonány pouze pomocí M-x:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 #, fuzzy
 msgid ""
 "The following commands cannot be invoked at all:\n"
@@ -788,86 +814,73 @@ msgstr ""
 "Následující pøíkazy mohou být vykonány pouze pomocí M-x:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-"--- Pou¾ijte `\\[history-node]' nebo `\\[kill-node]' pro ukonèení ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "Zobrazení nápovìdy"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "Zobrazení Info uzlu `(info)Help'"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "Zobrazení dokumentace ke KLÁVESE"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Popis klávesy: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s je nedefinováno."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s je nedefinováno."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "Klávesa %s je definována pro pøíkaz %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Ukázání co napsat pro spu¹tìní daného pøíkazu"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Kde je pøíkaz: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "Pøíkaz `%s' není na ¾ádné klávese"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "Pøíkaz %s mù¾e být vyvolán pouze pomocí %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "Pøíkaz %s mù¾e být vyvolán pomocí %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Funkce `%s' není známa"
 
-#: info/infokey.c:145
-#, c-format
+# Udìlat patch na podtr¾ení
+#: info/infodoc.c:96
+#, fuzzy
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
-msgstr ""
-"  Copyright (C) %s 1996 Free Software Foundation, Inc.\n"
-"  Toto je volné programové vybavení, které je zcela BEZ ZÁRUKY. Podmínky "
-"pro\n"
-"kopírování a roz¹iøování naleznete v Obecné veøejné licenci GNU (GNU "
-"General\n"
-"Public Licence). Více informací získáte ve zdrojových textech v souboru\n"
-"COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr "Výbìr dal¹ích uzlù:\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -969,83 +982,83 @@ msgid ""
 "  --version            display version information and exit.\n"
 msgstr ""
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr ""
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr ""
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr ""
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "Zadání jména pøíkazu a následné zobrazení jeho popisu"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Popis pøíkazu: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "Zadání jména pøíkazu v zobrazovacím poli a jeho vykonání"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Pøíkaz zobrazovacího pole nelze vykonat zde."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, fuzzy, c-format
 msgid "Undefined command: %s"
 msgstr "Neznámý pøíkaz `%s'"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "Nastavení vý¹ky obrazovky"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Vý¹ka obrazovky (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1054,12 +1067,12 @@ msgstr ""
 "Pøi zpracování zdrojového souboru jsou vkládány tyto soubory:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Se souborem %s nelze pracovat.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1071,7 +1084,7 @@ msgstr ""
 "  (Soubor)Uzel                      Øádkù   Velikost Soubor\n"
 "  ------------                      -----   -------- ------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1079,24 +1092,29 @@ msgstr ""
 "  Zde je seznam uzlù, které jste poslední dobou nav¹tívil. Vyberte jeden\n"
 "z tohoto menu, nebo u¾ijte `\\[history-node]' v tomto oknì.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "Vytvoøení okna obsahujícího menu v¹ech aktuálnì nav¹tívených uzlù"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Zobrazení uzlu, který byl zobrazen pøed tímto"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Vyberte nav¹tívený uzel: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Odkaz se ztratil! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1105,509 +1123,513 @@ msgstr ""
 "Vítejte v programu Info verze %s. Stisknìte \\[get-help-window] pro "
 "nápovìdu, \\[menu-item] pro polo¾ku menu."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "Posun dolù na dal¹í øádek"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "Posun nahoru na pøedchozí øádek"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "Pøesun na konec øádku"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "Pøesun na zaèátek øádku"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "Dal¹í"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Pøechod na dal¹í uzel..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Zobrazování první polo¾ky menu..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Zobrazování dal¹ího uzlu..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "Pøesouvání %d krát nahoru, potom na dal¹í."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "V tomto dokumentu ji¾ nejsou dal¹í uzly."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "Pro tento uzel není pøedchozí uzel."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Pøesun na pøedchozí uzel v tomto oknì."
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "V tomto dokumentu není pro tento uzel pøedchozí nebo vy¹¹í uzel."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Pøesun nahoru v tomto oknì."
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Pøesun na poslední polo¾ku menu pøedchozího uzlu."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "Pøesun na následující uzel nebo na první ni¾¹í v uzlové struktuøe"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "Pøesun na pøedchozí uzel nebo na první vy¹¹í v uzlové struktuøe"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "Posun o stránku dolù v tomto oknì"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr "Posun dopøedu v tomto oknì a nastavení implicitní velikosti okna"
 
-#: info/session.c:1221
+#: info/session.c:1389
 #, fuzzy
 msgid "Scroll forward in this window staying within node"
 msgstr "Posun o stránku dolù v tomto oknì"
 
-#: info/session.c:1229
+#: info/session.c:1397
 #, fuzzy
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr "Posun dopøedu v tomto oknì a nastavení implicitní velikosti okna"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "Posun o stránku nahoru v tomto oknì"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr "Posun dozadu v tomto oknì a nastavení implicitní velikosti okna"
 
-#: info/session.c:1254
+#: info/session.c:1422
 #, fuzzy
 msgid "Scroll backward in this window staying within node"
 msgstr "Posun o stránku nahoru v tomto oknì"
 
-#: info/session.c:1262
+#: info/session.c:1430
 #, fuzzy
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr "Posun dozadu v tomto oknì a nastavení implicitní velikosti okna"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "Posun na zaèátek tohoto uzlu"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "Posun na konec tohoto uzlu"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "Posun dolù po øádcích"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "Posun nahoru po øádcích"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "Posun dolù o polovinu velikosti obrazovky"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "Posun nahoru o polovinu velikosti obrazovky"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "Výbìr následujícího okna"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "Výbìr pøedchozího okna"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "Rozdìlení aktuálního okna"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "Smazání aktuálního okna"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "Permanentní okno nelze smazat"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "Smazání v¹ech ostatních oknen"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "Posun druhého okna o stránku dolù"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "Posun druhého okna o stránku zpìt"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "Zmìna velikosti okna"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "Zvìt¹ení nebo zmen¹ení oken na obrazovce tak, aby byla stejnì velká"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr ""
 "Zmìna stavu zalamování v aktuálním oknì (zapnuto->vypni, vypnuto->zapni)"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "Zobrazení následujícího uzlu"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "Zobrazení pøedchozího uzlu"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "Zobrazení vy¹¹ího uzlu"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "Zobrazení posledního uzlu v tomto souboru"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "Toto okno nemá více dal¹ích uzlù"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "Zobrazení prvního uzlu v tomto souboru"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "Zobrazení poslední polo¾ky menu tohoto uzlu"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "Zobrazení této polo¾ky menu"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "V tomto menu není %d. polo¾ka"
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Polo¾ka menu (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Polo¾ka menu: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Následování køí¾ového odkazu (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "Následování køí¾ového odkazu: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "Zadání jména polo¾ky menu a následné zobrazení"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr ""
 "Zadání jména poznámky pod èarou nebo køí¾ového odkazu a následné zobrazení"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "Pøesun na zaèátek menu tohoto uzlu"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr ""
 "Nav¹tívení tolika polo¾ek menu, kolik je mo¾no. Ka¾dá polo¾ka v jiném oknì."
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "Zadání jména uzlu a jeho následné zobrazení"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "Pøesun na uzel: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "V uzlu `%s' není menu."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Polo¾ka menu `%s' v uzlu `%s' není."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Uzel, na který se odkazuje `%s' v `%s', nelze najít."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Ètení seznamu menu zaèínajíce v adresáøi a pokraèujíce dále"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "Následování menu: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Nalezení uzlu popisujícího pøepínaèe programu"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Nalezení uzlu s pøepínaèi programu [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "Zadání jména manuálové stránky a následné zobrazení"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "Manuálová stránka: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "Zobrazení nejvy¹¹ího uzlu v tomto souboru"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "Zobrazení uzlu `(dir)'"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Zru¹ení uzlu (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Uzel `%s' nelze zru¹it"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "Poslední uzel nelze zru¹it"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "Zobrazení poslední dobou nejvíce nav¹tìvovaných uzlù"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "Zru¹ení tohoto uzlu"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "Zadání jména souboru a jeho následné zobrazení"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Nalezení souboru: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Nelze najít `%s'."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Výstupní soubor `%s' nelze vytvoøit."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Dokonèeno."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "Zapisování uzlu %s..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "Poslání obsahu tohoto uzlu pøíkazu INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Rouru do `%s' nelze otevøít."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "Probíhá tisk uzlu %s..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "Smazání v¹eho od zaèátku øádku do kurzoru"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Probíhá hledání podsouboru %s..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr "Pøeètení øetìzce a jeho vyhledání (zále¾í na velikosti písmen)"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "Pøeètení øetìzce a jeho vyhledání"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "Pøeètení øetìzce a jeho vyhledání (zpìtné)"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "%s%søetìzce [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr " (velikost rozhoduje)"
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "Zpìtné hledání"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "Hledání"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " (velikost rozhoduje)"
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "Nebylo nalezeno."
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "Opakování posledního hledání tím samým smìrem"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "Není pøedchozí hledaný øetìzec"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "Opakování posledního hledání opaèným smìrem"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "Vyhledávání zadávaného øetìzce hned pøi zadávání"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "zpìtné interaktivní hledání: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "zpìtné interaktivní hledání: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "interaktivní hledání: "
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "interaktivní hledání: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "Bezvýsledné "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "Pøesun na pøedcházející køí¾ový odkaz"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "Pøesun na následující køí¾ový odkaz"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "Zobrazení odkazu nebo polo¾ky menu, která je na tomto øádku"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "Zru¹ení aktuální operace"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Ukonèení operace"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "Pøesun kurzoru na zadaný øádek okna"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "Pøekreslení obrazovky"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Ukonèení Infa"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Neznámý pøíkaz (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "Sekvence kláves \"%s\" je neplatná"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, fuzzy, c-format
 msgid "`%s' is invalid"
 msgstr "Sekvence kláves \"%s\" je neplatná"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "Pøidání této èíslice do aktuálního èíselného argumentu"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Zaèátek (nebo dìlení ètyømi) aktuálního èíselného argumentu"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "Vnitønì u¾íváno funkcí \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Nedostatek virtuální pamìti!\n"
@@ -1641,524 +1663,681 @@ msgstr "Je-li zapnuto, pak je hledaný øetìzec v nalezeném výrazu zvýraznìn"
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "Øídí co se stane, kdy¾ je po¾adován posun o stranu na konci uzlu"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr ""
 "Poèet øádkù, o které posunout okno, kdy¾ se kurzor dostane mimo viditelnou "
 "èást"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "Je-li zapnuto, pak Info akceptuje a zobrazuje znaky z normy ISO Latin"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "Øídí co se stane, kdy¾ je po¾adován posun o stranu na konci uzlu"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "Zobrazení popisu promìnné"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Popis promìnné: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Nastavení hodnoty Info promìnné"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Nastavení promìnné: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "Nastavení promìnné %s na hodnotu (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "Nastavení promìnné %s na hodnotu (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Znaèky jsou zastatalé ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), øádkù ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, øádkù: %d --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, øádkù: %d --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Podsoubor: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: pøepínaè `%s' není jednoznaèný\n"
+msgid "%s: warning: "
+msgstr "%s: varování: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: pøepínaè `--%s' musí být zadán bez argumentu\n"
+msgid " for %s"
+msgstr " pro %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: pøepínaè `%c%s' musí být zadán bez argumentu\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "Více informací získáte pøíkazem `%s --help'.\n"
+
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"  Chyby v programu oznamujte na adrese <bug-texinfo@gnu.org> (pouze "
+"anglicky),\n"
+"obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n"
+"zasílejte na <cs@li.org> (èesky).\n"
+
+#: install-info/install-info.c:597
+#, fuzzy, c-format
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"  Toto je soubor .../info/dir, který obsahuje nejvy¹¹í uzly hierarchie\n"
+"Info dokumentù a je nazýván (dir)Top. Kdy¾ poprvé spustíte Info dostanete\n"
+"se do tohoto uzlu.\n"
+"\n"
+"%s      Toto je vrchol INFO stromu\n"
+"\n"
+"    Tento (Adresáøový uzel) obsahuje menu hlavních témat.\n"
+"  Stiskem \"q\" Info ukonèíte, stiskem \"?\" získáte seznam v¹ech Info "
+"pøíkazù,\n"
+"  stiskem \"d\" se vrátíte sem, stiskem \"h\" získáte nápovìdu pro "
+"zaèáteèníky,\n"
+"  napsáním \"mEmacs\" si zobrazíte manuál k Emacsu, atd.\n"
+"\n"
+"    Pokud chcete v Emacsu zobrazit obsah polo¾ky menu nebo následovat "
+"køí¾ový\n"
+"  odkaz, mù¾ete to provést kliknutím prostøedním tlaèítkem my¹i.\n"
+"\n"
+"* Menu:\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: pøepínaè `%s' vy¾aduje argument\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: %s nelze èíst a %s nelze vytvoøit\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: neznámý pøepínaè `--%s'\n"
+msgid "%s: empty file"
+msgstr "%s: prázdný soubor"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY bez odpovídajícího END-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY bez pøedchozího START-INFO-DIR-ENTRY"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: neznámý pøepínaè `%c%s'\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: neznámý pøepínaè -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Info soubor zadejte pouze jednou.\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: neznámý pøepínaè -- %c\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: pøepínaè vy¾aduje argument -- %c\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n"
+msgid "excess command line argument `%s'"
+msgstr "nadbyteèný argument `%s' v pøíkazovém øádku"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ""
+"Vstupní soubor nezadán; pou¾itím pøepínaèe --help získáte bli¾¹í informace."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+"Adresáø nebyl zadán; pou¾itím pøepínaèe `--help' získáte bli¾¹í informace"
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2278
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: pøepínaè `-W %s' musí být zadán bez argumentu\n"
+msgid "no info dir entry in `%s'"
+msgstr "v Info adresáøi `%s' není ¾ádná polo¾ka"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "pro `%s' nebyly nalezeny ¾ádné polo¾ky"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "©patný argument pro %c%s"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "Leden"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "Únor"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "Bøezen"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "Duben"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "Kvìten"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "Èerven"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "Èervenec"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "Srpen"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "Záøí"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "Øíjen"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "Listopad"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "Prosinec"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "nepravdìpodobný znak %c ve @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc argument je celý velkými písmeny, zbyteènì"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, fuzzy, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`@end' vy¾aduje `%s', ale vidí `%s'"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, fuzzy, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`@end' vy¾aduje `%s', ale vidí `%s'"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "Pøíkaz %c%s je zastaralý"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp vy¾aduje kladný èíselný argument a ne `%s'"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "©patný argument pro %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "©patný argument pro %c%s"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr ""
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "Chybìjící `}' v argumentu @def"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Funkce"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Makro"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Speciální forma"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Promìnná"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "U¾ivatelská volba"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Instance promìnné"
-
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Metoda"
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "©patný argument pro %c%s"
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "z"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
 
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Chybìjící `}' v argumentu @def"
+
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr ""
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr ""
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr ""
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr ""
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Viz"
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "`%c%s' potøebuje argument `{...}' a ne pouze `%s'"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "Chybí uzavírací závorka pro poznámku pod èarou `%s'"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "Poznámka pod èarou definována bez rodièovského uzlu"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 #, fuzzy
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Poznámka pod èarou definována bez rodièovského uzlu"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "Poznámky pod èarou"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "Neoznaèeno"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, fuzzy, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "%s: neznámý pøepínaè `--%s'\n"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Neznámý rejstøík `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Rejstøík `%s' ji¾ existuje"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Neznámý rejstøík `%s' a/nebo `%s' v @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Neznámý rejstøík `%s' v @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Polo¾ka pro rejstøík `%s' je mimo v¹echny uzly"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(mimo v¹echny uzly)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "Viz"
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr ""
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Chybný typ v insertion_type_pname"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "Výpoèetní zásobník pøetekl"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "písmenkování pøeteklo, znovu zaèínám na %c"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s vy¾aduje argument : formátovaè pro %citem"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr ""
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "`@end' vy¾aduje `%s', ale vidí `%s'"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Chybí odpovídající `%cend %s'"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s vy¾aduje písmeno nebo èíslici"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr ""
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "@%s není myslitelné uvnitø `@%s' bloku"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "proto¾e vá¹ uzel @top by mìl být uzavøen v @ifnottex spí¹e ne¾ v @ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu spatøeno pøed prvním uzlem, vytvoøen uzel `Top'"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "@%s není myslitelné uvnitø `@%s' bloku"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Nepárový `%c%s'"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "`%c%s' potøebuje nìjaký argument"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, fuzzy, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Chybný argument pro `%s', `%s', pou¾ívám `%s'"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s není myslitelné uvnitø `@%s' bloku"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx není myslitelný uvnitø `%s' bloku"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s nalezen mimo vkládaný blok"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s není platný kód jazyka (podle ISO 639)"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "%s: neznámý pøepínaè `--%s'\n"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s vy¾aduje `i' nebo `j' jako argument, ne `%c'"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s vy¾aduje jeden znak `i' nebo `j' jako argument"
@@ -2173,7 +2352,7 @@ msgstr "makro `%s' ji¾ bylo definováno"
 msgid "here is the previous definition of `%s'"
 msgstr "zde je pøedchozí definice `%s'"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, fuzzy, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "\\ pøi expanzi makra následováno `%s' místo \\ nebo jména parametru"
@@ -2183,104 +2362,114 @@ msgstr "\\ pøi expanzi makra následováno `%s' místo \\ nebo jména parametru"
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makro `%s' volané na øádku %d s pøíli¹ mnoha argumenty"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend makro nebylo nalezeno"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg je u¾iteèné pouze pro jedno-argumentová makra"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "pomíchané @end %s s @%s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Pøíli¹ mnoho chyb!  Konec.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: varování: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "©patnì umístìný znak %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Více informací získáte pøíkazem `%s --help'.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:350
+#: makeinfo/makeinfo.c:354
 #, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:386
+#: makeinfo/makeinfo.c:391
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2288,24 +2477,27 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2315,7 +2507,7 @@ msgid ""
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2335,7 +2527,7 @@ msgid ""
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2344,20 +2536,21 @@ msgid ""
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 #, fuzzy
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "\n"
 "  Implicitní nastavení pro podmínky @if... zále¾í na výstupním formátu:\n"
@@ -2381,84 +2574,77 @@ msgstr ""
 "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n"
 "zasílejte na <cs@li.org> (èesky)."
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s argument musí být èíslo ne `%s'.\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "Výstup %s pro expanzi makra nelze otevøít"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, fuzzy, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "Výstup %s pro expanzi makra nelze otevøít"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: argument pro --paragraph-indent musí být èíslo|`none'|`asis', ale ne `%"
 "s'.\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: argument k --footnote-style musí být `separate'|`end', ale ne `%s'.\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: chybí argument jména souboru.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "Oèekáváno `%s'"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Soubor `%s' nenalezen v `%s'"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Vynechávám expanzi makra na stdout a expanze jde jako Info výstup.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Vytváøím %s soubor `%s' ze souboru `%s'.\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr ""
-"Toto je Info soubor %s, produkován programem makeinfo verze %s ze souboru %"
-"s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2466,81 +2652,81 @@ msgstr ""
 "%s: Výstupní soubor maker `%s' byl odstranìn, proto¾e byly nalezeny chyby;\n"
 "u¾ijte pøepínaè --force k ponechání souboru.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: Výstupní soubor `%s' byl odstranìn, proto¾e byly nalezeny chyby;\n"
 "u¾ijte pøepínaè --force k ponechání souboru.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Neznámý pøíkaz `%s'"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "Pou¾ijte závorky k zadání pøíkazu jako argumentu @%s"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s oèekáváno `{...}'"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "Nepárová }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "Funkce neexistuje!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s chybìjící uzavírací závorka"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, fuzzy, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "Soubor `%s' nenalezen v `%s'"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, fuzzy, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "pøíkaz @image postrádá jméno souboru"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Pro `%s' není hodnota}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s po¾aduje jméno"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Vstupní soubor skonèil a pøíkaz `@end %s' nebyl nalezen"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
@@ -2549,163 +2735,130 @@ msgstr ""
 msgid "Missing } in @multitable template"
 msgstr "Chybìjící } v @multitable vzoru"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignoruji zbloudilý text `%s' po pøíkazu @multitable"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Pøíli¹ mnoho sloupcù v multitabulkové polo¾ce (max %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, fuzzy, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "sloupec #%d v multitabulce nelze vybrat"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "pøíkaz `@tab' ignorován, je mimo multitabulku"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Vícesloupcový výstup z posledního øádku:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* sloupec #%d: výstup = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Uzel `%s' ji¾ byl definován na øádku %d"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Formátování uzlu %s...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, fuzzy, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Uzel `%s' vy¾aduje pøíkaz na vytváøení sekcí (tøeba %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Pøíkazu `%c%s' nebyl zadán název uzlu"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr ""
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "Dal¹í:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Pøedchozí:"
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "Nahoru:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s se odkazuje na neexistující uzel `%s'"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "Menu"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Odkaz"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, fuzzy, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "Následující uzel uzlu `%s' neukazuje na tento"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Tento uzel (%s) má chybný odkaz na pøedchozí uzel"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "Pøedchozí"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Pøedchozí uzel uzlu `%s' neukazuje na tento"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Tento uzel (%s) má chybný odkaz na následující uzel"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "Nahoru"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 "Uzel `%s' postrádá polo¾ku menu pro `%s' navzdory tomu, ¾e je jeho vy¹¹ím "
 "uzlem"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "na uzel `%s' se bylo odkazováno %d krát"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "uzel `%s' - nesmìøuje na nìj ¾ádný odkaz"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Výstupní soubor `%s' nelze vytvoøit."
@@ -2720,268 +2873,104 @@ msgstr "Dodatek %c "
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "Interní chyba (hledání sekcí) \"%s\"!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Interní chyba (hledání sekcí) \"%s\"!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s je zastaralý; pou¾ijte %c%s"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Uzel s %ctop jako sekcí ji¾ existuje"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Ji¾ zde je nejvy¹¹í (%ctop) uzel"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop je pou¾it pøed %cnode, pøesmìrováno na %s"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Obsah"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Krátký obsah"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: varování: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " pro %s"
-
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "Více informací získáte pøíkazem `%s --help'.\n"
-
-#: util/install-info.c:434
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Pou¾ití: %s [PØEPÍNAÈ]... [INFO-SOUBOR [DIR-SOUBOR]]\n"
-"\n"
-"Instaluje nebo ma¾e polo¾ky ze souboru INFO-SOUBOR v Info adresáøi DIR-"
-"SOUBOR.\n"
-"\n"
-"Pøepínaèe:\n"
-"--delete           sma¾e existující polo¾ky INFO-SOUBORu z DIR-SOUBORU;\n"
-"                   nevkládá ¾ádné nové.\n"
-"--dir-file=JMÉNO   zadání jména adresáøového souboru Infa. Rovnocenné\n"
-"                   s pou¾itím argumentu DIR-SOUBOR.\n"
-"--entry=TEXT       vlo¾í text jako polo¾ku Info adresáøe. TEXT musí mít "
-"formát\n"
-"                   jako øádek polo¾ky Info menu, plus nula nebo více extra\n"
-"                   øádkù zaèínajících mezerou. Jestli¾e zadáte více ne¾ "
-"jednu\n"
-"                   polo¾ku, budou pøidány v¹echny. Jestli¾e nezadáte ¾ádnou\n"
-"                   polo¾ku, budou získány z informací v Info souboru.\n"
-"--help             vypí¹e tuto nápovìdu a skonèí\n"
-"--info-file=SOUBOR zadání Info souboru pro instalaci do Info adresáøe.\n"
-"                   Rovnocenné s argumentem INFO-SOUBOR.\n"
-"--info-dir=ADRESÁØ stejné jako --dir-file=ADRESÁØ/dir.\n"
-"--item=TEXT        stejné jako --entry=TEXT.\n"
-"                   Polo¾ka Info adresáøe je aktuální polo¾ka menu.\n"
-"--quiet            potlaèí varování.\n"
-"--remove           stejné jako --delete.\n"
-"--section=SEKCE    vlo¾í polo¾ky adresáøe do sekce SEKCE Info adresáøe.\n"
-"                   Jestli¾e je zadáno více sekcí, jsou v¹echny polo¾ky\n"
-"                   pøidány do v¹ech zadaných sekcí. Jestli¾e nejsou zadány\n"
-"                   ¾ádné sekce, pak jsou sekce získány z Info souboru.\n"
-"--version          vypí¹e oznaèení verze a skonèí.\n"
-"\n"
-"  Chyby v programu oznamujte na adrese <bug-texinfo@gnu.org> (pouze "
-"anglicky),\n"
-"obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky\n"
-"k pøekladu zasílejte na <cs@li.org> (èesky).\n"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "z"
 
-#: util/install-info.c:488
-#, fuzzy, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
+#: makeinfo/xml.c:2155
+msgid "on"
 msgstr ""
-"  Toto je soubor .../info/dir, který obsahuje nejvy¹¹í uzly hierarchie\n"
-"Info dokumentù a je nazýván (dir)Top. Kdy¾ poprvé spustíte Info dostanete\n"
-"se do tohoto uzlu.\n"
-"\n"
-"%s      Toto je vrchol INFO stromu\n"
-"\n"
-"    Tento (Adresáøový uzel) obsahuje menu hlavních témat.\n"
-"  Stiskem \"q\" Info ukonèíte, stiskem \"?\" získáte seznam v¹ech Info "
-"pøíkazù,\n"
-"  stiskem \"d\" se vrátíte sem, stiskem \"h\" získáte nápovìdu pro "
-"zaèáteèníky,\n"
-"  napsáním \"mEmacs\" si zobrazíte manuál k Emacsu, atd.\n"
-"\n"
-"    Pokud chcete v Emacsu zobrazit obsah polo¾ky menu nebo následovat "
-"køí¾ový\n"
-"  odkaz, mù¾ete to provést kliknutím prostøedním tlaèítkem my¹i.\n"
-"\n"
-"* Menu:\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: %s nelze èíst a %s nelze vytvoøit\n"
 
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: prázdný soubor"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY bez odpovídajícího END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY bez pøedchozího START-INFO-DIR-ENTRY"
-
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
 msgstr ""
 
-#: util/install-info.c:1236
+#: makeinfo/xref.c:252
 #, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Info soubor zadejte pouze jednou.\n"
-
-#: util/install-info.c:1284
-#, c-format
-msgid "excess command line argument `%s'"
-msgstr "nadbyteèný argument `%s' v pøíkazovém øádku"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
-"Vstupní soubor nezadán; pou¾itím pøepínaèe --help získáte bli¾¹í informace."
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
 msgstr ""
-"Adresáø nebyl zadán; pou¾itím pøepínaèe `--help' získáte bli¾¹í informace"
 
-#: util/install-info.c:1313
-#, c-format
-msgid "no info dir entry in `%s'"
-msgstr "v Info adresáøi `%s' není ¾ádná polo¾ka"
+#: makeinfo/xref.c:390
+#, fuzzy, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c"
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "polo¾ka menu `%s' ji¾ pro soubor `%s' existuje"
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "V tomto uzlu není køí¾ový odkaz."
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "pro `%s' nebyly nalezeny ¾ádné polo¾ky"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr ""
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "vypí¹e tuto nápovìdu a skonèí"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "zanechá doèasné soubory po ukonèení"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "nezanechá doèasné soubory po ukonèení"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "zapí¹e výstup do SOUBORu"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "vypí¹e oznaèení verze a skonèí"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Generuje seøazený rejstøík pro ka¾dý TeXovský výstupní SOUBOR.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr "SOUBOR... je obvykle `foo.%c%c' pro dokument `foo.texi'.\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -2990,27 +2979,420 @@ msgstr ""
 "\n"
 "Pøepínaèe:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: není texinfovský rejstøík"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "soubor %s nepovedlo se znovu otevøít"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: není texinfovský rejstøík"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "Na %s není èíslo stránky"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "polo¾ka %s následuje za polo¾kou se sekundárním jménem"
 
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "      a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto "
+#~ "øetìzce.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "              Také mù¾ete zadat jméno souboru ve tvaru (SOUBOR)UZEL.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "  %-10s  Pøesun na \"dal¹í\" uzel tohoto uzlu.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr "  %-10s  Pøesun do `adresáøového' uzlu. Rovnocenné s `g (DIR)'.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr "  %-10s  Pøesun do nejvy¹¹ího (Top) uzlu. Rovnocenné s `g Top'.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-forward-page-only]  Scroll forward within this node.\n"
+#~ msgstr "  %-10s  Posun o jeden øádek dopøedu.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[scroll-backward-page-only]  Scroll backward within this node.\n"
+#~ msgstr "  %-10s  Posun o jeden øádek dozadu.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "      a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto "
+#~ "øetìzce.\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr ""
+#~ "--- Pou¾ijte `\\[history-node]' nebo `\\[kill-node]' pro ukonèení ---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr "  %-10s  Skok na následující hypertextový odkaz v tomto uzlu.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "Pou¾ití: %s [PØEPÍNAÈ]... [POLO®KA-MENU...]\n"
+#~ "\n"
+#~ "  Umo¾òuje èíst dokumentaci v Info formátu.\n"
+#~ "\n"
+#~ "Pøepínaèe:\n"
+#~ "--apropos=SUBJEKT           hledá SUBJEKT ve v¹ech odkazech v¹ech "
+#~ "manuálù\n"
+#~ "--directory=ADRESÁØ         kromì promìnné INFOPATH prohledává i tento\n"
+#~ "                            ADRESÁØ\n"
+#~ "--dribble=SOUBOR            ulo¾í klávesy, které stiskl u¾ivatel do "
+#~ "SOUBORu\n"
+#~ "--file=SOUBOR               zadání info souboru, který se má prohlí¾et\n"
+#~ "--help                      vypí¹e tuto nápovìdu a skonèí\n"
+#~ "--index-search=ØETÌZEC      skok na uzel urèený v rejstøíku ØETÌZCEM\n"
+#~ "--node=JMÉNO_UZLU           zadání uzlù, v prvním nav¹tíveném info "
+#~ "souboru\n"
+#~ "--output=SOUBOR             vypí¹e nav¹tívené uzly do SOUBORu\n"
+#~ "--restore=SOUBOR            klávesy, které mají být automaticky po\n"
+#~ "                            spu¹tení infa stisknuty, ète ze SOUBORu\n"
+#~ "--show-options, --usage     zobrazuje pøepínaèe pøíkazové øádky\n"
+#~ "--subnodes                  rekurzivnì vypí¹e polo¾ky menu\n"
+#~ "%s --vi=keys                  pou¾ije ovládání klávesami jako ve vi a "
+#~ "less\n"
+#~ "--version                   vypí¹e oznaèení verze a skonèí\n"
+#~ "\n"
+#~ "  První nepøepínaèový argument, jestli¾e je zadán, je polo¾ka menu, "
+#~ "která\n"
+#~ "má být po spu¹tìní nav¹tívena; tato polo¾ka je vyhledávána ve v¹ech "
+#~ "`dir'\n"
+#~ "souborech podle INFOPATH.\n"
+#~ "  Jestli¾e tato polo¾ka není zadána, info spojí v¹echny `dir' soubory a "
+#~ "uká¾e\n"
+#~ "výsledek. V¹echny zbývající argumenty jsou brány jako názvy polo¾ek "
+#~ "menu,\n"
+#~ "relativnì k prvnímu nav¹tívenému uzlu.\n"
+#~ "\n"
+#~ "Pøíklady:\n"
+#~ "  info                       zobrazí seznam dokumentace\n"
+#~ "  info emacs                 zobrazí uzel emacs ze seznamu dokumentace\n"
+#~ "  info emacs buffers         zobrazí uzel buffers z emacsového manuálu\n"
+#~ "  info --show-options emacs  zobrazí uzel s pøepínaèi pøíkazového øádku\n"
+#~ "                              pro emacs\n"
+#~ "  info -f ./foo.info         zobrazí soubor ./foo.info, nehledá v `dir' "
+#~ "soub.\n"
+#~ "\n"
+#~ "  Chyby v programu oznamujte na adrese <bug-texinfo@gnu.org> (pouze "
+#~ "anglicky),\n"
+#~ "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n"
+#~ "zasílejte na adresu <cs@li.org> (èesky).\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr ""
+#~ "              Vybírání polo¾ky menu zpùsobí zobrazení tohoto uzlu.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "              Také mù¾ete zadat jméno souboru ve tvaru (SOUBOR)UZEL.\n"
+
+#, fuzzy
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr "  %-10s  Hledání zadaného øetìzce v tomto Info souboru.\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "      a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto "
+#~ "øetìzce.\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "Pøechod na dal¹í uzel..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "Zobrazování první polo¾ky menu..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "Zobrazování dal¹ího uzlu..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "Pøesouvání %d krát nahoru, potom na dal¹í."
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "Pøesun na pøedchozí uzel v tomto oknì."
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "Pøesun nahoru v tomto oknì."
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "Pøesun na poslední polo¾ku menu pøedchozího uzlu."
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "Funkce"
+
+#~ msgid "Macro"
+#~ msgstr "Makro"
+
+#~ msgid "Special Form"
+#~ msgstr "Speciální forma"
+
+#~ msgid "Variable"
+#~ msgstr "Promìnná"
+
+#~ msgid "User Option"
+#~ msgstr "U¾ivatelská volba"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Instance promìnné"
+
+#~ msgid "Method"
+#~ msgstr "Metoda"
+
+#~ msgid "Untitled"
+#~ msgstr "Neoznaèeno"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr ""
+#~ "Toto je Info soubor %s, produkován programem makeinfo verze %s ze souboru "
+#~ "%s.\n"
+
+#~ msgid "Next:"
+#~ msgstr "Dal¹í:"
+
+#~ msgid "Previous:"
+#~ msgstr "Pøedchozí:"
+
+#~ msgid "Up:"
+#~ msgstr "Nahoru:"
+
+#~ msgid "Menu"
+#~ msgstr "Menu"
+
+#~ msgid "Cross"
+#~ msgstr "Odkaz"
+
+#~ msgid "Prev"
+#~ msgstr "Pøedchozí"
+
+#~ msgid "Up"
+#~ msgstr "Nahoru"
+
+#~ msgid "see "
+#~ msgstr "viz"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "Pou¾ití: %s [PØEPÍNAÈ]... [INFO-SOUBOR [DIR-SOUBOR]]\n"
+#~ "\n"
+#~ "Instaluje nebo ma¾e polo¾ky ze souboru INFO-SOUBOR v Info adresáøi DIR-"
+#~ "SOUBOR.\n"
+#~ "\n"
+#~ "Pøepínaèe:\n"
+#~ "--delete           sma¾e existující polo¾ky INFO-SOUBORu z DIR-SOUBORU;\n"
+#~ "                   nevkládá ¾ádné nové.\n"
+#~ "--dir-file=JMÉNO   zadání jména adresáøového souboru Infa. Rovnocenné\n"
+#~ "                   s pou¾itím argumentu DIR-SOUBOR.\n"
+#~ "--entry=TEXT       vlo¾í text jako polo¾ku Info adresáøe. TEXT musí mít "
+#~ "formát\n"
+#~ "                   jako øádek polo¾ky Info menu, plus nula nebo více "
+#~ "extra\n"
+#~ "                   øádkù zaèínajících mezerou. Jestli¾e zadáte více ne¾ "
+#~ "jednu\n"
+#~ "                   polo¾ku, budou pøidány v¹echny. Jestli¾e nezadáte "
+#~ "¾ádnou\n"
+#~ "                   polo¾ku, budou získány z informací v Info souboru.\n"
+#~ "--help             vypí¹e tuto nápovìdu a skonèí\n"
+#~ "--info-file=SOUBOR zadání Info souboru pro instalaci do Info adresáøe.\n"
+#~ "                   Rovnocenné s argumentem INFO-SOUBOR.\n"
+#~ "--info-dir=ADRESÁØ stejné jako --dir-file=ADRESÁØ/dir.\n"
+#~ "--item=TEXT        stejné jako --entry=TEXT.\n"
+#~ "                   Polo¾ka Info adresáøe je aktuální polo¾ka menu.\n"
+#~ "--quiet            potlaèí varování.\n"
+#~ "--remove           stejné jako --delete.\n"
+#~ "--section=SEKCE    vlo¾í polo¾ky adresáøe do sekce SEKCE Info adresáøe.\n"
+#~ "                   Jestli¾e je zadáno více sekcí, jsou v¹echny polo¾ky\n"
+#~ "                   pøidány do v¹ech zadaných sekcí. Jestli¾e nejsou "
+#~ "zadány\n"
+#~ "                   ¾ádné sekce, pak jsou sekce získány z Info souboru.\n"
+#~ "--version          vypí¹e oznaèení verze a skonèí.\n"
+#~ "\n"
+#~ "  Chyby v programu oznamujte na adrese <bug-texinfo@gnu.org> (pouze "
+#~ "anglicky),\n"
+#~ "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky\n"
+#~ "k pøekladu zasílejte na <cs@li.org> (èesky).\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "polo¾ka menu `%s' ji¾ pro soubor `%s' existuje"
+
+#, fuzzy
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr "  %-10s  Výbìr první ... deváté polo¾ky menu uzlu.\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "na uzel `%s' se bylo odkazováno %d krát"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "  Copyright (C) %s 1996 Free Software Foundation, Inc.\n"
+#~ "  Toto je volné programové vybavení, které je zcela BEZ ZÁRUKY. Podmínky "
+#~ "pro\n"
+#~ "kopírování a roz¹iøování naleznete v Obecné veøejné licenci GNU (GNU "
+#~ "General\n"
+#~ "Public Licence). Více informací získáte ve zdrojových textech v souboru\n"
+#~ "COPYING.\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-arg je u¾iteèné pouze pro jedno-argumentová makra"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Obsah"
+
+#~ msgid "Short Contents"
+#~ msgstr "Krátký obsah"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "zanechá doèasné soubory po ukonèení"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "nezanechá doèasné soubory po ukonèení"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr "              uzlu, na který ukazuje první nalezená polo¾ka.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "  Copyright (C) %s 1996 Free Software Foundation, Inc.\n"
+#~ "  Toto je volné programové vybavení, které je zcela BEZ ZÁRUKY. Podmínky "
+#~ "pro\n"
+#~ "kopírování a roz¹iøování naleznete v Obecné veøejné licenci GNU (GNU "
+#~ "General\n"
+#~ "Public Licence). Více informací získáte ve zdrojových textech v souboru\n"
+#~ "COPYING.\n"
+
 #~ msgid "%s: Specify the Info directory only once.\n"
 #~ msgstr "%s: Info adresáø zadejte pouze jednou.\n"
 
@@ -3024,21 +3406,12 @@ msgstr "polo¾ka %s následuje za polo¾kou se sekundárním jménem"
 #~ msgid "Cannot specify more than one macro expansion output"
 #~ msgstr "Pro expanzi makra nelze zadat více ne¾ jeden výstup"
 
-#~ msgid "see "
-#~ msgstr "viz"
-
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c"
-
 #~ msgid "Node:"
 #~ msgstr "Uzel:"
 
 #~ msgid "%s: TOC should be here, but it was not found"
 #~ msgstr "%s: Obsah bìl být zde, ale nebyl nalezen"
 
-#~ msgid "virtual memory exhausted"
-#~ msgstr "virtuální pamì» vyèerpána"
-
 #, fuzzy
 #~ msgid "No `%s.png' or `.jpg', and no extension supplied"
 #~ msgstr "®ádný .png nebo .jpg soubor pro `%s'"
@@ -3050,14 +3423,6 @@ msgstr "polo¾ka %s následuje za polo¾kou se sekundárním jménem"
 #~ msgstr "`%s' nemá zadán vy¹¹í uzel"
 
 #, fuzzy
-#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-#~ msgstr "  %-10s  Posun o jeden øádek dopøedu.\n"
-
-#, fuzzy
-#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-#~ msgstr "  %-10s  Posun o jeden øádek dozadu.\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "Email bug reports to bug-texinfo@gnu.org,\n"
 #~ "general questions and discussion to help-texinfo@gnu.org."
diff --git a/Build/source/utils/texinfo/po/da.gmo b/Build/source/utils/texinfo/po/da.gmo
index 55e147567a4..d7fd2203c41 100644
--- a/Build/source/utils/texinfo/po/da.gmo
+++ b/Build/source/utils/texinfo/po/da.gmo
diff --git a/Build/source/utils/texinfo/po/da.po b/Build/source/utils/texinfo/po/da.po
index 1b5524a8bc1..bec0876cb11 100644
--- a/Build/source/utils/texinfo/po/da.po
+++ b/Build/source/utils/texinfo/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.2e\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
 "PO-Revision-Date: 2002-11-08 09:13GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -15,132 +15,198 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: tilvalg '%s' er flertydig\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: tilvalg '--%s' tillader ikke en parameter\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: tilvalg '%c%s' tillader ikke en parameter\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: tilvalg '%s' kræver en parameter\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukendt tilvalg '--%s'\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukendt tilvalg '%c%s'\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ugyldigt tilvalg -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ugyldigt tilvalg -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: tilvalg kræver en parameter -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: tilvalg '-W %s' er flertydigt\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: tilvalg '-W %s' tillader ikke en parameter\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, fuzzy, c-format
+msgid "memory exhausted"
+msgstr "virtuel hukommelse opbrugt"
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "Gå et tegn frem"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "Gå et tegn tilbage"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "Gå til starten af linjen"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "Gå til slutning af linjen"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "Ryk et ord frem"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "Ryk et ord tilbage"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Slet tegnet under markøren"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "Slet tegnet efter markøren"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Afbryd eller afslut aktivitet"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Acceptér (eller gennemtving afslutning af) linjen"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Indsæt næste tegn råt"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Indsæt dette tegn"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Indsæt et tabulatortegn"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Transponér tegn ved markør"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Gendan indholdet fra sidste sletning"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "Skraldespand er tom"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Gendan en tidligere sletning"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "Slet resten af linjen"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "Slet bagud til linjestart"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "Slet resten af ordet"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "Slet ordet før markøren"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Ingen afslutninger"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Ikke afsluttet"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "Vis mulige afslutninger"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "Eneste afslutning"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "Én afslutning:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d afslutninger:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "Indsæt afslutning"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "Opbygger afslutninger..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "Rul afslutningsvinduet"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "Fodnoter kunne ikke vises"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr "Vis fodnoter, det hører til dette emne i et andet vindue"
 
@@ -148,73 +214,73 @@ msgstr "Vis fodnoter, det hører til dette emne i et andet vindue"
 msgid "---------- Footnotes ----------"
 msgstr "---------- Fodnoter -----------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "Slå en tekst op i denne fils indeks."
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "Finder indeksindgange..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "Fandt intet indeks."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Indeksindgang:"
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr "Gå til næste fundne indekspunkt fra sidste '\\[index-search]'-kommando"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "Ingen tidligere indeks søgetekst"
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Ingen indeksindgange."
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, fuzzy, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "Ingen %sindeksindgange indeholder \"%s\"."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "mere "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "KAN IKKE SE DETTE"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, fuzzy, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr "Fandt \"%s\" i %s. ('\\[next-index-match]' søger efter den næste.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, fuzzy, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "Skimmer \"%s\"'s indekser..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, fuzzy, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "Ingen tilgængelige info-filer har \"%s\" i sit index."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Gennemtrævl alle kendte Info-filers indekser for en tekst og opbyg en menu"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Indeks apropos:"
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -223,110 +289,98 @@ msgstr ""
 "\n"
 "* Menu: Emner, hvis indeks indeholder \"%s\":\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Prøv --help for mere information.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
-#, fuzzy, c-format
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
-msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"Der er INGEN garanti. Du må redistribuere denne software\n"
-"under GNU General Public License's betingelser.\n"
-"For mere information om dette, se filerne 'COPYING'.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "ingen indeksindgange blev fundet for '%s'\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr " -b, --speech-friendly        vær talesyntese-venlig.\n"
-
-#: info/info.c:597
-#, fuzzy, c-format
+#: info/info.c:598
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+#, fuzzy
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr " -b, --speech-friendly        vær talesyntese-venlig.\n"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Brug: %s [TILVALG]... [MENUPUNKT...]\n"
-"\n"
-"Læs dokumentationen i Info format.\n"
-"\n"
-"Tilvalg:\n"
-"      --apropos=STRENG         slå STRENG op i alle indekser og manualer.\n"
-"  -d, --directory=KATALOG      tilføj KATALOG til INFOPATH.\n"
-"      --dribble=FILNAVN        gem brugerens tastetryk i FILNAVN.\n"
-"  -f, --file=FILNAVN           angiv Info fil, der skal besøges.\n"
-"  -h, --help                   vis denne hjælp og afslut.\n"
-"      --index-search=TEKST     gå til det punkt, indeks-indgang TEKST "
-"angiver.\n"
-"  -n, --node=EMNENAVN          angiv emner i først besøgte Info-fil.\n"
-"  -o, --output=FILNAVN         udlæs de valgte emner til FILNAVN.\n"
-"  -R, --raw-escapes            fjern ikke ANSI-escapekoder fra manualsider\n"
-"      --restore=FILNAVN        indlæs de første tastetryk fra FILNAVN.\n"
-"  -O, --show-options, --usage  gå til emnet kommandolinje-tilvalg.\n"
-"%s      --subnodes               udlæs menupunkter rekursivt.\n"
-"      --vi-keys                benyt 'vi'- og 'less'-agtige tastebindinger.\n"
-"      --version                vis versionsinformation og afslut.\n"
-"\n"
-"Det første ikke-tilvalgs-parameter er menuindgangen der startes fra;\n"
-"den  søges i alle 'katalog'-filer angivet i miljøvariablen INFOPATH.\n"
-"Hvis ikke dette parameter er angivet, samler info alle 'katalog'-filer\n"
-" og viser resultatet.\n"
-"Resterende parametre angiver navne på menupunkter i forhold til "
-"startpunktet.\n"
-"\n"
-"Eksempler:\n"
-"  info                       viser top-niveau katalog menu\n"
-"  info emacs                 start ved emnet emacs i topniveau kataloget\n"
-"  info emacs buffers         start ved emnet 'buffers' i emacs-manualen\n"
-"  info --show-options emacs  start ved emnet med emacs' kommandolinje "
-"tilvalg\n"
-"  info -f ./xxx.info         vis filen ./xxx.info uden at søge i katalog\n"
-
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -339,406 +393,412 @@ msgstr ""
 "oversættelsesfejl til claus_h@image.dk\n"
 "Texinfos hjemmeside: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Kan ikke finde emnet '%s'."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Kan ikke finde emnet '(%s)%s'."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "Kan ikke finde et vindue!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "Punktet optræder ikke i dette vindues emne!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "Kan ikke slette det sidste vindue."
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "Ingen menu i dette emne."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "Ingen fodnoter i dette emne."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "Ingen krydsreferencer i dette emne."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Ingen '%s'-peger mod dette emne."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Ukendt Info kommando '%c'; prøv '?' for hjælp."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Info kan ikke køre på terminal type '%s'."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "Du er i forvejen ved emnets sidste side."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "Du er i forvejen ved emnets første side."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "Kun ét vindue."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "Det resulterende vindue ville være for lille."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Ikke nok plads til et hjælpevindue. Fjern venligst et vindue."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
-"Grundlæggende kommandoer i Info-vinduer\n"
-"***************************************\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "\\%-10[quit-help]  Afslut denne hjælp.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Afslut hele Info-programmet.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Kør info introduktionen.\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"Valg af ander emnder:\n"
-"---------------------\n"
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[forrige linje]  Rul en linje tilbage.\n"
+
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[næste linje]  Rul 1 linje frem.\n"
+
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Rul en side tilbage.\n"
+
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Rul en side frem.\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  Flyt til emnet 'næste' i dette emne.\n"
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Gå til starten af emnet.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  Flyt til emnet 'Forrige' i dette emne.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Flyt til emnet 'Op' i dette emne.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Gå til enden af emnet.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
-"\\%-10[menu-item]  Vælg menupunkt angivet ved navn.\n"
-"              Valg af menupunkt vælger et andet emne.\n"
+"\\%-10[move-to-next-xref]  Hop til næste hypertekst-henvisning i dette "
+"emne.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
+#, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
-"\\%-10[xref-item]  Følg en krydshenvisning.  Indlæser referencens navn.\n"
+"\\%-10[select-reference-this-line]  Følg hypertekst-henvisningen under "
+"markøren.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr "\\%-10[history-node]  Flyt til vinduets sidste synlige emne-felt.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr ""
-"\\%-10[move-to-next-xref]  Hop til næste hypertekst-henvisning i dette "
-"emne.\n"
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[prev-node]  Flyt til emnet 'Forrige' i dette emne.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr ""
-"\\%-10[move-to-prev-xref]  Hop til næste hypertekst-henvisning i dette "
-"emne.\n"
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[next-node]  Flyt til emnet 'næste' i dette emne.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr ""
-"\\%-10[select-reference-this-line]  Følg hypertekst-henvisningen under "
-"markøren.\n"
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Flyt til emnet 'Forrige' i dette emne.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
-"\\%-10[dir-node]  Flyt til emnet 'katalog'. Svarer til 'g (KATALOG)'.\n"
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Flyt til emnet 'næste' i dette emne.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr "\\%-10[top-node]  Gå til emnet Top. Svarer til '\\[goto-node] Top'.\n"
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Flyt til emnet 'Op' i dette emne.\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"Bevægelser indenfor et emne:\n"
-"----------------------------\n"
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[end-of-node]  Gå til enden af emnet.\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[end-of-node]  Gå til enden af emnet.\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Gå til starten af emnet.\n"
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "  %-10s  Vælg første ... niende punkt i emnets menu.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Gå til enden af emnet.\n"
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Vælg sidste punkt i emnets menu.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "\\%-10[næste linje]  Rul 1 linje frem.\n"
+#, fuzzy
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  Vælg menupunkt angivet ved navn.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "\\%-10[forrige linje]  Rul en linje tilbage.\n"
+#, fuzzy
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr ""
+"\\%-10[xref-item]  Følg en krydshenvisning.  Indlæser referencens navn.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Rul en side frem.\n"
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  Gå til emne angivet ved navn.\n"
 
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Rul en side tilbage.\n"
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  Søg fremad efter en given streng,\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[prev-node]  Flyt til emnet 'Forrige' i dette emne.\n"
+
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
 msgstr ""
-"Andre kommandoer:\n"
-"-----------------\n"
+"  %-10s  Søg efter en angivet tekst i denne Info-fils indeksindgange,\n"
 
 #: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "\\%-10[menu-digit]  Vælg første til niende punkt i emnets menu.\n"
-
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "\\%-10[last-menu-item]  Vælg sidste punkt i emnets menu.\n"
-
-#: info/infodoc.c:81
+#, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 "\\%-10[index-search]  Søg efter den angivne streng i denne Infos "
 "indeksindgange\n"
 "              og vælg det emne, der refereres til af den først fundne "
 "indgang.\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  Gå til emne angivet ved navn.\n"
-"              Du kan også medtage filnavn, som (FILNAVN)EMNENAVN.\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  Søg fremad efter en given streng\n"
-"              og vælg emnet med den næste forekomst.\n"
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "Afbryd nuværende aktivitet"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  Sæg baglæns efter en given streng\n"
-"              og vælg emnet med den forrige forekomst.\n"
+"Grundlæggende kommandoer i Info-vinduer\n"
+"***************************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Afslut hjælp.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Afslut hele Info-programmet.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Kør info introduktionen.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Flyt til emnet 'næste' i dette emne.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Flyt til emnet 'Forrige' i dette emne.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Gå et niveau op.\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Vælg menupunkt angivet ved navn.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
-msgstr "              Valg af menupunkt vælger et andet emne.\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"\\%-10[menu-item]  Vælg menupunkt angivet ved navn.\n"
+"              Valg af menupunkt vælger et andet emne.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Følg en krydshenvisning.  Indlæser referencens navn.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Flyt til vinduets sidste synlige emne-felt.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Hop til næste hypertekst-lænke i dette emne.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Følg hypertekst-lænken under markøren.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Flyt til emnet 'katalog'. Svarer til 'g (KATALOG)'.\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Gå til emnet Top. Svarer til 'g Top'.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Bevægelser indenfor et emne:\n"
+"----------------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Rul en side frem.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Rul en side tilbage.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Gå til starten af emnet.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Gå til enden af emnet.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Rul 1 linje frem.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Rul en linje tilbage.\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Andre kommandoer:\n"
+"-----------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  Vælg første ... niende punkt i emnets menu.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Vælg sidste punkt i emnets menu.\n"
 
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-"  %-10s  Søg efter en angivet tekst i denne Info-fils indeksindgange,\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
+"\\%-10[index-search]  Søg efter den angivne streng i denne Infos "
+"indeksindgange\n"
 "              og vælg det emne, der refereres til af den først fundne "
 "indgang.\n"
 
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Gå til emne angivet ved navn.\n"
-
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr "              Du kan også medtage filnavn, som (FILNAVN)EMNENAVN.\n"
-
-#: info/infodoc.c:133
-#, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Søg fremad efter en given streng,\n"
+msgstr ""
+"\\%-10[goto-node]  Gå til emne angivet ved navn.\n"
+"              Du kan også medtage filnavn, som (FILNAVN)EMNENAVN.\n"
 
-#: info/infodoc.c:134 info/infodoc.c:136
+#: info/infodoc.c:129
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
-msgstr "              og vælg emne med den næste forekomst.\n"
+msgstr ""
+"\\%-10[search]  Søg fremad efter en given streng\n"
+"              og vælg emnet med den næste forekomst.\n"
 
-#: info/infodoc.c:135
-#, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Søg baglæns efter en given streng\n"
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  Søg fremad efter en given streng\n"
+"              og vælg emnet med den næste forekomst.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "Den nuværende søgesti er:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -746,7 +806,7 @@ msgstr ""
 "Tilgængelige kommandoer i infovinduer:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -754,7 +814,7 @@ msgstr ""
 "Tilgængelige kommandoer i ekko-område:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -763,7 +823,7 @@ msgstr ""
 "Følgende kommandoer kan kun køres via %s:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -771,83 +831,73 @@ msgstr ""
 "Følgende kommandoer kan slet ikke køres:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-"--- Benyt '\\[history-node]' eller '\\[kill-node]' for at afslutte ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "Vis hjælp"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "Besøg infoemnet '(info)Help'"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "Vis dokumentation for TAST"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Beskriv tast: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s er ikke defineret."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s er ikke defineret."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s er defineret til %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Vis hvad der skal tastes, for at udføre en given kommando"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Hvor er kommando: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "'%s' er ikke på nogen taster"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s kan kun udføres via %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s kan udføres via %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Der er ingen funktion kaldet '%s'"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Der er INGEN garanti. Du må redistribuere denne software\n"
-"under GNU General Public License's betingelser.\n"
-"For mere information om dette, se filerne 'COPYING'.\n"
+"Valg af ander emnder:\n"
+"---------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -960,22 +1010,22 @@ msgstr ""
 "Oversæt infokey-kildefil til infokey-fil. Læser INDDATA-FIL (standard\n"
 "$HOME/.infokey) og skriver oversat key-fil til $HOME/.info.\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Ignorerer ugyldig infokey-fil '%s' - for lille"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Ignorerer ugyldig infokey-fil '%s' - for stor"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "Fejl under læsning af infokey-fil '%s' - \"short read\""
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -983,12 +1033,12 @@ msgstr ""
 "Ugyldig infokey-fil '%s' (ugyldige magiske tal) -- kør infokey for at "
 "opdatere den"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr "Din infokey-fil '%s' er for gammel -- kør infokey for at opdatere den"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -996,7 +1046,7 @@ msgstr ""
 "Ugyldig infokey-fil '%s' (ugyldig afsnitslængde) -- kør infokey for at "
 "opdatere den"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -1004,46 +1054,46 @@ msgstr ""
 "Ugyldig infokey-fil '%s' (ugyldig afsnitskode) -- kør infokey for at "
 "opdatere den"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "Ugyldige data i infokey-fil -- visse tastebindinger blev ignoreret"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "Ugyldige data i infokey-fil -- visse variabelindstillinger blev ignoreret"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "Indlæs navnet på en info-kommando og beskriv den"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Beskriv kommando: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "Indlæs et kommandonavn i ekko-området og udfør den"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Kan ikke udføre en 'ekko-område'-kommando her."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, fuzzy, c-format
 msgid "Undefined command: %s"
 msgstr "Ukendt kommando '%s'"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "Sæt højden på det viste vindue"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Sæt skærmhøjden til (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1052,12 +1102,12 @@ msgstr ""
 "   Kildetekster gennemtrævlet for at inkludere filen;\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kunne ikke bearbejde filen %s.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1069,7 +1119,7 @@ msgstr ""
 "  (Fil)Emne                         linjer  Størr. Indeholder fil\n"
 "  ----------                        -----   ----   ---------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1077,24 +1127,29 @@ msgstr ""
 "Her er menuen med emner, du har besøgt for nylig.\n"
 "Vælg et fra denne menu eller brug '\\[history-node]' i et andet vindue,\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "Opret et vindue med en menu, der indeholder alle nyligt besøgte emner"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Vælg et emne, som tidligere har været besøgt i et synligt vindue"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Vælg besøgt emne: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Referencen forsvandt! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1103,504 +1158,508 @@ msgstr ""
 "Velkommen til Info version %s. Skriv \\[get-help-window] for hjælp.  \\[menu-"
 "item] for menupunkt."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "Gå ned til næste linje"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "Gå op til forrige linje"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "Gå til linjeslutning"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "Gå til linjestart"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "Næste"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Følger emnet Næste..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Vælger første menupunkt..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Vælger emnet 'Næste'..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "Går 'Op' %d gang(e), derefter 'Næste'."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "Ikke flere emner i dette dokument."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "Ingen 'Forrige' i dette emne."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Går til 'Forrige' i dette vindue."
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "Ingen 'Forrige' eller 'Op' for dette emne i dette dokument."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Går 'Op' i dette vindue."
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Går til 'Forrige's sidste menupunkt."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "Gå frem eller ned gennem emne-strukturen"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "Gå tilbage eller op gennem emne-strukturen"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "Rul tilbage i vinduet"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr "Rul frem i vinduet og sæt standard vinduesstørrelse"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr "Rul frem i vinduet i samme emne"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr "Rul frem i vinduet i samme emne og sæt standard vinduesstørrelse"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "Rul tilbage i vinduet"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr "Rul tilbage i vinduet og sæt standard vinduesstørrelse"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr "Rul tilbage i vinduet indenfor samme emne"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
 "Rul tilbage i vinduet indenfor samme emne og sæt standard vinduesstørrelse"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "Gå til starten af dette emne"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "Gå til slutningen af dette emne"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "Rul N linjer ned"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "Rul N linjer op"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "Rul en halv skærmstørrelse ned"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "Rul en halv skærmstørrelse op"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "Vælg det næste vindue"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "Vælg det forrige vindue"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "Opdel nuværende vindue"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "Slet nuværende vindue"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "Kan ikke slette et permanent vindue"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "Slet alle andre vinduer"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "Rul det andet vindue"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "Rul det andet vindue baglæns"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "Forstør (eller formindsk) dette vindue"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "Fordel det tilgængelige skærmområde mellem de synlige vinduer"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Vælg/fravælg linjeombrydning i nuværende vindue"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "Vælg emnet Næste"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "Vælg emnet Forrige"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "Vælg emnet 'Op'"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "Vælg det sidste emne i filen"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "Dette vindue har ingen yderligere emner"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "Vælg det første emne i filen"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "Vælg det sidste punkt i emnets menu"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "Vælg dette menupunkt"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Der er ikke %d punkter i denne menu."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menupunkt (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Menupunkt: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Følg krydsreference (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "Følg krydsreference: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "Indlæs et menupunkt og vælg dets emne"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Indlæs en fodnote eller krydsreference og vælg dets emne"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "Flyt til starten af dette emnes menu"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "Besøg så mange menupunkter på en gang, som det er muligt"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "Indlæs et emnenavn og vælg det"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "Gå til emne: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Ingen menu i emne '%s'."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Intet menupunkt '%s' i emne '%s'."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Kunne ikke finde emnet, der refereres til af '%s' i '%s'."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Indlæs en liste med menuer, der starter i katalog, og følg dem"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "Følg menuer: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Find emnet, der beskriver hvordan programmet startes"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Find programstart emne for [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "Indlæs en man-side reference og vælg den"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "Hent man-side: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "Vælg emnet 'Top' i filen"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "Vælg emnet '(katalog)'"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Fjern emne (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Kan ikke fjerne emnet '%s'"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "Kan ikke fjerne det sidste emne"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "Vælg det sidst valgt emne"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "Fjern dette emne"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "Indlæs et filnavn og vælg det"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Find fil: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Kan ikke finde '%s'."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Kunne ikke oprette uddatafil '%s'."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Færdig."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "Skriver emnet %s..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr ""
 "Udskriv indholdet af dette emne (ved videreførsel gennem INFO_PRINT_COMMAND)"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Kan ikke åbne videreførsel til '%s'."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "Udskriver emnet %s..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "Slet bagud til linjestart"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Leder efter underfilen %s ..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr "Indlæs en tekst og søg efter den uden versalfølsomhed"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "Indlæs en tekst og søg for den"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "Indlæs en tekst og søg baglæns efter den"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "%s%sefter tekst [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr " versalfølsomt"
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "Søg baglæns"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "Søg"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " versalfølsomt"
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "Søgning mislykkedes."
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "Gentag sidste søgning i samme retning"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "Ingen tidligere søgetekst"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "Gentag sidste søgning i modsat retning"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "Søg interaktivt efter en tekst, mens du skriver den"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "I-søgning baglæns: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "I-søgning baglæns: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "I-søgning: "
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "I-søgning: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "Fejler "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "Gå til foregående krydsreference"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "Gå til næste krydsreference"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "Vælg reference eller menupunkt, der optræder på denne linje"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "Afbryd nuværende aktivitet"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Afslut"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "Flyt markør til bestemt linje i vinduet"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "Gentegn skærmen"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Afslut info"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr "Kør kommandoen, der er bundet til denne tasts småbogstavs-variant"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Ukendt kommando (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" er ugyldig"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, fuzzy, c-format
 msgid "`%s' is invalid"
 msgstr "\"%s\" er ugyldig"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "Tilføj dette tegn til det nuværende numeriske parameter"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Start (eller gang med 4) det nuværende numeriske parameter"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "Bruges internt af \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Virtuel hukommelse opbrugt!\n"
@@ -1636,520 +1695,673 @@ msgstr "Når \"On\", vil trufne søgestrenge blive markeret"
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "Bestemmer, hvad der sker, når rulning forsøges ved slutning af et emne"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "Antallet af linjer, der rulles, når markøren flytter ud af vinduet"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "Når \"On\", vil Info benytte og vise ISO Latin tegn"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "Bestemmer, hvad der sker, når rulning forsøges ved slutning af et emne"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "Forklar brugen af en variabel"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Beskriv variabel: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Sæt værdien af en Info-variabel"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Sæt variabel: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "Sæt %s til værdien (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "Sæt %s til værdien (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Mærker (tags) er forældede ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), linjer ---, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d linjer -%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d linjer -%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Underfil: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: tilvalg '%s' er flertydig\n"
+msgid "%s: warning: "
+msgstr "%s: advarsel: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: tilvalg '--%s' tillader ikke en parameter\n"
+msgid " for %s"
+msgstr " for %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: tilvalg '%c%s' tillader ikke en parameter\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tPrøv '%s --help' for en komplet tilvalgsliste.\n"
+
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Brug: %s [TILVALG]... TEXINFO-FIL...\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Rapportér fejl i programmet på engelsk til bug-texinfo@gnu.org,\n"
+"generelle spørgsmål og diskussion til help-texinfo@gnu.org,\n"
+"oversættelsesfejl til claus_h@image.dk\n"
+"Texinfos hjemmeside: http://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
+#, fuzzy, c-format
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Dette er filen .../info/dir, som indeholde det øverste\n"
+"emne i Info-hierakiet, kaldet (katalog)Top.\n"
+"Første gang, du kører Info, vil du indledningsvist se dette emne.\n"
+"\n"
+"%s\tDette er toppen af INFO-træet\n"
+"\n"
+"  Dette (katalog emnet) indeholder en menu med hovedemner.\n"
+"  Afslut med \"q\", \"?\" viser alle Info-kommandoer, \"d\" returnerer "
+"hertil,\n"
+"  \"h\" introducerer nybegyndere for Info,\n"
+"  \"mEmacs<Return>\" besøger Emacs-manualen, osv.\n"
+"\n"
+"  I Emacs kan du klikke med museknap 2 på et menupunkt eller krydsreference\n"
+"  for at vælge den.\n"
+"\n"
+"* Menu:\n"
+
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: tilvalg '%s' kræver en parameter\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: kunne ikke læse (%s) og kunne ikke oprette (%s)\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukendt tilvalg '--%s'\n"
+msgid "%s: empty file"
+msgstr "%s: tom fil"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY uden tilhørende END-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY uden tilhørende START-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukendt tilvalg '%c%s'\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ugyldigt tilvalg -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Angiv kun Info-filen én gang.\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ugyldigt tilvalg -- %c\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: tilvalg kræver en parameter -- %c\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: tilvalg '-W %s' er flertydigt\n"
+msgid "excess command line argument `%s'"
+msgstr "overskydende kommandolinjeparameter '%s'"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr "Ingen inddatafil angivet; prøv --help for mere information."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr "Intet katalog angivet; prøv --help for mere information."
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2278
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: tilvalg '-W %s' tillader ikke en parameter\n"
+msgid "no info dir entry in `%s'"
+msgstr "ingen infokatalog-indgang i '%s'"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "ingen indgange fundet for '%s'; intet slettet"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "Ugyldigt argument til %c%s"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "januar"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "februar"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "marts"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "april"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "maj"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "juni"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "juli"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "august"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "september"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "oktober"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "november"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "december"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "usandsynligt tegn %c i @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc parameter er kun versaler, derfor ingen virkning"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "'{' forventedes, men fandt '%c'"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "filslutning inden i en verb-blok"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "'}' forventedes, men fandt '%c'"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s er forældet"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp kræver et positivt tal, ikke '%s'"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Ugyldigt argument til %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "Ugyldigt argument til %c%s"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr ""
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "Manglende '}' i @def parameter"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Funktion"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Makro"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Specialform"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Variabel"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Brugerfunktion"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Instansvariabel"
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Ugyldigt argument til %c%s"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Metode"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "for"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "på"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Manglende '}' i @def parameter"
 
 #: makeinfo/defun.c:711
 #, fuzzy, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "Skal være i '%s' indsætning for at bruge '%sx'"
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr ""
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr ""
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr ""
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Se "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "'%c%s' kræver en parameter i '{...}', ikke blot '%s'"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "Ingen slutparentes for fodnote '%s'"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "Fodnote defineret uden forældre-emne"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Fodnoter indeni fodnoter er ikke tilladt"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "Fodnoter"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "Uden titel"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr "[uventet] ingen html-mærker at \"pop\"'e"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[uventet] ugyldigt emnenavn: '%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Ukendt indeks '%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info kan ikke håndtere ':' i indeksindgangen '%s'"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indeks '%s' eksisterer allerede"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Ukendt indeks '%s' og/eller '%s' i @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Ukendt indeks '%s' i @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Indgang til indeks '%s' udenfor et emne"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(udenfor et emne)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "Se "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr ""
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Broken-Type i insertion_type_pname"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "Overløb i optællingsstak (enumeration stack)"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "bogstavsoverløb, genstarter ved %c"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s kræver en parameter: formatteringen for %citem"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr ""
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "'@end' forventede '%s', men fandt '%s'"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Mangler en tilsvarende '%cend %s'"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s kræver et bogstav eller ciffer"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "filslutning indeni en verbatim-blok"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "@%s giver ingen mening i en '@%s'-blok"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu fundet før første @node, opretter 'Top' emne"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "måske skulle dit @top emne indsættes i @ifnottex i stedet for @ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu fundet før første emne, opretter emnet 'Top'"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "@%s giver ingen mening i en '@%s'-blok"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Uparret '%c%s'"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "'%c%s' kræver noget efterfølgende"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, fuzzy, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Ugyldigt parameter '%s', '%s', benytter '%s'"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s giver ingen mening i en '@%s'-blok"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx giver ingen mening i en '%s'-blok"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s fundet udenfor en indsætningsblok"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s er ikke en gyldig ISO 639 sprogkode"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "ukendt indkodningsnavn '%s'"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "beklager, indkodningen '%s' understøttes ikke"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ugyldig indkodet tegn '%s'"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s kræver 'i' eller 'j' som parameter, ikke '%c'"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s kræver et enkelt tegn 'i' eller 'j' som parameter"
@@ -2164,7 +2376,7 @@ msgstr "makro '%s' er allerede defineret"
 msgid "here is the previous definition of `%s'"
 msgstr "her er den forrige definition af '%s'"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, fuzzy, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "\\ i makroudfoldelse fulgt af '%s' i stedet for \\ eller parameternavn"
@@ -2174,46 +2386,50 @@ msgstr "\\ i makroudfoldelse fulgt af '%s' i stedet for \\ eller parameternavn"
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makro '%s' kaldt på linje %d med for mange parametre"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend makro ikke fundet"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg kan kun bruges til makroer med et enkelt parameter"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "uparret @end %s med @%s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "For mange fejl! Gav op.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: advarsel: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "Fejlplaceret %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv '%s --help' for mere information.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Brug: %s [TILVALG]... TEXINFO-FIL...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2223,17 +2439,17 @@ msgstr ""
 "Info-filer, der er lavet til at blive læst på skærmen med Emacs eller GNU "
 "Info.\n"
 
-#: makeinfo/makeinfo.c:350
-#, c-format
+#: makeinfo/makeinfo.c:354
+#, fuzzy, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
@@ -2248,39 +2464,44 @@ msgstr ""
 "  -v, --verbose               forklar, hvad der sker.\n"
 "      --version               vis versionsoplysninger og afslut.\n"
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 "Valg af format på uddata (ellers laves Info):\n"
 "      --docbook             lav DocBook XML i stedet for Info.\n"
 "      --html                lav HTML i stedet for Info.\n"
 "      --xml                 lav Texinfo XML i stedet for Info.\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
+#, fuzzy
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 "Generelle uddatatilvalg:\n"
 "  -E, --macro-expand FIL    send makroekspanderet kildetekst til FIL.\n"
 "                            ignorér eventuelle @setfilename.\n"
-"      --no-headers          undertryk emneadskillere, Node:­linjer og menuer\n"
+"      --no-headers          undertryk emneadskillere, Node:­linjer og "
+"menuer\n"
 "                             fra Infos uddata (og lav dermed simpel tekst)\n"
 "                             og skriv som udgangspunkt til standard-ud."
 "n      --no-split            undertryk opdeling af Info eller HTML-uddata,\n"
@@ -2288,18 +2509,21 @@ msgstr ""
 "      --number-sections     lav afsnits- og sektionsnumre.\n"
 "  -o, --output=FILE         send til FIL (katalog i tilfældet opdelt HTML),\n"
 
-#: makeinfo/makeinfo.c:386
-#, c-format
+#: makeinfo/makeinfo.c:391
+#, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2326,24 +2550,27 @@ msgstr ""
 "      --split-size=ANTAL      opdel Info-filer ved størrelsen ANTAL "
 "(standard %d).\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 #, fuzzy
 msgid ""
 "Input file options:\n"
@@ -2361,7 +2588,7 @@ msgstr ""
 "søgestien.\n"
 "  -U VAR                         afdefinér variablen VAR som med @clear.\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
@@ -2393,7 +2620,7 @@ msgstr ""
 "  --no-iftex        behandl ikke @iftex og @tex-tekst.\n"
 "  --no-ifxml        behandl ikke @ifxml og @xml-tekst.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -2409,19 +2636,21 @@ msgstr ""
 "  hvis der laves ren tekst er --ifplaintext aktiveret og de andre "
 "deaktiverede.\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
+#, fuzzy
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "Eksempler:\n"
 "  makeinfo xxx.texi                    skriv Info til xxx's @setfilename\n"
@@ -2433,161 +2662,156 @@ msgstr ""
 "  makeinfo --number-sections xxx.texi  skriv Info med nummererede afsnit\n"
 "  makeinfo --no-split xxx.texi         skriv én Info-fil, uanset størrelsen\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s parameter skal være et tal, ikke '%s'.\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, fuzzy, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: --paragraph-indent parameter skal være tal/'none'/'asis', ikke '%s'.\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: --footnote-style parameter skal være 'separate' eller 'end', ikke '%s'.\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mangler filparameter.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "Forventede '%s'"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kan ikke oprette kataloget '%s': %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Ingen '%s' fundet i '%s'"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Undlader makroudfoldelse til standard-ud, da Info-uddata sendes der.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Producerer %s file '%s' ud fra '%s'.\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "Dette er %s, produceret med makeinfo version %s ud fra %s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: Fjerner makro uddatafil '%s' grundet fejl; brug --force for at beholde.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: Fjerner uddatafil '%s' grundet fejl; brug --force for at beholde.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Ukendt kommando '%s'"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "Benyt parenteser for at angive en kommando som parameter til @%s"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s forventede '{...}'"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "Uparret }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "INTET_NAVN!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s mangler højre parentes"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image-fil '%s' (for HTML) er ulæselig: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "Ingen '%s' fundet i '%s'"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image-fil '%s' (for tekst) er ulæselig: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "@image mangler filnavnsparameter"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Ingen værdi for '%s'}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s kræver et navn"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Nåede filslutning før samhørende @end %s"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' er for langt til ekspansion; blev ikke ekspanderet"
@@ -2596,162 +2820,129 @@ msgstr "`%.40s...' er for langt til ekspansion; blev ikke ekspanderet"
 msgid "Missing } in @multitable template"
 msgstr "Manglende } i @multitable skabelon"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignorerer vildfaren tekst '%s' efter @multitable"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "For mange søjler i 'multitable' element (maks %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[uventet] Kan ikke vælge kolonne %d i 'multitable'"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "ignorerer @tab udenfor 'multitable'"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Flerkolonne uddata fra sidste række:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolonne %d: uddata = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Emne '%s' er tidligere defineret på linje %d"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Formatterer emne %s...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, fuzzy, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Emne '%s' kræver en sektionsopdelende kommando (f.eks. %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Intet emnenavn angivet for '%c%s'-kommandoen"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Mål '%s' og emne '%s' ender med at have samme filnavn"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "Denne @anchor-kommando er ignoreret; referencer til den vil ikke virke"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Omdøb dette mål eller brug tilvalget '--no-split'"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "Uventet streng i slutningen af opdelt HTML-fil '%s'"
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "Næste:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Forrige:"
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "Op:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Målene '%s' og '%s' ender med at have samme filnavn"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor-kommandoen ignoreres. Referencer til den vil ikke fungere"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s reference til ikke-eksisterende emne '%s'"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "Menu"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Kryds"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, fuzzy, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "'Næste'-felt i emne '%s' blive ikke peget på"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Dette emne (%s) har den ugyldige 'Forrige'"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "Forrige"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Feltet 'Forrige' i emne '%s' bliver ikke peget på"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Dette emne (%s) har den ugyldige 'Næste'-felt"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "Op"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 "Emnet '%s' mangler menupunkt for '%s' på trods af at det er dens 'Op'-mål"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "emne '%s' blev refereret %d gange"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "ikke-refereret emne '%s'"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Kan ikke oprette kataloget '%s': %s"
@@ -2766,260 +2957,104 @@ msgstr "Appendiks %c "
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "Intern fejl (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Intern fejl (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s er forældet; benyt i stedet %c%s"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Emne med %ctop som sektion eksisterer allerede"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Her er %ctop-emnet"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop benyttet før %cnode, benytter forvalget %s"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Indhold"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Kort indhold"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-fil '%s' er ulæselig: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: advarsel: "
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "for"
 
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " for %s"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "på"
 
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\tPrøv '%s --help' for en komplet tilvalgsliste.\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "Første parameter i krydsreferencen må ikke være tom"
 
-#: util/install-info.c:434
+#: makeinfo/xref.c:252
 #, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Brug: %s [TILVALG]... [INFOFIL [KATALOGFIL]]\n"
-"\n"
-"Installér eller slet katalogindgange fra INFOFIL i Info katalogfilen\n"
-"KATALOGFIL.\n"
-"\n"
-"Tilvalg:\n"
-" --delete          slet eksisterende indgange til INFOFIL fra KATALOGFIL;\n"
-"                     tilføj ikke nye indgange.\n"
-" --dir-file=NAVN   angiv navn på Info katalogfil.\n"
-"                     Dette svarer til at bruge KATALOGFIL parameteren.\n"
-" --entry=TEKST     tilføj TEKST som en Info katalogindgang.\n"
-"                     TEKST skal være formateret som en Info menupunkts-\n"
-"                     linje plus nul eller flere ekstra linjer, der starter\n"
-"                     med mellemrum.\n"
-"                     Hvis du angiver flere indgange, tilføjes de alle.\n"
-"                     Hvis du ingen indgange angiver, bestemmes de ud fra\n"
-"                     informationerne i selve Info-filen.\n"
-" --help            vis denne hjælp og afslut.\n"
-" --info-file=FIL   angiv Info-fil, der skal indsættes i kataloget.\n"
-"                     Dette svarer til at bruge INFOFIL parameteren.\n"
-" --info-dir=KATALOG  svarer til --dir-file=KATALOG/katalog.\n"
-" --item=TEKST      svarer til --entry TEKST.\n"
-"                     Et Info-katalog er i virkeligheden et menupunkt.\n"
-" --quiet           undlad advarsler.\n"
-" --remove          svarer til --delete.\n"
-" --section=SEK     put denne fil's indgange i katalogets sektion SEK.\n"
-"                     Hvis du angiver flere sektioner, tilføjes samtlige\n"
-"                     indgangene til alle sektionerne.\n"
-"                     Hvis du ingen sektioner angiver, bestemmes de ud fra\n"
-"                     informationerne i selve Info-filen.\n"
-" --version         vis denne versions-information og afslut.\n"
-
-#: util/install-info.c:488
-#, fuzzy, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
-"Dette er filen .../info/dir, som indeholde det øverste\n"
-"emne i Info-hierakiet, kaldet (katalog)Top.\n"
-"Første gang, du kører Info, vil du indledningsvist se dette emne.\n"
-"\n"
-"%s\tDette er toppen af INFO-træet\n"
-"\n"
-"  Dette (katalog emnet) indeholder en menu med hovedemner.\n"
-"  Afslut med \"q\", \"?\" viser alle Info-kommandoer, \"d\" returnerer "
-"hertil,\n"
-"  \"h\" introducerer nybegyndere for Info,\n"
-"  \"mEmacs<Return>\" besøger Emacs-manualen, osv.\n"
-"\n"
-"  I Emacs kan du klikke med museknap 2 på et menupunkt eller krydsreference\n"
-"  for at vælge den.\n"
-"\n"
-"* Menu:\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: kunne ikke læse (%s) og kunne ikke oprette (%s)\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: tom fil"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY uden tilhørende END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY uden tilhørende START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
 msgstr ""
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Angiv kun Info-filen én gang.\n"
-
-#: util/install-info.c:1284
-#, c-format
-msgid "excess command line argument `%s'"
-msgstr "overskydende kommandolinjeparameter '%s'"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
-msgstr "Ingen inddatafil angivet; prøv --help for mere information."
-
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr "Intet katalog angivet; prøv --help for mere information."
+#: makeinfo/xref.c:390
+#, fuzzy, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "en krydsreference må efterfølges af '.' eller ',', ikke %c"
 
-#: util/install-info.c:1313
-#, c-format
-msgid "no info dir entry in `%s'"
-msgstr "ingen infokatalog-indgang i '%s'"
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "Ingen krydsreferencer i dette emne."
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "menupunkt '%s' eksisterer allerede i filen '%s'"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "Første parameter i @inforef må ikke være tom"
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "ingen indgange fundet for '%s'; intet slettet"
-
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "viser denne hjælp og afslutter"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "efterlad midlertidige filer"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "efterlad ikke midlertidige filer (standard)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "send uddata til FIL"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "vis versions-information og afslut"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Brug: %s [TILVALG]... FIL...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Opret et ordnet indeks for hver TeX uddata-FIL.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr "Normalt angives FIL... som 'xxx.%c%c' for dokumentet 'xxx.texi'.\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3028,27 +3063,393 @@ msgstr ""
 "\n"
 "Tilvalg:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: ikke en texinfo indeksfil"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "kunne ikke åbne %s"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: ikke en texinfo indeksfil"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "Intet sidenummer i %s"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "indgang %s følger en indgang med et sekundært navn"
 
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10[search]  Søg fremad efter en given streng\n"
+#~ "              og vælg emnet med den næste forekomst.\n"
+
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10[goto-node]  Gå til emne angivet ved navn.\n"
+#~ "              Du kan også medtage filnavn, som (FILNAVN)EMNENAVN.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "\\%-10[next-node]  Flyt til emnet 'næste' i dette emne.\n"
+
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr ""
+#~ "\\%-10[dir-node]  Flyt til emnet 'katalog'. Svarer til 'g (KATALOG)'.\n"
+
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr ""
+#~ "\\%-10[top-node]  Gå til emnet Top. Svarer til '\\[goto-node] Top'.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-forward-page-only]  Scroll forward within this node.\n"
+#~ msgstr "\\%-10[scroll-forward]  Rul 1 linje frem.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[scroll-backward-page-only]  Scroll backward within this node.\n"
+#~ msgstr "\\%-10[scroll-backward]  Rul en linje tilbage.\n"
+
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10[search-backward]  Sæg baglæns efter en given streng\n"
+#~ "              og vælg emnet med den forrige forekomst.\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr ""
+#~ "--- Benyt '\\[history-node]' eller '\\[kill-node]' for at afslutte ---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr ""
+#~ "\\%-10[move-to-prev-xref]  Hop til næste hypertekst-henvisning i dette "
+#~ "emne.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "Brug: %s [TILVALG]... [MENUPUNKT...]\n"
+#~ "\n"
+#~ "Læs dokumentationen i Info format.\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "      --apropos=STRENG         slå STRENG op i alle indekser og "
+#~ "manualer.\n"
+#~ "  -d, --directory=KATALOG      tilføj KATALOG til INFOPATH.\n"
+#~ "      --dribble=FILNAVN        gem brugerens tastetryk i FILNAVN.\n"
+#~ "  -f, --file=FILNAVN           angiv Info fil, der skal besøges.\n"
+#~ "  -h, --help                   vis denne hjælp og afslut.\n"
+#~ "      --index-search=TEKST     gå til det punkt, indeks-indgang TEKST "
+#~ "angiver.\n"
+#~ "  -n, --node=EMNENAVN          angiv emner i først besøgte Info-fil.\n"
+#~ "  -o, --output=FILNAVN         udlæs de valgte emner til FILNAVN.\n"
+#~ "  -R, --raw-escapes            fjern ikke ANSI-escapekoder fra "
+#~ "manualsider\n"
+#~ "      --restore=FILNAVN        indlæs de første tastetryk fra FILNAVN.\n"
+#~ "  -O, --show-options, --usage  gå til emnet kommandolinje-tilvalg.\n"
+#~ "%s      --subnodes               udlæs menupunkter rekursivt.\n"
+#~ "      --vi-keys                benyt 'vi'- og 'less'-agtige "
+#~ "tastebindinger.\n"
+#~ "      --version                vis versionsinformation og afslut.\n"
+#~ "\n"
+#~ "Det første ikke-tilvalgs-parameter er menuindgangen der startes fra;\n"
+#~ "den  søges i alle 'katalog'-filer angivet i miljøvariablen INFOPATH.\n"
+#~ "Hvis ikke dette parameter er angivet, samler info alle 'katalog'-filer\n"
+#~ " og viser resultatet.\n"
+#~ "Resterende parametre angiver navne på menupunkter i forhold til "
+#~ "startpunktet.\n"
+#~ "\n"
+#~ "Eksempler:\n"
+#~ "  info                       viser top-niveau katalog menu\n"
+#~ "  info emacs                 start ved emnet emacs i topniveau kataloget\n"
+#~ "  info emacs buffers         start ved emnet 'buffers' i emacs-manualen\n"
+#~ "  info --show-options emacs  start ved emnet med emacs' kommandolinje "
+#~ "tilvalg\n"
+#~ "  info -f ./xxx.info         vis filen ./xxx.info uden at søge i katalog\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr "              Valg af menupunkt vælger et andet emne.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr "              Du kan også medtage filnavn, som (FILNAVN)EMNENAVN.\n"
+
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr "  %-10s  Søg baglæns efter en given streng\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "              og vælg emne med den næste forekomst.\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "Følger emnet Næste..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "Vælger første menupunkt..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "Vælger emnet 'Næste'..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "Går 'Op' %d gang(e), derefter 'Næste'."
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "Går til 'Forrige' i dette vindue."
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "Går 'Op' i dette vindue."
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "Går til 'Forrige's sidste menupunkt."
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "Funktion"
+
+#~ msgid "Macro"
+#~ msgstr "Makro"
+
+#~ msgid "Special Form"
+#~ msgstr "Specialform"
+
+#~ msgid "Variable"
+#~ msgstr "Variabel"
+
+#~ msgid "User Option"
+#~ msgstr "Brugerfunktion"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Instansvariabel"
+
+#~ msgid "Method"
+#~ msgstr "Metode"
+
+#~ msgid "Untitled"
+#~ msgstr "Uden titel"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "Dette er %s, produceret med makeinfo version %s ud fra %s.\n"
+
+#~ msgid "Next:"
+#~ msgstr "Næste:"
+
+#~ msgid "Previous:"
+#~ msgstr "Forrige:"
+
+#~ msgid "Up:"
+#~ msgstr "Op:"
+
+#~ msgid "Menu"
+#~ msgstr "Menu"
+
+#~ msgid "Cross"
+#~ msgstr "Kryds"
+
+#~ msgid "Prev"
+#~ msgstr "Forrige"
+
+#~ msgid "Up"
+#~ msgstr "Op"
+
+#~ msgid "see "
+#~ msgstr "se "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "Brug: %s [TILVALG]... [INFOFIL [KATALOGFIL]]\n"
+#~ "\n"
+#~ "Installér eller slet katalogindgange fra INFOFIL i Info katalogfilen\n"
+#~ "KATALOGFIL.\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ " --delete          slet eksisterende indgange til INFOFIL fra "
+#~ "KATALOGFIL;\n"
+#~ "                     tilføj ikke nye indgange.\n"
+#~ " --dir-file=NAVN   angiv navn på Info katalogfil.\n"
+#~ "                     Dette svarer til at bruge KATALOGFIL parameteren.\n"
+#~ " --entry=TEKST     tilføj TEKST som en Info katalogindgang.\n"
+#~ "                     TEKST skal være formateret som en Info menupunkts-\n"
+#~ "                     linje plus nul eller flere ekstra linjer, der "
+#~ "starter\n"
+#~ "                     med mellemrum.\n"
+#~ "                     Hvis du angiver flere indgange, tilføjes de alle.\n"
+#~ "                     Hvis du ingen indgange angiver, bestemmes de ud fra\n"
+#~ "                     informationerne i selve Info-filen.\n"
+#~ " --help            vis denne hjælp og afslut.\n"
+#~ " --info-file=FIL   angiv Info-fil, der skal indsættes i kataloget.\n"
+#~ "                     Dette svarer til at bruge INFOFIL parameteren.\n"
+#~ " --info-dir=KATALOG  svarer til --dir-file=KATALOG/katalog.\n"
+#~ " --item=TEKST      svarer til --entry TEKST.\n"
+#~ "                     Et Info-katalog er i virkeligheden et menupunkt.\n"
+#~ " --quiet           undlad advarsler.\n"
+#~ " --remove          svarer til --delete.\n"
+#~ " --section=SEK     put denne fil's indgange i katalogets sektion SEK.\n"
+#~ "                     Hvis du angiver flere sektioner, tilføjes samtlige\n"
+#~ "                     indgangene til alle sektionerne.\n"
+#~ "                     Hvis du ingen sektioner angiver, bestemmes de ud "
+#~ "fra\n"
+#~ "                     informationerne i selve Info-filen.\n"
+#~ " --version         vis denne versions-information og afslut.\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "menupunkt '%s' eksisterer allerede i filen '%s'"
+
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr "\\%-10[menu-digit]  Vælg første til niende punkt i emnets menu.\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "emne '%s' blev refereret %d gange"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Der er INGEN garanti. Du må redistribuere denne software\n"
+#~ "under GNU General Public License's betingelser.\n"
+#~ "For mere information om dette, se filerne 'COPYING'.\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-arg kan kun bruges til makroer med et enkelt parameter"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Indhold"
+
+#~ msgid "Short Contents"
+#~ msgstr "Kort indhold"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "efterlad midlertidige filer"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "efterlad ikke midlertidige filer (standard)"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr ""
+#~ "              og vælg det emne, der refereres til af den først fundne "
+#~ "indgang.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Der er INGEN garanti. Du må redistribuere denne software\n"
+#~ "under GNU General Public License's betingelser.\n"
+#~ "For mere information om dette, se filerne 'COPYING'.\n"
+
 #~ msgid "%s: Specify the Info directory only once.\n"
 #~ msgstr "%s: Angiv kun Info-kataloget én gang.\n"
 
@@ -3064,27 +3465,12 @@ msgstr "indgang %s følger en indgang med et sekundært navn"
 #~ msgid "File exists, but is not a directory"
 #~ msgstr "Filen eksisterer, men er ikke et katalog"
 
-#~ msgid "First argument to cross-reference may not be empty"
-#~ msgstr "Første parameter i krydsreferencen må ikke være tom"
-
-#~ msgid "see "
-#~ msgstr "se "
-
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "en krydsreference må efterfølges af '.' eller ',', ikke %c"
-
-#~ msgid "First argument to @inforef may not be empty"
-#~ msgstr "Første parameter i @inforef må ikke være tom"
-
 #~ msgid "Node:"
 #~ msgstr "Emne:"
 
 #~ msgid "%s: TOC should be here, but it was not found"
 #~ msgstr "%s: 'Indhold' burde være her, men blev ikke fundet"
 
-#~ msgid "virtual memory exhausted"
-#~ msgstr "virtuel hukommelse opbrugt"
-
 #~ msgid "No `%s.png' or `.jpg', and no extension supplied"
 #~ msgstr "Ingen `%s.png' eller `.jpg', og ingen filendelse angivet"
 
@@ -3093,9 +3479,3 @@ msgstr "indgang %s følger en indgang med et sekundært navn"
 
 #~ msgid "`%s' has no Up field"
 #~ msgstr "'%s' har intet 'Op'-felt"
-
-#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-#~ msgstr "\\%-10[scroll-forward]  Rul 1 linje frem.\n"
-
-#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-#~ msgstr "\\%-10[scroll-backward]  Rul en linje tilbage.\n"
diff --git a/Build/source/utils/texinfo/po/de.gmo b/Build/source/utils/texinfo/po/de.gmo
index af525d76fe9..da3230917c4 100644
--- a/Build/source/utils/texinfo/po/de.gmo
+++ b/Build/source/utils/texinfo/po/de.gmo
diff --git a/Build/source/utils/texinfo/po/de.po b/Build/source/utils/texinfo/po/de.po
index 9049e5066b2..5337ddb9f9c 100644
--- a/Build/source/utils/texinfo/po/de.po
+++ b/Build/source/utils/texinfo/po/de.po
@@ -1,53 +1,26 @@
 # German messages for GNU Texinfo
 # Copyright © 2004 Free Software Foundation, Inc.
-# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004.
-# Karl Eichwalder <ke@gnu.franken.de>, 1999, 2000.
-# Karl Eichwalder <ke@suse.de>, 1997, 1998, 1999.
+# This file is distributed under the same license as the texinfo package.
 # Karl Eichwalder <ke@ke.Central.DE>, 1996.
+# Karl Eichwalder <ke@suse.de>, 1997, 1998, 1999.
+# Karl Eichwalder <ke@gnu.franken.de>, 1999, 2000.
+# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001-2005, 2007, 2008.
 #
 # 2004-03-31
 # Along with this new update, I changed the quotes to
 # „German“ as opposed to »French« quotes.
 # MPi
 #
-# 2003-06-01
-# All translations revised for current CVS.
-# wl
-#
-# 2001-05-14
-# Update: version 4.0b
-# MPi
-#
 # 2000-02-28 08:25:03 CET
 # In HTML output, change 8bit characters to SGML entities (ß -> &szlig;, etc.)
 # Reported by Thomas Esken, 1999-09-13.
 # -ke-
 #
-# 1999-10-07 20:56:42 CEST
-# Update: version 4.0
-# -ke-
-#
-# 1999-08-18 07:48:14 CEST
-# Update: version 3.12q.
-# -ke-
-#
-# 1999-07-28 08:56:22 CEST
-# Update: version 3.12n.
-# -ke-
-#
 # 1999-04-20 21:51:54 CEST
 # Update: version 3.12h.
 # reuse getopt translations from wget.
 # -ke-
 #
-# 1999-02-06 20:24:24 MET
-# Update: version 3.12c.
-# -ke-
-#
-# 1998-05-03 12:25:13 MEST
-# Cosmetic changes.
-# -ke-
-#
 # 1998-04-05 18:25:42 MEST
 # Hints by "Carl Friedrich Spilcke-Liss" <carl-friedriech.spilcke-liss@ensae.fr>.
 # -ke-
@@ -59,143 +32,209 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.7.91\n"
+"Project-Id-Version: texinfo 4.11.93\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
-"PO-Revision-Date: 2004-12-13 11:53 +0100\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2008-03-14 12:02+0100\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
-"Language-Team: German <de@li.org>\n"
+"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr "Unbekannter Systemfehler"
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: Option „%s“ ist nicht eindeutig\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: Option „--%s“ erlaubt kein Argument\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: Option „%c%s“ erlaubt kein Argument\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: Option „%s“ benötigt ein Argument\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: nicht erkannte Option „--%s“\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: nicht erkannte Option „%c%s“\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ungültige Option -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ungültige Option -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: Option benötigt ein Argument -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: Option „-W %s“ ist nicht eindeutig\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: Option „-W %s“ erlaubt kein Argument\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "kein Speicher mehr"
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "Ein Zeichen vorgehen"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "Ein Zeichen zurückgehen"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "Zum Anfang dieser Zeile bewegen"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "Zum Ende dieser Zeile bewegen"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "Ein Wort vorgehen"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "Ein Wort zurückgehen"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Das Zeichen unter dem Cursor löschen"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "Das Zeichen links vom Cursor löschen"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Operation abbrechen oder beenden"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Akzeptiere diese Zeile (oder erzwinge ihre Vervollständigung)"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Das nächste Zeichen wörtlich eingeben"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Dieses Zeichen eingeben"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Ein Tabulator-Zeichen eingeben"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Zeichen an momentaner Position umstellen"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Füge den Inhalt des letzten Löschvorgangs ein"
 
 # IMO muss "kill" auch im Folgenden wörtlich üs werden -ke-
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "Der Lösch-Ring ist leer"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Füge Inhalt eines vorangegangenen Löschvorgangs ein"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "Bis zum Ende der Zeile löschen"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "Bis zum Anfang der Zeile löschen"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "Das dem Cursor folgende Wort löschen"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "Das dem Cursor vorangehende Wort löschen"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Keine Vervollständigungen"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Nicht vollständig"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "Mögliche Vervollständigungen auflisten"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "Einzige Vervollständigung"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "Eine Vervollständigung:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d Vervollständigungen:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "Vervollständigung einfügen"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "Vervollständigungen werden erstellt..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "Im Vervollständigungs-Fenster blättern"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "Fußnoten können nicht angezeigt werden"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr ""
 "Zeige die zu diesem Knoten gehörenden Fußnoten in einem anderen Fenster"
@@ -204,78 +243,78 @@ msgstr ""
 msgid "---------- Footnotes ----------"
 msgstr "---------- Fußnoten ----------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "Eine Zeichenkette im Index dieser Datei suchen"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "Index-Einträge werden gesucht..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "Keine Indizes gefunden."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Index-Eintrag: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Zum nächsten übereinstimmenden Index-Eintrag vom letzten „\\[index-search]“-"
 "Befehl gehen"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "Keine vorherige zu suchende Index-Zeichenkette."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Keine Index-Einträge."
 
 # checkit
 # kann im Deutschen nachgebildet werden, aber... -ke-
-#: info/indices.c:375
+#: info/indices.c:374
 #, c-format
 msgid "No %sindex entries containing `%s'."
-msgstr "Keine %sindex-Einträge enthalten „%s“."
+msgstr "Keine %sindex-Einträge, die „%s“ enthalten."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "weiteren "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "DIES IST NICHT ZU SEHEN"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr "„%s“ in %s gefunden. (Nächster Eintrag mit „\\[next-index-match]“.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "Indizes von „%s“ werden durchsucht..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "Keine der verfügbaren Info-Dateien hat „%s“ in ihren Indizes."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Alle bekannten Info-Datei-Indizes nach einer Zeichenkette durchsuchen\n"
 "     und ein Menü erstellen"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Index-Apropos: "
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, c-format
 msgid ""
 "\n"
@@ -284,101 +323,110 @@ msgstr ""
 "\n"
 "* Menü: Knoten, deren Indizes „%s“ enthalten:\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "„--help“ gibt weitere Informationen.\n"
 
-# Hier de-Standard-Formulierung einsetzen!
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
 #, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Es gibt KEINERLEI Garantie. Sie können diese Software unter den\n"
-"Bedingungen der GNU General Public License weiterverteilen.\n"
-"Für weiterführende Informationen zu diesen Fragen\n"
-"konsultieren Sie bitte die Datei namens COPYING.\n"
+"Copyright © %s Free Software Foundation, Inc.\n"
+"Lizenz GPLv3+: GNU GPL Version 3 oder höher <http://gnu.org/licenses/gpl."
+"html>\n"
+"Dies ist freie Software: Sie können sie ändern und weiter verteilen.\n"
+"Es gibt KEINERLEI Garantie, soweit es das Gesetz erlaubt.\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "Keine Indexeinträge für „%s“ gefunden\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr "  -b, --speech-friendly     zu Sprachsynthesizern freundlich sein.\n"
-
-# Die "." am Zeilenende habe ich entfernt. -ke-
-#: info/info.c:597
+#: info/info.c:598
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
+msgstr ""
+"Aufruf: %s [OPTION]... [MENU-EINTRAG...]\n"
 "\n"
+"Zum Lesen von Dokumentation, die im Info-Format vorliegt.\n"
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+"  -k, --apropos=ZKETTE      ZKETTE in allen Indizes sämtlicher Info-Dateien\n"
+"                              suchen\n"
+"  -d, --directory=VERZ      VERZ dem INFOPATH hinzufügen\n"
+"      --dribble=DATEI       Tasteneingaben des Nutzers in DATEI merken\n"
+"  -f, --file=DATEI          zu besuchende Info-DATEI angeben"
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+"  -h, --help                diese Hilfe anzeigen und beenden\n"
+"      --index-search=KETTE  zu einem Knoten gehen, auf den der Indexeintrag\n"
+"                              KETTE zeigt\n"
+"  -n, --node=KNOTEN         Knoten in der ersten zu besuchenden Info-Datei\n"
+"                              angeben\n"
+"  -o, --output=DATEI        ausgewählte Knoten nach DATEI ausgeben"
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+"  -R, --raw-escapes         „rohe“ ANSI-Escapes ausgeben (Voreinstellung)\n"
+"      --no-raw-escapes      Escapes als wörtlichen Text ausgeben\n"
+"      --restore=DATEI       die beginnenden Tasteneingaben von DATEI lesen\n"
+"  -O, --show-options, --usage  zum Knoten mit den Optionen für den\n"
+"                              Befehlsaufruf gehen"
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr "  -b, --speech-friendly     zu Sprachsynthesizern freundlich sein."
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+"      --subnodes            Menüeinträge rekursiv ausgeben\n"
+"      --vi-keys             Tastenbindungen ähnlich zu vi und less benutzen\n"
+"      --version             Programmversion anzeigen\n"
+"  -w, --where, --location   physischen Ort des Info-Datei anzeigen"
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
-"\n"
-"Examples:\n"
-"  info                       show top-level dir menu\n"
-"  info emacs                 start at emacs node from top-level dir\n"
-"  info emacs buffers         start at buffers node within emacs manual\n"
-"  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"items relative to the initial node visited."
 msgstr ""
-"Aufruf: %s [OPTION]... [INFO-DATEI [MENU-EINTRAG...]]\n"
-"\n"
-"Zum Lesen von Dokumentation, die im Info-Format vorliegt.\n"
-"\n"
-"Optionen:\n"
-"      --apropos=ZKETTE      ZKETTE in allen Indizes sämtlicher Info-Dateien\n"
-"                              suchen\n"
-"  -d, --directory=VERZ      VERZ dem INFOPATH hinzufügen\n"
-"      --dribble=DATEI       Tasteneingaben des Nutzers in DATEI merken\n"
-"  -f, --file=DATEI          zu besuchende Info-DATEI angeben\n"
-"  -h, --help                diese Hilfe anzeigen\n"
-"      --index-search=KETTE  zu einem Knoten gehen, auf den der Indexeintrag\n"
-"                              KETTE zeigt\n"
-"  -n, --node=KNOTEN         Knoten in der ersten zu besuchenden Info-Datei\n"
-"                              angeben\n"
-"  -o, --output=DATEI        ausgewählte Knoten nach DATEI ausgeben\n"
-"  -R, --raw-escapes         „rohe“ ANSI-Escapes ausgeben (Voreinstellung)\n"
-"      --no-raw-escapes      Escapes als wörtlichen Text ausgeben\n"
-"      --restore=DATEI       die beginnenden Tasteneingaben von DATEI lesen\n"
-"  -O, --show-options, --usage\n"
-"                            zum Knoten mit den Optionen für den "
-"Befehlsaufruf\n"
-"                              gehen\n"
-"%s      --subnodes            Menüeinträge rekursiv ausgeben\n"
-"  -w, --where, --location   physischen Ort des Info-Datei anzeigen\n"
-"      --vi-keys             Tastenbindungen ähnlich zu vi und less benutzen\n"
-"      --version             Programmversion anzeigen\n"
 "\n"
 "Der erste Parameter, der keine Option ist, ist der Menüeintrag, von dem aus\n"
 "gestartet werden soll; nach diesem Menüeintrag wird in allen „dir“-Datei\n"
@@ -386,7 +434,19 @@ msgstr ""
 "Wird kein Menüeintrag angegeben, packt info alle „dir“-Dateien zusammen\n"
 "und zeigt das Ergebnis an.\n"
 "Verbleibende Parameter werden als Namen von Menüeinträgen des ersten zu\n"
-"besuchenden Knotens angesehen.\n"
+"besuchenden Knotens angesehen."
+
+#: info/info.c:641
+msgid ""
+"\n"
+"Examples:\n"
+"  info                       show top-level dir menu\n"
+"  info emacs                 start at emacs node from top-level dir\n"
+"  info emacs buffers         start at buffers node within emacs manual\n"
+"  info --show-options emacs  start at node with emacs' command line options\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
+msgstr ""
 "\n"
 "Beispiele:\n"
 "  info                       das oberste „dir“-Menü anzeigen\n"
@@ -396,10 +456,12 @@ msgstr ""
 "  info --show-options emacs  beim Knoten mit den emacs-Kommandozeilen-"
 "Optionen\n"
 "                               beginnen\n"
-"  info -f ./foo.info         datei ./foo.info anzeigen\n"
+"  info --subnodes -o out.txt emacs  das ganze Handbuch nach out.txt "
+"schreiben\n"
+"  info -f ./foo.info         datei ./foo.info anzeigen"
 
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -412,423 +474,387 @@ msgstr ""
 "schicken, allgemeine Fragen und Gedankenaustausch an help-texinfo@gnu.org.\n"
 "Texinfos Homepage: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Knoten „%s“ nicht gefunden."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Knoten „(%s)%s“ nicht gefunden."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "Kein Fenster gefunden!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "Momentane Position erscheint nicht in dem Knoten dieses Fensters!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "Kann das letzte Fenster nicht löschen!"
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "Kein Menü in diesem Knoten."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "Keine Fußnoten in diesem Knoten."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "Keine Querverweise in diesem Knoten."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Kein „%s“-Verweis für diesem Knoten."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Unbekannter Info-Befehl „%c“. „?“ eingeben, um Hilfe zu bekommen."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Der Terminaltyp „%s“ ist nicht fähig genug, um Info auszuführen."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "Sie sind bereits auf der letzten Seite dieses Knotens."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "Sie sind bereits auf der ersten Seite dieses Knotens."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "Nur ein Fenster."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "Das entstehende Fenster wäre zu klein."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Nicht genügend Platz für ein Hilfefenster. Bitte ein Fenster löschen."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
-msgstr ""
-"Grundbefehle in Info-Fenstern\n"
-"*****************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
+msgstr "Grundlegende Info-Befehlstasten\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
-msgstr "\\%-10[quit-help]  Diese Hilfe verlassen. \n"
+#: info/infodoc.c:47
+msgid "\\%-10[quit-help]  Close this help window.\n"
+msgstr "\\%-10[quit-help]  Dieses Hilfefenster schließen.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Info gänzlich beenden.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Das Info-Tutorial aufrufen.\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"Andere Knoten wählen:\n"
-"---------------------\n"
+#: info/infodoc.c:51
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-line]  Eine Zeile nach oben bewegen.\n"
+
+#: info/infodoc.c:52
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  Eine Zeile nach unten bewegen.\n"
+
+#: info/infodoc.c:53
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Eine Bildschirmseite zurückblättern.\n"
+
+#: info/infodoc.c:54
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Eine Bildschirmseite vorblättern.\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr ""
-"\\%-10[next-node]  Zum nächsten Knoten („next“) dieses Knotens gehen.\n"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Zum Anfang dieses Knotens gehen.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr ""
-"\\%-10[prev-node]  Zum vorherigen Knoten („prev“) dieses Knotens gehen.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Von diesem Knoten aus aufwärts („up“) gehen.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Zum Ende dieses Knotens gehen.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
-msgstr ""
-"\\%-10[menu-item]  Einen Menüeintrag nach dem Namen auswählen.\n"
-"              Auswahl eines Menüeintrags führt zu Auswahl eines anderen\n"
-"              Knotens.\n"
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr "\\%-10[move-to-next-xref]  Zur nächsten Verknüpfung springen.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
-"\\%-10[xref-item]  Einem Querverweis folgen. Liest den Namen des Verweises.\n"
+"\\%-10[select-reference-this-line]  Der Verknüpfung unter dem Cursor "
+"folgen.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr ""
-"\\%-10[history-node]  Zum letzten in diesem Fenster schon besuchten Knoten "
-"gehen.\n"
+"\\%-10[history-node]  Zum letzten in diesem Fenster besuchten Knoten gehen.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
 msgstr ""
-"\\%-10[move-to-next-xref]  Zur nächsten Verknüpfung auf dieser Seite "
-"springen.\n"
+"\\%-10[global-prev-node]  Zum vorherigen Knoten dieses Dokuments gehen.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
 msgstr ""
-"\\%-10[move-to-prev-xref]  Zur vorigen Verknüpfung auf dieser Seite "
-"springen.\n"
+"\\%-10[global-next-node]  Zum nächsten Knoten dieses Dokuments gehen.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr ""
-"\\%-10[select-reference-this-line]  Der Verknüpfung unter dem Cursor "
-"folgen.\n"
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Zum vorherigen Knoten auf dieser Ebene gehen.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
-"\\%-10[dir-node]  Zum „directory“-Knoten springen. Das gleiche wie „\\[goto-"
-"node] (DIR)“.\n"
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Zum nächsten Knoten auf dieser Ebene gehen.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr ""
-"\\%-10[top-node]  Zum obersten Knoten springen. Das gleiche wie „\\[goto-"
-"node] Top“.\n"
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Eine Ebene aufwärts gehen.\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"Bewegung innerhalb eines Knotens:\n"
-"---------------------------------\n"
+#: info/infodoc.c:67
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[top-node]  Zum Startknoten dieses Dokukments gehen.\n"
+
+#: info/infodoc.c:68
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[dir-node]  Zum Hauptverzeichnisknoten gehen.\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Zum Anfang dieses Knotens gehen.\n"
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr ""
+"1...9       Ersten ... neunten Eintrag aus dem Menü dieses Knotens wählen.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Zum Ende dieses Knotens gehen.\n"
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr ""
+"\\%-10[last-menu-item]  Letzten Eintrag aus dem Menü dieses Knotens wählen.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "\\%-10[next-line]  Eine Zeile vorblättern.\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "\\%-10[menu-item]  Einen Menüeintrag nach dem Namen auswählen.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "\\%-10[prev-line]  Eine Zeile zurückblättern.\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "\\%-10[xref-item]  Einem Querverweis anhand des Namens folgen.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Eine Seite vorblättern.\n"
-
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Eine Seite zurückblättern.\n"
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "\\%-10[goto-node]  Knoten nach Namen auswählen und dorthin springen.\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr ""
-"Weitere Befehle:\n"
-"----------------\n"
+#: info/infodoc.c:76
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "\\%-10[search]  Angegebene Zeichenkette in Vorwärtsrichtung suchen.\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr ""
-"\\%-10[menu-digit]  Ersten ... neunten Eintrag aus dem Menü des Knotens "
-"wählen.\n"
+#: info/infodoc.c:77
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[search-previous]  Nach vorhergehendem Auftreten suchen.\n"
 
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr ""
-"\\%-10[last-menu-item]  Letzten Eintrag aus dem Menü des Knotens wählen.\n"
+#: info/infodoc.c:78
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "\\%-10[search-next]  Nach nächstem Auftreten suchen.\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 "\\%-10[index-search]  Eine Zeichenkette in den Indexeintägen dieser Info-"
 "Datei\n"
 "              suchen und zu dem Knoten springen, auf den der erste\n"
 "              gefundene Eintrag verweist.\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  Knoten nach Namen auswählen und dorthin springen. Ein\n"
-"              Dateiname kann mit angegeben werden, also (DATEI)KNOTENNAME.\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  Angegebene Zeichenkette in Vorwärtsrichtung suchen und den\n"
-"              Knoten wählen, in dem der nächste Eintrag gefunden wurde.\n"
+#: info/infodoc.c:81
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "\\%-10[abort-key]  Momentane Operation abbrechen.\n"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  Angegebene Zeichenkette in Rückwärtsrichtung "
-"suchen\n"
-"              und den Knoten wählen, in dem der nächste Eintrag gefunden\n"
-"              wurde.\n"
+"Grundbefehle in Info-Fenstern\n"
+"*****************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Diese Hilfe verlassen.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Info gänzlich beenden.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Das Info-Tutorial aufrufen.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Zum nächsten Knoten („next“) dieses Knotens gehen.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Zum vorherigen Knoten („prev“) dieses Knotens gehen.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Von diesem Knoten aus aufwärts („up“) gehen.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:101
 #, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Einen Menüeintrag nach dem Namen auswählen.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr ""
-"              Auswahl eines Menüeintrags führt zu Auswahl eines anderen\n"
-"              Knotens.\n"
+"  %-10s  Einen Menüeintrag nach dem Namen auswählen.\n"
+"              Auswahl des Menüeintrags führt zu Auswahl eines anderen "
+"Knotens.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Einem Querverweis folgen. Liest den Namen des Verweises.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Zum letzten in diesem Fenster gezeigten Knoten gehen.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Zur nächsten Verknüpfung auf dieser Seite springen.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Der Verknüpfung unter dem Cursor folgen.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Zum „directory“-Knoten springen. Das gleiche wie „g (DIR)“.\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Zum „Top“-Knoten springen. Das gleiche wie „g Top“.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Bewegung innerhalb eines Knotens:\n"
+"---------------------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Eine Seite vorblättern.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Eine Seite zurückblättern.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Zum Anfang dieses Knotens gehen.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Zum Ende dieses Knotens gehen.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Eine Zeile vorblättern.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Eine Zeile zurückblättern.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Weitere Befehle:\n"
+"----------------\n"
+
+#: info/infodoc.c:121
 #, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  Ersten ... neunten Eintrag aus dem Menü des Knotens wählen.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Letzten Eintrag aus dem Menü des Knotens wählen.\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:125
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-"  %-10s  Eine Zeichenkette in den Indexeinträgen dieser Info-Datei suchen\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
-"                    und zu dem Knoten springen, auf den der erste gefundene\n"
-"                    Eintrag verweist.\n"
+"  %-10s  Eine Zeichenkette in den Indexeintägen dieser Info-Datei\n"
+"              suchen und den Knoten wählen, auf den der erste gefundene\n"
+"              Eintrag verweist.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:127
 #, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Knoten nach Namen auswählen und dorthin springen. Ein\n"
-
-#: info/infodoc.c:132
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
+"  %-10s  Knoten nach Namen auswählen und dorthin springen.\n"
 "              Dateiname kann mit angegeben werden, also (DATEI)KNOTENNAME.\n"
 
-#: info/infodoc.c:133
+#: info/infodoc.c:129
 #, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr ""
-"  %-10s  Angegebene Zeichenkette in Vorwärtsrichtung suchen und den Knoten\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
-msgstr "             wählen, in dem der nächste Eintrag gefunden wurde.\n"
+msgstr ""
+"  %-10s  Angegebene Zeichenkette in Vorwärtsrichtung suchen und den\n"
+"              Knoten wählen, in dem der nächste Eintrag gefunden wurde.\n"
 
-#: info/infodoc.c:135
+#: info/infodoc.c:131
 #, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Angegebene Zeichenkette in Rückwärtsrichtung suchen\n"
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"  %-10s  Angegebene Zeichenkette in Vorwärtsrichtung suchen und den\n"
+"              Knoten wählen, in dem der nächste Eintrag gefunden wurde.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "Der momentane Suchpfad ist:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -836,7 +862,7 @@ msgstr ""
 "Befehle, die in Info-Fenstern verfügbar sind:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -844,7 +870,7 @@ msgstr ""
 "Befehle, die im Echo-Bereich verfügbar sind:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -853,7 +879,7 @@ msgstr ""
 "Die folgenden Befehle können nur durch %s aufgerufen werden:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -861,85 +887,73 @@ msgstr ""
 "Die folgenden Befehle können überhaupt nicht aufgerufen werden:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-"--- „\\[history-node]“ oder „\\[kill-node]“ benutzen, um zu beenden ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "Diesen Hilfe-Text anzeigen"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "Info-Knoten „(info)Help“ besuchen"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "Dokumentation für KEY ausgeben"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Beschreibe Taste: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s ist nicht definiert."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s ist nicht definiert."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s ist definiert als %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Anzeigen, was einzugeben ist, um einen gegebenen Befehl auszuführen"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Wo ist der Befehl: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "Keine Taste mit „%s“ belegt"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s kann nur durch %s aufgerufen werden."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s kann durch %s aufgerufen werden."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Es gibt keine Funktion mit Namen „%s“"
 
-# Hier de-Standard-Formulierung einsetzen!
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"Es gibt KEINERLEI Garantie. Sie können diese Software unter den\n"
-"Bedingungen der GNU General Public License weiterverteilen.\n"
-"Für weiterführende Informationen zu diesen Fragen\n"
-"konsultieren Sie bitte die Datei namens COPYING.\n"
+"Andere Knoten wählen:\n"
+"---------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -1049,22 +1063,22 @@ msgstr ""
 "  --help                       diese Hilfe anzeigen und beenden\n"
 "  --version                    Versionsnummer anzeigen und beenden\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Ungültige Info-Schlüssel-Datei „%s“ wird ignoriert - zu klein"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Ungültige Info-Schlüssel-Datei „%s“ wird ignoriert - zu groß"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "Fehler beim Lesen der Infokey-Datei „%s“ - zu kurzes Lesen"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -1072,12 +1086,12 @@ msgstr ""
 "Ungültige Infokey-Datei „%s“ (fehlerhafte Signatur) -- bitte mit infokey "
 "erneuern"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr "Ihre Infokey-Datei „%s“ ist veraltet -- bitte mit infokey erneuern"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -1085,7 +1099,7 @@ msgstr ""
 "Ungültige Infokey-Datei „%s“ (fehlerhafte Abschnittslänge) -- bitte mit "
 "infokey erneuern"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -1093,47 +1107,47 @@ msgstr ""
 "Ungültige Infokey-Datei „%s“ (fehlerhafter Abschnittscode) -- bitte mit "
 "infokey erneuern"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 "Fehlerhafte Daten in Infokey-Datei -- einige Tastaturbindungen ignoriert"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "Fehlerhafte Daten in Infokey-Datei -- einige Variableneinstellungen ignoriert"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "Namen eines Info-Befehls lesen und beschreiben"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Beschreibe den Befehl: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "Einen Befehlsnamen im Echo-Bereich lesen und ausführen"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Befehl für Echo-Bereich hier nicht ausführbar."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, c-format
 msgid "Undefined command: %s"
 msgstr "Undefinierter Befehl: %s"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "Höhe des angezeigten Fensters setzen"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Setze Bildschirm-Höhe auf (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1142,12 +1156,12 @@ msgstr ""
 "   Quelldateien durchsucht, damit diese Datei enthält:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Datei „%s“ ist nicht veränderbar.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1159,7 +1173,7 @@ msgstr ""
 "  (Datei)Knoten                     Zeilen  Größe  Beinhaltet Datei\n"
 "  -------------                     ------  -----  ----------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1168,26 +1182,31 @@ msgstr ""
 "Einen Eintrag auswählen oder „\\[history-node]“ in einem anderen Fenster\n"
 "benützen.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "Ein Fenster mit einem Menü aller aktuell besuchten Knoten erzeugen"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr ""
 "Einen Knoten auswählen, der zuvor in einem sichtbaren Fenster\n"
 "     besucht wurde"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Wähle besuchten Knoten aus: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Der Verweis ist verschwunden! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr "Fehler in regulärem Ausdruck: %s"
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1196,110 +1215,81 @@ msgstr ""
 "Willkommen bei Info (Version %s). „\\[get-help-window]“ eingeben für Hilfe, "
 "„\\[menu-item]“ für Menüeintrag."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "Eine Zeile nach unten bewegen"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "Eine Zeile nach oben bewegen"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "Zum Ende dieser Zeile bewegen"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "Zum Anfang der Zeile bewegen"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "nächstes"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Folge „nächsten“ (Next) Knoten..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Wähle ersten Menüeintrag aus..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Wähle „nächsten“ (Next) Knoten aus..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "Bewege %d mal „aufwärts“ (Up), dann „nächstes“ (Next)."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "Keine weiteren Knoten in diesem Dokument."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "Kein „voriges“ (Prev) für diesem Knoten."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Adjustiere „vorigen“ Knoten (Prev) in diesem Fenster."
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr ""
 "Kein „voriges“ (Prev) oder „aufwärts“ (Up) für diesen Knoten innerhalb "
 "dieses Dokuments."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Adjustiere „aufwärts“ (Up) in diesem Fenster."
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Bewege zum letzten Menüeintrag von „voriges“ (Prev)."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "Vorwärts oder abwärts durch die Knotenstruktur bewegen"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "Zurück oder aufwärts durch die Knotenstruktur bewegen"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "In diesem Fenster vorwärts blättern"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 "In diesem Fenster vorwärts blättern und die Standard-Fenstergröße setzen"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr "In diesem Fenster vorwärts blättern ohne den Knoten zu verlassen"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "In diesem Fenster vorwärts blättern (ohne den Knoten zu verlassen)\n"
 "     und Standard-Fenstergröße setzen"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "In diesem Fenster zurückblättern"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr "In diesem Fenster zurückblättern und die Standard-Fenstergröße setzen"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr "In diesem Fenster zurückblättern ohne den Knoten zu verlassen"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1307,405 +1297,432 @@ msgstr ""
 "In diesem Fenster zurück blättern (ohne den Knoten zu verlassen)\n"
 "     und Standard-Fenstergröße setzen"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "Zum Anfang dieses Knotens bewegen"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "Zum Ende dieses Knotens bewegen"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "Zeilenweise vorblättern"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "Zeilenweise zurück blättern"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "Einen halben Bildschirm vorblättern"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "Einen halben Bildschirm zurückblättern"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "Das nächste Fenster auswählen"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "Das vorige Fenster auswählen"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "Aktuelles Fenster unterteilen"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "Aktuelles Fenster löschen"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "Ein permanentes Fenster kann nicht gelöscht werden"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "Alle anderen Fenster löschen"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "Im anderen Fenster vorblättern"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "Im anderen Fenster zurück blättern"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "Aktuelles Fenster vergrößern (oder verkleinern)"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr ""
 "Den vorhandenen Bildschirmplatz unter allen sichtbaren Fenstern aufteilen"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Den Status des Zeilenumbruchs im aktuellen Fenster umschalten"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr "Die Verwendung regulärer Ausdrücke in Suchen umschalten"
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr "Für Suchen werden reguläre Ausdrücke benutzt"
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr "Für Suchen werden wortwörtliche Zeichenketten benutzt"
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "Den „nächsten“ Knoten (Next) auswählen"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "Den „vorigen“ Knoten (Prev) auswählen"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "Den übergeordneten Knoten auswählen („aufwärts“, Up)"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "Den letzten Knoten dieser Datei auswählen"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "Dieses Fenster hat keine weiteren Knoten"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "Den ersten Knoten dieser Datei auswählen"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "Den letzten Menüeintrag dieses Knotens auswählen"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "Diesen Menüeintrag auswählen"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Es sind keine %d Einträge in diesem Menü."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menüeintrag (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Menüeintrag: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Folge xref (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "Folge xref: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "Einen Menüeintrag lesen und seinen Knoten auswählen"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Fußnote oder Querverweis lesen und den Knoten auswählen"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "Zum Anfang des Menüs dieses Knotens bewegen"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "So viele Menüeinträge wie möglich auf einmal besuchen"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "Den Namen eines Knotens lesen und diesen auswählen"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "Gehe zu Knoten: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Kein Menü im Knoten „%s“."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Kein Menüeintrag „%s“ im Knoten „%s“."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Kann keinen Knoten finden, der von „%s“ in „%s“ referenziert wird."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Menüliste lesen; bei „dir“ beginnen und ihnen folgen"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "Folge Menüs: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Den Knoten finden, der den Programmaufruf beschreibt"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Finde den Programmaufruf-Knoten von [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "Einen Verweis auf eine Manpage lesen und diese auswählen"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "Hole Manpage: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "Den Knoten „Top“ dieser Datei auswählen"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "Den Knoten „(dir)“ auswählen"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Lösche Information über Knoten (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Kann Information über Knoten „%s“ nicht löschen"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "Information über den letzten Knoten kann nicht gelöscht werden"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "Den zuletzt gewählten Knoten auswählen"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "Information über diesen Knoten löschen"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "Den Namen einer Datei lesen und diese auswählen"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Finde Datei: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Kann „%s“ nicht finden."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Ausgabe-Datei „%s“ kann nicht angelegt werden."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Fertig."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "Knoten „%s“ wird geschrieben..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr ""
 "Den Inhalt dieses Knotens an INFO_PRINT_COMMAND weiterreichen\n"
 "     (mittels einer Pipe)"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Kann Daten nicht nach „%s“ weiterreichen (mittels einer Pipe)."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "Knoten „%s“ wird gedruckt..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr "Suche vom Ende des Dokuments fortgesetzt."
+
+#: info/session.c:3738
+msgid "Search continued from the beginning of the document."
+msgstr "Suche vom Anfang des Dokuments fortgesetzt."
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Unterdatei „%s“ wird durchsucht..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr ""
 "Eine Zeichenkette einlesen und danach gemäß Groß-/Kleinschreibung suchen"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "Eine Zeichenkette einlesen und danach suchen"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "Eine Zeichenkette einlesen und danach in Rückwärtsrichtung suchen"
 
-#: info/session.c:3670 info/session.c:3677
+#: info/session.c:3863 info/session.c:3869
 #, c-format
-msgid "%s%sfor string [%s]: "
-msgstr "%s%snach Zeichenkette [%s]: "
+msgid "%s%s%s [%s]: "
+msgstr "%s%s%s [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
-msgstr "Suche in Rückwärtsrichtung "
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr "Suche mit regulärem Ausdruck"
 
-#: info/session.c:3672 info/session.c:3678
-msgid "Search"
-msgstr "Suche"
+#: info/session.c:3865 info/session.c:3871
+msgid " case-sensitively"
+msgstr " gemäß Groß-/Kleinschreibung"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " gemäß Groß-/Kleinschreibung "
+#: info/session.c:3866 info/session.c:3872
+msgid " backward"
+msgstr " in Rückwärtsrichtung"
 
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
+#: info/session.c:3870
+msgid "Search"
+msgstr "Suche"
 
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "Suche fehlgeschlagen."
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "Letzte Suche in der gleichen Richtung wiederholen"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "Keine vorherige Such-Zeichenkette."
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "Letzte Suche in der entgegengesetzten Richtung wiederholen"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "Interaktiv eine Zeichenkette während der Eingabe suchen"
 
-#: info/session.c:3851
+#: info/session.c:4044
+msgid "Regexp I-search backward: "
+msgstr "Interaktive Suche mit regulärem Ausdruck in Rückwärtsrichtung: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
-msgstr "Interactive Suche in Rückwärtsrichtung: "
+msgstr "Interaktive Suche in Rückwärtsrichtung: "
+
+#: info/session.c:4047
+msgid "Regexp I-search: "
+msgstr "Interaktive Suche mit regulärem Ausdruck: "
 
-#: info/session.c:3853
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "Interaktive Suche: "
 
-# checkit
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
-msgstr "Fehlgeschlagen "
+msgstr "Fehlschlagende "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "Zum vorigen Querverweis bewegen"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "Zum nächsten Querverweis bewegen"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "Verweis oder Menüeintrag auswählen, der auf dieser Zeile erscheint"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "Momentane Operation abbrechen"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Beenden"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "Den Cursor zu einer bestimmten Zeile des Fensters bewegen"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "Anzeige erneut darstellen"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Info beenden"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
 "Befehl ausführen, der an die kleingeschriebene Variante dieser\n"
 "     Taste gebunden ist"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Unbekannter Befehl (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "„%s“ ist ungültig"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, c-format
 msgid "`%s' is invalid"
 msgstr "„%s“ ist ungültig"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "Diese Zahl dem aktuellen numerischen Argument hinzufügen"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Beginne (oder multipliziere mit 4) das aktuelle numerische Argument"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "Intern verwendet von \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Kein Speicher mehr!\n"
@@ -1743,196 +1760,420 @@ msgstr ""
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "Kontrolliert, was passiert, wenn am Ende eines Knotens geblättert wird"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr "Das gleiche wie scroll-behaviour"
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr ""
 "Anzahl der Zeilen zu blättern, wenn der Cursor aus dem Fenster bewegt wird"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr "Bestimmt, ob scroll-behavior Cursorbewegungsbefehle beeinflusst"
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "Wenn „On“, dann akzeptiert Info ISO-Latin-Zeichen und zeigt diese an"
 
-#: info/variables.c:74
+#: info/variables.c:81
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "Kontrolliert, was passiert, wenn am Ende eines Knotens geblättert wird"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "Den Zweck einer Variablen erklären"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Beschreibe Variable: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Den Wert einer Info-Variablen setzen"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Setze Variable: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "Setze %s auf den Wert (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "Setze %s auf den Wert (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Tags veraltet ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), Zeilen ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d Zeilen --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d Zeilen --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Unterdatei: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: Option „%s“ ist nicht eindeutig\n"
+msgid "%s: warning: "
+msgstr "%s: Warnung: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: Option „--%s“ erlaubt kein Argument\n"
+msgid " for %s"
+msgstr " für %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: Option „%c%s“ erlaubt kein Argument\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\t„%s --help“ gibt weitere Informationen.\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:508
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Option „%s“ benötigt ein Argument\n"
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Aufruf: %s [OPTION]... [INFO-DATEI [VERZEICHNIS-DATEI]]\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+"Einträge in INFO-DATEI hinzufügen oder entfernen (in Info-Verzeichnis "
+"VERZEICHNIS-DATEI)"
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+"Optionen:\n"
+" --debug           alle Vorgänge protokollieren\n"
+" --delete          vorhandene Einträge für INFO-DATEI aus VERZEICHNIS-DATEI\n"
+"                     löschen; keine neuen Einträge einfügen\n"
+" --description=TEXT  die Beschreibung des Eintrags auf TEXT setzen; zusammen "
+"mit\n"
+"                     der Option --name benutzt, um synonym zu --entry zu "
+"werden\n"
+" --dir-file=NAME   Namen der Info-Verzeichnis-Datei angeben. "
+"Gleichbedeutend\n"
+"                     mit dem VERZEICHNIS-DATEI-Argument\n"
+" --dry-run         gleichbedeutend zu --test"
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+" --entry=TEXT      TEXT als einen Info-Verzeichnis-Eintrag einfügen.\n"
+"                     TEXT wird als Info-Menüeintragszeile gefolgt von null\n"
+"                       oder mehr zusätzlichen Zeilen, die mit Freiraum\n"
+"                       beginnen, geschrieben.\n"
+"                     Wenn mehr als ein Eintrag angegeben wird, werden alle\n"
+"                       hinzugefügt.\n"
+"                     Wenn gar kein Eintrag angegeben wird, wird der\n"
+"                       Eintragstext der Info-Datei selbst entnommen.\n"
+"                     Beim Entfernen gibt TEXT den zu entfernenden Eintrag "
+"an.\n"
+"                     TEXT wird nur als letzt Möglichkeit entfernt, wenn der\n"
+"                       Eintrag, wie er aus der Info-Datei ermittelt wurde,\n"
+"                       nicht existiert und der Basisname der Infodatei "
+"eben-\n"
+"                       falls nicht gefunden wird."
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+" --help            diese Hilfe zeigen und beenden\n"
+" --info-dir=VERZ   wie --dir-file=VERZ/dir\n"
+" --info-file=DATEI Info-Datei angeben, die im Verzeichnis zu installieren "
+"ist.\n"
+"                     Gleichbedeutend mit dem INFO-DATEI-Argument\n"
+" --item=TEXT       wie --entry TEXT\n"
+" --keep-old        Einträge nicht ersetzen oder leere Abschnitte entfernen\n"
+" --menuentry=TEXT  wie --name=TEXT\n"
+" --name=TEXT       der Name des Eintrags ist TEXT;  zusammen mit der Option\n"
+"                     --description benutzt, um synonym zu --entry zu werden\n"
+" --no-indent       neue Einträge in der VERZEICHNIS-Datei nicht formatieren\n"
+" --quiet           Warnungen unterdrücken"
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+" --regex=R         die Einträge dieser Datei in allen Abschnitten "
+"hinzufügen,\n"
+"                     auf die R passt (ohne Groß-/Kleinschreibung zu "
+"beachten)\n"
+" --remove          wie --delete\n"
+" --remove-exactly  nur löschen, wenn der Name der Info-Datei genau "
+"übereinstimmt;\n"
+"                     Suffixe .info oder .gz werden nicht ignoriert\n"
+" --section=SEC    die Einträge dieser Datei in den Abschnitt SEC des\n"
+"                     Verzeichnisses stellen. Wird mehr als ein Abschnitt\n"
+"                     angegeben, werden alle Einträge in jedem der\n"
+"                     Abschnitte hinzugefügt. Wird gar kein Abschnitt\n"
+"                     angegeben, wird der Eintragstext der Info-Datei selbst\n"
+"                     entnommen.\n"
+" --section R SEC  äquivalent zu --regex=R --section=SEC --add-once"
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+" --silent          Warnungen unterdrücken\n"
+" --test            die VERZEICHNIS-DATEI nicht ändern\n"
+" --version         Programmversion anzeigen und beenden"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:570
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"Fehlerberichte (auf Englisch, mit LC_ALL=C) per E-Mail an bug-texinfo@gnu."
+"org\n"
+"schicken, allgemeine Fragen und Gedankenaustausch an help-texinfo@gnu.org.\n"
+"Texinfos Homepage: http://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nicht erkannte Option „--%s“\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Dies ist die Datei .../info/dir, die den obersten Knoten der\n"
+"Info-Hierarchie enthält, genannt (dir)Top.\n"
+"Beim ersten Aufruf von Info geht es bei diesem Knoten los.\n"
+"\n"
+"%s\tDies ist der Beginn des INFO-Baums\n"
+"\n"
+"  Dieser Verzeichnis-Knoten zeigt ein Menü aller Hauptpunkte an.\n"
+"  „q“ beendet Info, „?“ listet alle Info-Befehle auf, „d“ kehrt hierher\n"
+"  zurück, „h“ gibt eine Einsteiger-Hilfe, „mEmacs<Return>“ besucht das\n"
+"  Emacs-Manual, etc.\n"
+"\n"
+"  Im Emacs kann man mit dem zweiten Mausknopf auf einen Menüeintrag oder\n"
+"  einen Querverweis klicken, um einen solchen auswählen.\n"
+"\n"
+"%s\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nicht erkannte Option „%c%s“\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: kann nicht gelesen (%s) und nicht angelegt werden (%s)\n"
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ungültige Option -- %c\n"
+msgid "%s: empty file"
+msgstr "%s: leere Datei"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY ohne END-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY ohne START-INFO-DIR-ENTRY"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ungültige Option -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: Verzeichnisdatei schon vorhanden: %s\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Option benötigt ein Argument -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Info-Datei nur einmal angeben.\n"
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option „-W %s“ ist nicht eindeutig\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr "Zusätzlicher regulärer Ausdruch angegeben, ignoriere „%s“"
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: Option „-W %s“ erlaubt kein Argument\n"
+msgid "Error in regular expression `%s': %s"
+msgstr "Fehler in regulärem Ausdruck „%s“: %s"
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: install-info/install-info.c:2129
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "überflüssiges Kommandozeilen-Argument „%s“ wird übergangen"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr "Keine Eingabe-Datei angegeben; „--help“ gibt weitere Informationen."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr "Keine dir-Datei angegeben; „--help“ gibt weitere Informationen."
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "Kein Info-Verzeichnis-Eintrag in „%s“"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "keine Einträge für „%s“ gefunden; nichts entfernt"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr "ferror auf stdout\n"
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr "fflush-Fehler auf stdout\n"
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "Argumente zu @%s ignoriert"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "Januar"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "Februar"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "März"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "April"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "Mai"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "Juni"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "Juli"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "August"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "September"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "Oktober"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "November"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "Dezember"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "wahrscheinlich falsches Zeichen „%c“ in @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "Argument von @sc besteht nur aus Großbuchstaben, somit keine Wirkung"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "„{“ erwartet, jedoch „%c“ bekommen"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "Dateiende innerhalb eines @verb-Blocks"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "„}“ erwartet, jedoch „%c“ bekommen"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1940,338 +2181,319 @@ msgstr ""
 "@strong{Bemerkung...} erzeugt einen Pseudo-Querverweis in Info; "
 "umformulieren, um das zu vermeiden"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s ist obsolet"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp erfordert ein positives numerisches Argument, nicht „%s“"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Fehlerhaftes Argument zu %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "genau"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "kein"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Fehlerhafte Argumente zu @%s"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr "Einfügen"
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "Fehlende „}“ bei @def Argument"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Funktion"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Makro"
-
-# checkit
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Spezielle Form"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Variable"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Nutzeroption"
-
-# checkit
-# What does this mean? -ke-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Instance Variable"
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Fehlerhafte Argumente zu @%s: %s"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Methode"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr "Erwartete @%s on oder off, nicht „%s“"
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "aus"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr "Nur @%s 10 oder 11 unterstützt, nicht „%s“"
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "ein"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Fehlende „}“ bei @def Argument"
 
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "Muss in einer „@%s“-Umgebung sein, um „@%s“ zu benutzen"
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr "„%s“ weggelassen vor Ausgabedateiname"
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr "„%s“ weggelassen, da in Standardausgabe geschrieben wird"
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr "Ausgabepuffer nicht leer."
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr "Angeforderter Fließumgebungstyp „%s“ vorher nicht benutzt"
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Siehe "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "„%c%s“ benötigt ein Argument „{...}“, nicht nur „%s“"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "Keine schließende Klammer für Fußnote „%s“"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "Fußnote außerhalb eines Elternknotens definiert"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Fußnoten innerhalb von Fußnoten sind nicht erlaubt"
 
 # HTML
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "Fu&szlig;noten"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: Konnte CSS-Datei nicht öffnen: %s"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: CSS-Datei endete inmitten eines Kommentars"
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "Ohne Titel"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr "[unerwartet] kein HTML-Tag für Pop-Operation"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[unerwartet] ungültiger Knotenname: „%s“"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Unbekannter Index „%s“"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info kann nicht mit „:“ im Indexeintrag „%s“ umgehen"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Index „%s“ existiert bereits"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Unbekannter Index „%s“ und/oder „%s“ in @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr "(Zeile )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr "(Zeile %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Unbekannter Index „%s“ in @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Eintrag für Index „%s“ außerhalb jeglichen Knotens"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(außerhalb jeglichen Knotens)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "Siehe "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr "@item nicht im Argument für @itemize erlaubt"
 
 # checkit
 # What does this mean? -ke-
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "„Broken-Type“ bei „insertion_type_pname“"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "Überlauf bei den Zahlen der Aufzählung"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "Überlauf bei den Buchstaben der Aufzählung. Beginne wieder bei %c"
 
 # %citem ist ein Texinfo-Befehl
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s benötigt ein Argument: den Formatierer für %citem"
 
 # %cfloat ist ein Texinfo-Befehl
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr "%cfloat-Umgebungen können nicht verschachtelt sein"
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "„@end“ erwartete „%s“, bekam jedoch „%s“"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Kein übereinstimmendes „%cend %s“"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s benötigt einen Buchstaben oder eine Zahl"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "Dateiende innerhalb eines „Verbatim“-Blocks"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "@%s nicht sinnvoll außerhalb einer „@float“-Umgebung"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu vor ersten @node gefunden. „Top“-Knoten wird angelegt"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "vielleicht sollte der @top-Knoten eher von @ifnottex als von @ifinfo "
 "umschlossen werden?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu vor ersten @node gefunden. „Top“-Knoten wird angelegt"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 "@%s nicht sinnvoll außerhalb von „@titlepage“- und „@quotation“-Umgebungen"
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "@%s nicht sinnvoll außerhalb einer „@titlepage“-Umgebung"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Nicht übereinstimmendes „%c%s“"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "„%c%s“ benötigt etwas nachfolgendes"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Fehlerhaftes Argument „%s“ zu „@%s“, benutze „%s“"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s nicht sinnvoll innerhalb eines „@%s“-Blocks"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx nicht sinnvoll innerhalb eines „%s“-Blocks"
 
 # checkit
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s außerhalb eines Einfügungsblocks gefunden"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr "kein voreingestelltes Gebiet für die Sprache „%s“ bekannt"
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ist kein gültiges ISO-639-Sprachkürzel"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "nicht erkannter Kodierungsname „%s“"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "Kodierung „%s“ wird leider nicht unterstützt."
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "Ungültiges kodiertes Zeichen: „%s“"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s erwartet „i“ oder „j“ als Argument, nicht „%c“"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s erwartet einen einzelnen Buchstaben „i“ oder „j“ als Argument"
@@ -2286,7 +2508,7 @@ msgstr "Makro „%s“ früher definiert"
 msgid "here is the previous definition of `%s'"
 msgstr "hier ist die frühere Definition von „%s“"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
@@ -2297,46 +2519,52 @@ msgstr ""
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makro „%s“ in Zeile %d mit zuvielen Argumenten aufgerufen"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend Makro nicht gefunden"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-Argument nur sinnvoll, wenn das Makro nur ein Argument hat"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr "@allow-recursion ist veraltet; bitte stattdessen @rmacro benutzen"
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
+"@quote-arg ist veraltet; Argumente werden standardmäßig in Anführungszeichen "
+"eingeschlossen"
+
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s stimmt nicht mit @%s überein"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Zu viele Fehler! Abbruch.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: Warnung: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "Fehlplazierte %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "„%s --help“ gibt weitere Informationen.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Aufruf: %s [OPTION]... TEXINFO-DATEI...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2345,40 +2573,41 @@ msgstr ""
 "standardmäßig in Info-Dateien, die online mit einem Info-Leser wie\n"
 "GNU Info (oder auch Emacs, TkInfo, etc.) gelesen werden können.\n"
 
-#: makeinfo/makeinfo.c:350
+#: makeinfo/makeinfo.c:354
 #, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
 "Allgemeine Optionen:\n"
 "      --error-limit=ZAHL      nach ZAHL Fehlern beenden (Standard %d)\n"
+"      --document-language=SPR  Locale für die Übersetzung von Texinfo-\n"
+"                                Schlüsselwörtern im Ausgabe-Dokument "
+"(Standard: C)\n"
 "      --force                 Ausgabedatei auch bei Fehlern nicht löschen\n"
 "      --help                  diese Hilfe zeigen und beenden\n"
 "      --no-validate           Überprüfen der Knoten-Querverweise "
 "unterdrücken\n"
 "      --no-warn               Warnungen (aber keine Fehler) unterdrücken\n"
-"      --reference-limit=ZAHL  warne bei höchstens ZAHL Verweisen (Standard %"
-"d)\n"
 "  -v, --verbose               ausführlich die Bearbeitungschritte anzeigen\n"
 "      --version               Programmversion anzeigen und beenden\n"
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 "Optionen zur Wahl des Ausgabeformats (Voreinstellung ist Info):\n"
 "      --docbook               DocBook XML anstelle von Info ausgeben\n"
@@ -2386,49 +2615,57 @@ msgstr ""
 "      --xml                   Texinfo XML anstelle von Info ausgeben\n"
 "      --plaintext             einfachen Text anstelle von Info ausgeben\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 "Allgemeine Ausgabe-Optionen:\n"
-"  -E, --macro-expand DATEI  originalen Quelltext mit expandierten Makros "
-"nach\n"
-"                            DATEI ausgeben, dabei @setfilename ignorieren\n"
+"  -E, --macro-expand DATEI  originalen Quelltext mit expandierten Makros in\n"
+"                              DATEI ausgeben, dabei @setfilename ignorieren\n"
 "      --no-headers          Knoten-Unterteiler, „Knoten:“-Kopfzeilen und "
 "Menüs\n"
-"                            unterdrücken in Info-Ausgabe (also nur Text\n"
-"                            erstellen) oder HTML (also kürzere Ausgabe);\n"
-"                            außerdem in die Standardausgabe schreiben\n"
-"      --no-split            Aufteilen langer Info-Dateien oder das Erzeugen\n"
-"                            einer HTML-Datei je Knoten unterdrücken\n"
+"                              unterdrücken in Info-Ausgabe (also reinen "
+"Text\n"
+"                              erstellen) oder HTML (also kürzere Ausgabe "
+"erzeugen);\n"
+"                              außerdem in die Standardausgabe schreiben\n"
+"      --no-split            Aufteilen langer Info- oder HTML-Dateien "
+"unterdrücken,\n"
+"                              nur eine Ausgabedatei erzeugen\n"
 "      --number-sections     Kapitel-, Abschnitt- und Anhangzählungen "
 "ausgeben\n"
-"  -o, --output=DATEI        Ausgabe nach DATEI (bzw. Verzeichnis wenn\n"
-"                            aufgeteiltes HTML)\n"
+"  -o, --output=DATEI        Ausgabe in DATEI (Verzeichnis bei aufgeteiltem "
+"HTML)\n"
 
-#: makeinfo/makeinfo.c:386
+#: makeinfo/makeinfo.c:391
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2436,9 +2673,12 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 "Optionen für Info und Nur-Text:\n"
-"      --enable-encoding       akzentuierte und spezielle Zeichen in die "
-"Info-\n"
-"                              Ausgabe gemäß @documentencoding ausgeben\n"
+"      --disable-encoding      keine akzentuierten und speziellen Zeichen in "
+"die\n"
+"                                 Info-Ausgabe gemäß @documentencoding "
+"ausgeben\n"
+"      --enable-encoding       Wirkung von --disable-encoding aufheben "
+"(Standard)\n"
 "      --fill-column=ZAHL      Zeilen nach ZAHL Zeichen umbrechen (Standard %"
 "d)\n"
 "      --footnote-style=STIL   Fußnoten in Info gemäß STIL ausgeben:\n"
@@ -2455,32 +2695,38 @@ msgstr ""
 "      --split-size=GRÖSSE     in GRÖSSE große Dateien splitten (Standard %"
 "d)\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 "Optionen für HTML:\n"
-"      --css-include=DATEI       DATEI in HTML-<style>-Ausgabe einfügen;\n"
-"                                  aus Standardeingabe, wenn DATEI „-“ ist\n"
+"      --css-include=DATEI     DATEI in HTML-<style>-Ausgabe einfügen;\n"
+"                                aus Standardeingabe, wenn DATEI „-“ ist\n"
+"      --css-ref=URL           Verweis auf eine CSS-Datei generieren\n"
+"      --transliterate-file-names\n"
+"                              Dateinamen in ASCII-Transliteration "
+"produzieren\n"
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 "Optionen für XML und Docbook:\n"
-"      --output-indent=WERT      XML-Elemente mit WERT Leerzeichen einrücken\n"
-"                                  (Voreinstellung: %d). Wenn WERT 0 ist, "
-"wird\n"
-"                                  ignorierbarer Leerraum weggelassen.\n"
+"      --output-indent=WERT    XML-Elemente mit WERT Leerzeichen einrücken\n"
+"                                (Voreinstellung: %d). Wenn WERT 0 ist, wird\n"
+"                                ignorierbarer Leerraum weggelassen.\n"
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2490,14 +2736,13 @@ msgid ""
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 "Eingabedatei-Optionen:\n"
-"      --commands-in-node-names   @-Befehle in Knotennamen zulassen\n"
-"  -D VAR                         eine Variable definieren (wie mit @set)\n"
-"  -I VERZ                        VERZ an den Suchpfad für @include anhängen\n"
-"  -P VERZ                        VERZ dem Suchpfad für @include "
-"voranstellen\n"
-"  -U VAR                         eine Variable aufheben (wie mit @clear)\n"
+"      --commands-in-node-names  @-Befehle in Knotennamen zulassen\n"
+"  -D VAR                        eine Variable definieren (wie mit @set)\n"
+"  -I VERZ                       VERZ an den Suchpfad für @include anhängen\n"
+"  -P VERZ                       VERZ dem Suchpfad für @include voranstellen\n"
+"  -U VAR                        eine Variable aufheben (wie mit @clear)\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2537,7 +2782,7 @@ msgstr ""
 "   Außerdem werden bei den --no-ifFORMAT-Optionen auch die entsprechenden\n"
 "   @ifnoFORMAT-Abschnitte bearbeitet.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2552,31 +2797,31 @@ msgstr ""
 "  wird reiner Text erzeugt, ist --ifplaintext an und die anderen sind aus;\n"
 "  wird XML erzeugt, ist --ifxml an und die anderen sind aus.\n"
 
-# Die "." am Zeilenende habe ich entfernt. -ke-
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "Beispiele:\n"
-"  makeinfo foo.texi                    Info gemäß @setfilename von foo\n"
-"                                         schreiben\n"
+"  makeinfo foo.texi                    Info gemäß @setfilename von foo "
+"schreiben\n"
 "  makeinfo --html foo.texi             HTML gemäß @setfilename schreiben\n"
 "  makeinfo --xml foo.texi              Texinfo XML gemäß @setfilename "
 "schreiben\n"
 "  makeinfo --docbook foo.texi          DocBook XML gemäß @setfilename "
 "schreiben\n"
-"  makeinfo --no-headers foo.texi       reinen Text in Standardausgabe\n"
-"                                         schreiben\n"
+"  makeinfo --no-headers foo.texi       reinen Text in Standardausgabe "
+"schreiben\n"
 "\n"
 "  makeinfo --html --no-headers foo.texi  HTML ohne Menüs oder „Knoten“-"
 "Zeilen\n"
@@ -2584,84 +2829,79 @@ msgstr ""
 "  makeinfo --no-split foo.texi           nur eine Info-Datei (kann groß "
 "sein)\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr "%s: Ignoriere nicht erkannten Wert „%s“ für TEXINFO_OUTPUT_FORMAT.\n"
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s Argument muss numerisch sein, nicht „%s“.\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s: Makro-Expansions-Ausgabedatei „%s“ kann nicht geöffnet werden"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s: ignoriere zweite Makro-Expansions-Ausgabedatei „%s“.\n"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: Argument für --paragraph-indent muss numerisch, „none“ oder „asis“ sein, "
 "nicht „%s“.\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: Argument für --footnote-style muss „separate“ oder „end“ sein, nicht „%"
 "s“.\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: Datei-Angabe fehlt.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Mehrzeilen-Befehl %c%s inkorrekt verwendet"
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "Habe „%s“ erwartet"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kann Verzeichnis „%s“ nicht anlegen: %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Kein „%s“ in „%s“ gefunden"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Keine Makro-Auflösung nach der Standard-Ausgabe, da auch die Info-"
 "Ausgabe dorthin geht.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "%s-Datei „%s“ von „%s“ wird erzeugt.\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "Dies ist %s, hergestellt von Makeinfo Version %s aus %s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2669,84 +2909,84 @@ msgstr ""
 "%s: Entferne Makro-Ausgabe-Datei „%s“ wegen Fehler; --force benutzen, um "
 "Datei beizubehalten.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: Entferne Ausgabe-Datei „%s“ wegen Fehler; --force benutzen, um diese "
 "beizubehalten.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Unbekannter Befehl „%s“"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 "Geschweifte Klammern verwenden, um einen Befehl als Argument an „@%s“ zu "
 "geben"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s erwartete geschweifte Klammern"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "Nicht übereinstimmende }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "Kein_NAME!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s fehlende schließende Klammer"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image-Datei „%s“ (für HTML) nicht lesbar: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, c-format
 msgid "No such file `%s'"
 msgstr "Kein Datei namens „%s“"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image-Datei „%s“ (für Text) nicht lesbar: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "@image fehlt als Argument ein Dateiname"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr "undefiniertes Flag: %s"
 
 # checkit
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Kein Wert für „%s“}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s erfordert einen Namen"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Dateiende vor erforderlichem „@end %s“ erreicht"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "„%.40s...“ ist zum Expandieren zu lang; nicht expandiert"
@@ -2755,176 +2995,141 @@ msgstr "„%.40s...“ ist zum Expandieren zu lang; nicht expandiert"
 msgid "Missing } in @multitable template"
 msgstr "Fehlende „}“ bei @multitable-Template"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "nicht interpretierbarer Text „%s“ nach @multitable wird ignoriert"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Zu viele Spalten im „@multitable“-Eintrag (maximal %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[unerwartet] Spalte %d kann in „multitable“ nicht ausgewählt werden"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "@tab außerhalb einer „multitable“ wird ignoriert"
 
 # checkit
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Mehrspalten-Ausgabe von der letzten Zeile:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* Spalte %d: Ausgabe = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Knoten „%s“ bereits in Zeile %d definiert"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Knoten „%s“ wird formatiert...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Knoten „%s“ benötigt einen Abschnittsbefehl (z.B. %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Kein Knotenname für den Befehl „%c%s“ angegeben"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Anker „%s“ und Knoten „%s“ zeigen auf gleichen Dateinamen."
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 "Dieser @anchor-Befehl wird ignoriert, da Verweise auf ihn nicht funktionieren"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Entweder diesen Anker umbenennen oder Option „--no-split“ verwenden"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "Unerwartete Zeichenkette am Ende der gesplitteten HTML-Datei „%s“"
 
-# HTML
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "n&auml;chstes:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "voriges:"
-
-# HTML
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "aufw&auml;rts:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Anker „%s“ und „%s“ zeigen auf gleichen Dateinamen."
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 "@anchor-Befehl wird ignoriert, da Referenzen auf ihn nicht funktionieren"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 "%sverweis auf nicht existierenden Knoten „%s“ (vielleicht @section statt "
 "@subsection o.ä.?)"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "Menü"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Quer"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 "Auf das Feld „nächstes“ (Next) des Knotens „%s“ wird nicht verwiesen "
 "(vielleicht @section statt @subsection o.ä.?)"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr ""
 "Dieser Knoten (%s) hat den fehlerhaften Eintrag im Feld „voriges“ (Prev)"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "voriges"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Auf das Feld „voriges“ (Prev) des Knotens „%s“ wird nicht verwiesen"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr ""
 "Dieser Knoten (%s) hat den fehlerhaften Eintrag im Feld „nächstes“ (Next)"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 "„%s“ hat kein Feld „aufwärts“ (Up) (vielleicht @section statt @subsection o."
 "ä.?)"
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "aufwärts"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 "Dem Knoten „%s“ fehlt ein Menüeintrag für „%s“, obwohl er dessen Ziel für "
 "„aufwärts“ (Up) ist"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "Knoten „%s“ wurde %d mal referenziert"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "Nicht referenzierter Knoten „%s“"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr "Entferne %s\n"
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Kann Datei „%s“ nicht entfernen: %s"
@@ -2939,267 +3144,105 @@ msgstr "Anhang %c"
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "Interner Fehler (search_sectioning) „%s“!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Interner Fehler (search_sectioning) „%s“!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s ist obsolet; %c%s stattdessen benutzen"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Knoten mit %ctop als Abschnitt existiert bereits"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Hier ist der %ctop-Knoten"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop vor %cnode benutzt, Voreinstellung %s wird genommen"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Inhaltsverzeichnis"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Inhalt in Kurzform"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-Datei „%s“ nicht lesbar: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 "@headitem als letztes Element von @multitable erzeugt ungültige Docbook-"
 "Dokumente"
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: Warnung: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " für %s"
-
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\t„%s --help“ gibt weitere Informationen.\n"
-
-# Die "." am Zeilenende habe ich entfernt. -ke-
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Aufruf: %s [OPTION]... [INFO-DATEI [VERZ-DATEI]]\n"
-"\n"
-"„dir“-Einträge von der INFO-DATEI in der Info-Verzeichnis-Datei VERZ-DATEI\n"
-"installieren oder löschen.\n"
-"\n"
-"Optionen:\n"
-" --delete          vorhandene Einträge für INFO-DATEI aus VERZ-DATEI "
-"löschen;\n"
-"                     keine neuen Einträge einfügen\n"
-" --dir-file=NAME   Name der Info-Verzeichnis-Datei angeben. Gleichbedeutend\n"
-"                     mit dem VERZ-DATEI-Argument\n"
-" --entry=TEXT      TEXT als einen Info-Verzeichnis-Eintrag einfügen. TEXT\n"
-"                     soll die Form einer Zeile eines Info-Menüeintrags "
-"haben,\n"
-"                     zuzüglich mehrerer Extra-Zeilen (oder keiner), die mit\n"
-"                     Leerraum („whitespace“) beginnen. Wenn mehr als ein\n"
-"                     Eintrag angegeben wird, werden alle hinzugefügt. Wenn\n"
-"                     kein Eintrag angegeben wird, wird der Eintragstext der\n"
-"                     Info-Datei selbst entnommen.\n"
-" --help            diese Hilfe zeigen\n"
-" --info-file=DATEI Info-Datei angeben, die im Verzeichnis zu installieren "
-"ist.\n"
-"                     Gleichbedeutend mit dem INFO-DATEI-Argument\n"
-" --info-dir=VERZ   wie --dir-file=VERZ/dir\n"
-" --item=TEXT       wie --entry TEXT\n"
-"                     Ein Info-Verzeichnis-Eintrag ist nämlich ein "
-"Menüeintrag.\n"
-" --quiet           Warnungen unterdrücken\n"
-" --remove          wie --delete\n"
-" --section=ABSCHN  die Einträge dieser Datei in den Abschnitt ABSCHN des\n"
-"                     Verzeichnisses stellen. Wird mehr als ein Abschnitt\n"
-"                     angegeben, werden alle Einträge in jedem der\n"
-"                     Abschnitte hinzugefügt. Wird gar kein Abschnitt\n"
-"                     angegeben, wird der Eintragstext der Info-Datei selbst\n"
-"                     entnommen.\n"
-" --version         Programmversion anzeigen\n"
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
-msgstr ""
-"Dies ist die Datei .../info/dir, die den obersten Knoten der\n"
-"Info-Hierarchie enthält, genannt (dir)Top.\n"
-"Beim ersten Aufruf von Info geht es bei diesem Knoten los.\n"
-"\n"
-"%s\tDies ist der Beginn des INFO-Baums\n"
-"\n"
-"  Dieser Verzeichnis-Knoten zeigt ein Menü aller Hauptpunkte an.\n"
-"  „q“ beendet Info, „?“ listet alle Info-Befehle auf, „d“ kehrt hierher\n"
-"  zurück, „h“ gibt eine Einsteiger-Hilfe, „mEmacs<Return>“ besucht das\n"
-"  Emacs-Manual, etc.\n"
-"\n"
-"  Im Emacs kann man mit dem zweiten Mausknopf auf einen Menüeintrag oder\n"
-"  einen Querverweis klicken, um einen solchen auswählen.\n"
-"\n"
-"%s\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: kann nicht gelesen (%s) und nicht angelegt werden (%s)\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: leere Datei"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY ohne END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY ohne START-INFO-DIR-ENTRY"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "aus"
 
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr "%s: Verzeichnisdatei schon vorhanden: %s\n"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "ein"
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Info-Datei nur einmal angeben.\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "Erstes Argument für Querverweis darf nicht leer sein."
 
-#: util/install-info.c:1284
+#: makeinfo/xref.c:252
 #, c-format
-msgid "excess command line argument `%s'"
-msgstr "überflüssiges Kommandozeilen-Argument „%s“ wird übergangen"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
-msgstr "Keine Eingabe-Datei angegeben; „--help“ gibt weitere Informationen."
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr "Leerer Dateiname für HTML-Querverweis in „%s“"
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr "Keine dir-Datei angegeben; „--help“ gibt weitere Informationen."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr "Dateiende erreicht, während „.“ oder „,“ gesucht wurden"
 
-#: util/install-info.c:1313
+#: makeinfo/xref.c:390
 #, c-format
-msgid "no info dir entry in `%s'"
-msgstr "Kein Info-Verzeichnis-Eintrag in „%s“"
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "„.“ or „,“ muss @%s folgen, nicht „%c“"
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "Menüeintrag „%s“ bereits vorhanden, und zwar für Datei „%s“"
+#: makeinfo/xref.c:392
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "für Querverweise in Klammern @pxref benutzen"
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "keine Einträge für „%s“ gefunden; nichts entfernt"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "Erstes Argument für @inforef darf nicht leer sein."
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "diese Hilfe anzeigen"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "temporäre Dateien nach Programmende nicht entfernen"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "temporäre Dateien nach Programmende entfernen (Standard)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "Ausgabe nach DATEI schicken"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "Programmversion anzeigen"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Aufruf: %s [OPTION]... DATEI...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Erzeuge einen sortierten Index für jede TeX-Ausgabedatei.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr "DATEI... ist normalerweise „foo.%c%c“ für ein Dokument „foo.texi“.\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3208,44 +3251,46 @@ msgstr ""
 "\n"
 "Optionen:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: keine Texinfo-Indexdatei"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "Fehler beim Wiederöffnen von „%s“"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: keine Texinfo-Indexdatei"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "Keine Seitenzahl in %s"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "Eintrag „%s“ direkt nach einem Untereintrag"
 
-#~ msgid "\"\" is invalid"
-#~ msgstr "„“ ist ungültig"
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-Argument nur sinnvoll, wenn das Makro nur ein Argument hat"
 
-#~ msgid "File exists, but is not a directory"
-#~ msgstr "Datei existiert, ist aber kein Verzeichnis"
+#~ msgid "Table of Contents"
+#~ msgstr "Inhaltsverzeichnis"
 
-#~ msgid "First argument to cross-reference may not be empty"
-#~ msgstr "Erstes Argument für Querverweis darf nicht leer sein."
+#~ msgid "Short Contents"
+#~ msgstr "Inhalt in Kurzform"
 
-#~ msgid "see "
-#~ msgstr "siehe "
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "temporäre Dateien nach Programmende nicht entfernen"
 
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "„.“ or „,“ muss einem Querverweis folgen, nicht %c"
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "temporäre Dateien nach Programmende entfernen (Standard)"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "„“ ist ungültig"
 
-#~ msgid "First argument to @inforef may not be empty"
-#~ msgstr "Erstes Argument für @inforef darf nicht leer sein."
+#~ msgid "File exists, but is not a directory"
+#~ msgstr "Datei existiert, ist aber kein Verzeichnis"
 
 #~ msgid "Node:"
 #~ msgstr "Knoten:"
@@ -3256,10 +3301,6 @@ msgstr "Eintrag „%s“ direkt nach einem Untereintrag"
 #~ msgid "%s: Specify the Info directory only once.\n"
 #~ msgstr "%s: Info-Verzeichnis nur einmal angeben.\n"
 
-# checkit
-#~ msgid "virtual memory exhausted"
-#~ msgstr "kein Speicher mehr"
-
 #~ msgid "No `%s.png' or `.jpg', and no extension supplied"
 #~ msgstr "Kein .png oder .jpg für „%s“ und keine Erweiterung angegeben."
 
diff --git a/Build/source/utils/texinfo/po/de_AT.gmo b/Build/source/utils/texinfo/po/de_AT.gmo
index 2e74709de3b..15804666541 100644
--- a/Build/source/utils/texinfo/po/de_AT.gmo
+++ b/Build/source/utils/texinfo/po/de_AT.gmo
diff --git a/Build/source/utils/texinfo/po/de_AT.po b/Build/source/utils/texinfo/po/de_AT.po
index 51e8201c4cc..44fc27bbc6f 100644
--- a/Build/source/utils/texinfo/po/de_AT.po
+++ b/Build/source/utils/texinfo/po/de_AT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 3.12d\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
 "PO-Revision-Date: 1999-02-16 21:14+01:00\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -17,132 +17,198 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr ""
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr ""
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr ""
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr ""
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr ""
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr ""
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr ""
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr ""
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr ""
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr ""
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr ""
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr ""
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr ""
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr ""
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr ""
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr ""
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr ""
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr ""
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr ""
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr ""
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr ""
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr ""
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr ""
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr ""
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr ""
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr ""
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr ""
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr ""
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr ""
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr ""
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr ""
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr ""
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr ""
 
@@ -150,143 +216,169 @@ msgstr ""
 msgid "---------- Footnotes ----------"
 msgstr ""
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr ""
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr ""
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr ""
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr ""
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr ""
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr ""
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr ""
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr ""
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr ""
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, c-format
 msgid "Scanning indices of `%s'..."
 msgstr ""
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr ""
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr ""
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, c-format
 msgid ""
 "\n"
 "* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr ""
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
 #, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr ""
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-
-#: info/info.c:597
+#: info/info.c:598
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
 
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -294,470 +386,446 @@ msgid ""
 "Texinfo home page: http://www.gnu.org/software/texinfo/"
 msgstr ""
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr ""
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr ""
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr ""
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr ""
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr ""
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr ""
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr ""
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr ""
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr ""
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr ""
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ""
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr ""
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr ""
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr ""
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr ""
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
+#: info/infodoc.c:47
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr ""
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr ""
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr ""
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
+#: info/infodoc.c:51
+msgid "\\%-10[prev-line]  Move up one line.\n"
 msgstr ""
 
-#: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
+#: info/infodoc.c:52
+msgid "\\%-10[next-line]  Move down one line.\n"
 msgstr ""
 
-#: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
+#: info/infodoc.c:53
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr ""
+
+#: info/infodoc.c:54
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
 msgstr ""
 
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
+#: info/infodoc.c:55
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr ""
+
+#: info/infodoc.c:56
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
 msgstr ""
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr ""
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
 msgstr ""
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
 msgstr ""
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
 msgstr ""
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
 msgstr ""
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
+msgid "\\%-10[up-node]  Go up one level.\n"
 msgstr ""
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
+#: info/infodoc.c:67
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr ""
+
+#: info/infodoc.c:68
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
 msgstr ""
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
 msgstr ""
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
 msgstr ""
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
 msgstr ""
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
 msgstr ""
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
 msgstr ""
 
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+#: info/infodoc.c:76
+msgid "\\%-10[search]  Search forward for a specified string.\n"
 msgstr ""
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
+#: info/infodoc.c:77
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
 msgstr ""
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:78
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
 msgstr ""
 
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr ""
-
-#: info/infodoc.c:81
+#: info/infodoc.c:79
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
+#: info/infodoc.c:81
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
 msgstr ""
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr ""
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr ""
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr ""
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr ""
 
-#: info/infodoc.c:107
+#: info/infodoc.c:101
 #, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr ""
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr ""
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr ""
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr ""
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr ""
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr ""
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr ""
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr ""
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr ""
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr ""
 
-#: info/infodoc.c:127
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+
+#: info/infodoc.c:121
 #, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:129
+#: info/infodoc.c:125
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
 
-#: info/infodoc.c:131
+#: info/infodoc.c:127
 #, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr ""
-
-#: info/infodoc.c:132
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 
-#: info/infodoc.c:133
+#: info/infodoc.c:129
 #, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr ""
-
-#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 
-#: info/infodoc.c:135
+#: info/infodoc.c:131
 #, c-format
-msgid "  %-10s  Search backward for a specified string\n"
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
 msgstr ""
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr ""
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr ""
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr ""
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr ""
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr ""
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr ""
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr ""
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr ""
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr ""
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr ""
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr ""
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr ""
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr ""
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr ""
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
 
 #: info/infokey.c:170
@@ -858,95 +926,95 @@ msgid ""
 "  --version            display version information and exit.\n"
 msgstr ""
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr ""
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr ""
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr ""
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr ""
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr ""
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr ""
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr ""
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, c-format
 msgid "Undefined command: %s"
 msgstr ""
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr ""
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr ""
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr ""
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -954,532 +1022,536 @@ msgid ""
 "  ----------                        -----   ----   ---------------"
 msgstr ""
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
 msgstr ""
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr ""
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr ""
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr ""
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr ""
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
 "for menu item."
 msgstr ""
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr ""
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr ""
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr ""
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr ""
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr ""
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr ""
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr ""
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr ""
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr ""
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr ""
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr ""
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr ""
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr ""
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr ""
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr ""
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr ""
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr ""
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr ""
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr ""
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr ""
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr ""
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr ""
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr ""
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr ""
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr ""
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr ""
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr ""
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr ""
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr ""
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr ""
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr ""
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr ""
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr ""
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr ""
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr ""
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr ""
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr ""
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr ""
 
-#: info/session.c:1848
-msgid "Select the Next node"
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
 msgstr ""
 
 #: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
+msgid "Select the Next node"
+msgstr ""
+
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr ""
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr ""
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr ""
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr ""
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr ""
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr ""
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr ""
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr ""
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr ""
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr ""
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr ""
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr ""
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr ""
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr ""
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr ""
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr ""
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr ""
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr ""
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr ""
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr ""
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr ""
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr ""
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr ""
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr ""
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr ""
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr ""
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr ""
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr ""
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr ""
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr ""
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr ""
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr ""
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr ""
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr ""
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr ""
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr ""
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr ""
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr ""
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr ""
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr ""
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr ""
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr ""
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr ""
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+msgid "Search continued from the beginning of the document."
+msgstr ""
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr ""
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr ""
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr ""
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr ""
 
-#: info/session.c:3670 info/session.c:3677
+#: info/session.c:3863 info/session.c:3869
 #, c-format
-msgid "%s%sfor string [%s]: "
+msgid "%s%s%s [%s]: "
 msgstr ""
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
 msgstr ""
 
-#: info/session.c:3672 info/session.c:3678
-msgid "Search"
+#: info/session.c:3865 info/session.c:3871
+msgid " case-sensitively"
 msgstr ""
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
+#: info/session.c:3866 info/session.c:3872
+msgid " backward"
 msgstr ""
 
-#: info/session.c:3674 info/session.c:3679
-msgid " "
+#: info/session.c:3870
+msgid "Search"
 msgstr ""
 
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr ""
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr ""
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr ""
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr ""
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr ""
 
-#: info/session.c:3851
+#: info/session.c:4044
+msgid "Regexp I-search backward: "
+msgstr ""
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr ""
 
-#: info/session.c:3853
+#: info/session.c:4047
+msgid "Regexp I-search: "
+msgstr ""
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr ""
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr ""
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr ""
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr ""
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr ""
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr ""
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr ""
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr ""
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr ""
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr ""
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr ""
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr ""
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, c-format
 msgid "`%s' is invalid"
 msgstr ""
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr ""
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr ""
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr ""
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr ""
@@ -1512,272 +1584,395 @@ msgstr ""
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr ""
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr ""
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr ""
 
-#: info/variables.c:74
+#: info/variables.c:81
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr ""
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr ""
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr ""
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr ""
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr ""
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr ""
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr ""
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr ""
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr ""
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr ""
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr ""
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr ""
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: warning: "
 msgstr ""
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid " for %s"
 msgstr ""
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr ""
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:508
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr ""
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
 msgstr ""
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:570
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
 msgstr ""
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr ""
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: empty file"
+msgstr ""
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr ""
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr ""
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
 msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "Extra regular expression specified, ignoring `%s'"
 msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: install-info/install-info.c:2129
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr ""
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ""
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr ""
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr ""
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
 msgstr ""
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "Jänner"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr ""
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr ""
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr ""
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr ""
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr ""
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr ""
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr ""
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr ""
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr ""
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr ""
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr ""
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr ""
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
 msgstr ""
 
-#: makeinfo/defun.c:424
-msgid "Method"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
 msgstr ""
 
 #: makeinfo/defun.c:711
@@ -1785,247 +1980,254 @@ msgstr ""
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr ""
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr ""
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr ""
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr ""
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr ""
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr ""
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr ""
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr ""
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr ""
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr ""
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr ""
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr ""
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr ""
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr ""
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr ""
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr ""
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr ""
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr ""
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr ""
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr ""
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr ""
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr ""
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr ""
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr ""
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr ""
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr ""
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr ""
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr ""
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr ""
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr ""
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr ""
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr ""
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr ""
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr ""
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr ""
@@ -2040,7 +2242,7 @@ msgstr ""
 msgid "here is the previous definition of `%s'"
 msgstr ""
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
@@ -2050,104 +2252,114 @@ msgstr ""
 msgid "Macro `%s' called on line %d with too many args"
 msgstr ""
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr ""
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
 msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
+
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr ""
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr ""
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:350
+#: makeinfo/makeinfo.c:354
 #, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:386
+#: makeinfo/makeinfo.c:391
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2155,24 +2367,27 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2182,7 +2397,7 @@ msgid ""
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2202,7 +2417,7 @@ msgid ""
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2211,171 +2426,167 @@ msgid ""
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr ""
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, c-format
 msgid "%c%s expected braces"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, c-format
 msgid "No such file `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
@@ -2384,161 +2595,128 @@ msgstr ""
 msgid "Missing } in @multitable template"
 msgstr ""
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr ""
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr ""
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr ""
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr ""
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr ""
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr ""
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr ""
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr ""
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr ""
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr ""
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr ""
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr ""
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr ""
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr ""
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr ""
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr ""
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr ""
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr ""
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr ""
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr ""
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr ""
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr ""
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr ""
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr ""
@@ -2553,236 +2731,125 @@ msgstr ""
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr ""
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr ""
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr ""
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr ""
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr ""
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr ""
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr ""
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr ""
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr ""
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr ""
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr ""
-
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr ""
-
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
-msgstr ""
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr ""
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
+#: makeinfo/xml.c:2150
+msgid "of"
 msgstr ""
 
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+#: makeinfo/xml.c:2155
+msgid "on"
 msgstr ""
 
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
 msgstr ""
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: makeinfo/xref.c:252
 #, c-format
-msgid "%s: already have dir file: %s\n"
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
 msgstr ""
 
-#: util/install-info.c:1284
+#: makeinfo/xref.c:390
 #, c-format
-msgid "excess command line argument `%s'"
+msgid "`.' or `,' must follow @%s, not `%c'"
 msgstr ""
 
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
+#: makeinfo/xref.c:392
+msgid "for cross-references in parentheses, use @pxref"
 msgstr ""
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:1313
-#, c-format
-msgid "no info dir entry in `%s'"
-msgstr ""
-
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr ""
-
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr ""
-
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr ""
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr ""
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr ""
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr ""
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr ""
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
+#: util/texindex.c:743
 #, c-format
-msgid "%s: not a texinfo index file"
+msgid "failure reopening %s"
 msgstr ""
 
-#: util/texindex.c:968
+#: util/texindex.c:758 util/texindex.c:786
 #, c-format
-msgid "failure reopening %s"
+msgid "%s: not a texinfo index file"
 msgstr ""
 
-#: util/texindex.c:1218
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr ""
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr ""
diff --git a/Build/source/utils/texinfo/po/en@boldquot.header b/Build/source/utils/texinfo/po/en@boldquot.header
new file mode 100644
index 00000000000..fedb6a06d12
--- /dev/null
+++ b/Build/source/utils/texinfo/po/en@boldquot.header
@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
diff --git a/Build/source/utils/texinfo/po/en@quot.header b/Build/source/utils/texinfo/po/en@quot.header
new file mode 100644
index 00000000000..a9647fc35c3
--- /dev/null
+++ b/Build/source/utils/texinfo/po/en@quot.header
@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
diff --git a/Build/source/utils/texinfo/po/eo.gmo b/Build/source/utils/texinfo/po/eo.gmo
index 483829a6a6d..d159f2e8ddd 100644
--- a/Build/source/utils/texinfo/po/eo.gmo
+++ b/Build/source/utils/texinfo/po/eo.gmo
diff --git a/Build/source/utils/texinfo/po/eo.po b/Build/source/utils/texinfo/po/eo.po
index 9fef8519299..d8d8a9f6730 100644
--- a/Build/source/utils/texinfo/po/eo.po
+++ b/Build/source/utils/texinfo/po/eo.po
@@ -1,333 +1,385 @@
 # Esperanto translations for GNU Texinfo-4.0.
-# Copyright (C) 1999, 2002 Free Software Foundation, Inc.
-# Sergio Pokrovskij <pok@iis.nsk.su>, 1999-2003
+# Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+# Sergio Pokrovskij <sergio.pokrovskij@gmail.com>, 1999-2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.3c\n"
+"Project-Id-Version: texinfo 4.7.94\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
-"PO-Revision-Date: 2003-01-25 11:47+06:00\n"
-"Last-Translator: Sergio Pokrovskij <pok@iis.nsk.su>\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2006-11-25 23:35+0600\n"
+"Last-Translator: Sergio Pokrovskij <sergio.pokrovskij@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=us-ascii\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opcio «%s» estas ambigua\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opcio „--%s‟ ne toleras argumenton\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opcio „%c%s‟ ne toleras argumenton\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opcio «%s» bezonas argumenton\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: nekonata opcio „--%s‟\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: nekonata opcio „%c%s‟\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: misa opcio -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: nevalida opcio -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opcio bezonas argumenton -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opcio „-W %s‟ estas ambigua\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opcio „-W %s‟ ne toleras argumenton\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr ""
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
-msgstr "Unu signon antauxen"
+msgstr "Unu signon antaÅ­en"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
-msgstr "Unu signon malantauxen"
+msgstr "Unu signon malantaÅ­en"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
-msgstr "Al la komenco de cxi tiu linio"
+msgstr "Al la komenco de ĉi tiu linio"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
-msgstr "Al la fino de cxi tiu linio"
+msgstr "Al la fino de ĉi tiu linio"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
-msgstr "Unu vorton antauxen"
+msgstr "Unu vorton antaÅ­en"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
-msgstr "Unu vorton malantauxen"
+msgstr "Unu vorton malantaÅ­en"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Forigu la signon subkursoran"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
-msgstr "Forigu la signon jxus antaux la kursoro"
+msgstr "Forigu la signon ĵus antaŭ la kursoro"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
-msgstr "Rezigno aux eliro"
+msgstr "Rezigno aÅ­ eliro"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
-msgstr "Akceptu (aux kompletigu) cxi tiun linion"
+msgstr "Akceptu (aŭ kompletigu) ĉi tiun linion"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
-msgstr "Ensxovu la tujan signon sensxangxe"
+msgstr "En�ovu la tujan signon sen�an�e"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
-msgstr "Ensxovu tiun signon"
+msgstr "En�ovu tiun signon"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
-msgstr "Ensxovu TAB-signon"
+msgstr "En�ovu TAB-signon"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
-msgstr "Permutu la signojn cxe la kursoro"
+msgstr "Permutu la signojn ĉe la kursoro"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
-msgstr "Engluu la enhavon de la lasta forvisxo"
+msgstr "Engluu la enhavon de la lasta forvi�o"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
-msgstr "Visxringo malplenas"
+msgstr "Vi�ringo malplenas"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
-msgstr "Regluu antauxan forvisxajxon"
+msgstr "Regluu antaŭan forvi�aĵon"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
-msgstr "Forvisxu ekde la kursoro gxis la fino de la linio"
+msgstr "Forvi�u ekde la kursoro �is la fino de la linio"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
-msgstr "Forvisxu ekde la kursoro gxis la komenco de la linio"
+msgstr "Forvi�u ekde la kursoro �is la komenco de la linio"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
-msgstr "Forvisxu la vorton tuj post la kursoro"
+msgstr "Forvi�u la vorton tuj post la kursoro"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
-msgstr "Forvisxu la vorton jxus antaux la kursoro"
+msgstr "Forvi�u la vorton ĵus antaŭ la kursoro"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Kompletigo malestas"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Nekompleta"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "Eligu la eblajn kompletigojn"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "Sola kompletigo"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "Unu kompletigo:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d kompletigoj:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
-msgstr "Ensxovu la kompletigon"
+msgstr "En�ovu la kompletigon"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
-msgstr "Kompletigoj estas sercxataj ..."
+msgstr "Kompletigoj estas serĉataj ..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "Rulumu la fenestron de kompletigoj"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "La piednotoj ne eligeblas"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
-msgstr "Montru la piednotojn el cxi tiu nodo en alia fenestro"
+msgstr "Montru la piednotojn el ĉi tiu nodo en alia fenestro"
 
 #: info/footnotes.h:26
 msgid "---------- Footnotes ----------"
 msgstr "---------- Piednotoj ----------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
-msgstr "Sercxu cxenon en la indekso por cxi tiu dosiero"
+msgstr "Serĉu ĉenon en la indekso por ĉi tiu dosiero"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
-msgstr "Estas sercxataj indeksaj artikoloj ..."
+msgstr "Estas serĉataj indeksaj artikoloj ..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "Nenia indekso trovita."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Indeksa artikolo: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
-"Pasu al la sekva indeksa ero kongrua al la lasta komando \"\\[index-search]\""
+"Pasu al la sekva indeksa ero kongrua al la lasta komando „\\[index-search]‟"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
-msgstr "Malestas antauxa cxeno por sercxo en indekso."
+msgstr "Malestas antaŭa ĉeno por serĉo en indekso."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Neniu indeksa artikolo."
 
-#: info/indices.c:375
-#, fuzzy, c-format
+#: info/indices.c:374
+#, c-format
 msgid "No %sindex entries containing `%s'."
-msgstr "En la indekso ne estas %sartikoloj kun \"%s\"."
+msgstr "En la indekso ne estas %sartikoloj kun «%s»."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "pli da "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
-msgstr "MALEBLAS VIDI CxI TION"
+msgstr "MALEBLAS VIDI ĈI TION"
 
-#: info/indices.c:422
-#, fuzzy, c-format
+#: info/indices.c:421
+#, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
-msgstr "Trovita \"%s\" en %s.  (\"\\[next-index-match]\" sercxos la sekvan.)"
+msgstr "Trovita «%s» en %s.  („\\[next-index-match]‟ serĉos la sekvan.)"
 
-#: info/indices.c:541
-#, fuzzy, c-format
+#: info/indices.c:549
+#, c-format
 msgid "Scanning indices of `%s'..."
-msgstr "Sercxo en la indeksoj de \"%s\"..."
+msgstr "Serĉo en la indeksoj de «%s» ..."
 
-#: info/indices.c:596
-#, fuzzy, c-format
+#: info/indices.c:604
+#, c-format
 msgid "No available info files have `%s' in their indices."
-msgstr "\"%s\" malestas en la indeksoj de la disponeblaj Info-dosieroj"
+msgstr "«%s» malestas en la indeksoj de la disponeblaj Info-dosieroj"
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
-msgstr "Sercxu cxenon en cxiuj konataj indeksoj Info-dosieraj kaj faru menuon"
+msgstr "Serĉu ĉenon en ĉiuj konataj indeksoj Info-dosieraj kaj faru menuon"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
-msgstr "Sercxu en indekso informon pri: "
+msgstr "Serĉu en indekso informon pri: "
 
-#: info/indices.c:654
-#, fuzzy, c-format
+#: info/indices.c:662
+#, c-format
 msgid ""
 "\n"
 "* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
-"* Menu: Nodoj kies indices entenas \"%s\":\n"
+"* Menu: Nodoj kies indeksoj entenas «%s»:\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
-msgstr "Por ricevi pli da informoj uzu la opcion \"--help\".\n"
+msgstr "Por ricevi pli da informoj uzu la opcion „--help‟.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
-#, fuzzy, c-format
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (c) %s Free Software Foundation, Inc.\n"
-"NENIA garantio estas donita.  Vi rajtas pludoni ekzemplerojn de cxi tiu\n"
-"programo laux la kondicxoj de la GNUa Gxenerala Publika Permesilo.  Pluaj\n"
-"informoj troveblas en la dosieroj COPYING.\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
-msgstr "por \"%s\" ne trovigxis indeksa artikolo\n"
+msgstr "por «%s» ne trovi�is indeksa artikolo\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr "  -b, --speech-friendly        estu afabla al la parolsinteziloj.\n"
-
-#: info/info.c:597
-#, fuzzy, c-format
+#: info/info.c:598
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+#, fuzzy
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr "  -b, --speech-friendly        estu afabla al la parolsinteziloj.\n"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Sintakso: %s [OPCIO]... [MENUERO...]\n"
-"\n"
-"Ebligas legi dokumentaron prezentitan en Info.\n"
-"\n"
-"Opcioj:\n"
-"    --apropos=TEMO          Sercxu TEMOn en cxiuj indeksoj de cxiuj "
-"dokumentoj.\n"
-"-d, --directory=UJO         Aldonu la dosierUJOn al INFOPATH.\n"
-"    --dribble=DOSIERO       Notu la klavofrapojn de la uzanto en DOSIERO.\n"
-"-f, --file=DOSIERO          Vizitu la Info-DOSIEROn.\n"
-"-h, --help                  Eligu cxi tiun helpeton kaj finu.\n"
-"    --index-search=CxENO    Vizitu nodon referencatan per indeksartikolo "
-"CxENO.\n"
-"-n, --node=NODO             Komencu per NODO.\n"
-"-o, --output=DOSIERO        Eligu la elektitajn nodojn en DOSIEROn.\n"
-"-R, --raw-escapes           Ne forigu ANSI-eskapilojn el man-pagxoj\n"
-"    --restore=DOSIERO       Legu la klavofrapojn el DOSIERO.\n"
-"-O, --show-options, --usage Montru la nodon pri komandliniaj opcioj.\n"
-"%s  --subnodes              Rekursie eligu la menuerojn.\n"
-"    --vi-keys               Uzu vi-eskan kaj less-eskan klavararangxon\n"
-"    --version               Eligu la version de la programo kaj finu.\n"
-"\n"
-"La unua neopcia argumento, se donita, estas la nomo de unue vizitenda\n"
-"menuero, sercxota en cxiuj \"dir\"-dosieroj troveblaj per INFOPATH.\n"
-"Se gxi mankas, Info kunfandas cxiujn \"dir\"-dosierojn kaj eligas la "
-"rezulton.\n"
-"La ceteraj argumentoj estas la nomoj de menueroj relative al la unue\n"
-"vizitenda nodo.\n"
-"\n"
-"Ekzemploj:\n"
-" info                       eligu la menuon de la kataloga nodo\n"
-" info emacs                 komencu per la nodo \"emacs\" el la kataloga "
-"nodo\n"
-" info emacs buffers         komencu per la nodo \"buffers\" el Emaksa "
-"manlibro\n"
-" info --show-options emacs  komencu per la Emaksaj komandliniaj opcioj\n"
-" info -f ./um.info          eligu la dosieron ./um.info sen atenti \"dir\"\n"
-
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -335,419 +387,422 @@ msgid ""
 "Texinfo home page: http://www.gnu.org/software/texinfo/"
 msgstr ""
 "\n"
-"Erarraportojn sendu al <bug-texinfo@nu.org>; gxeneralajn\n"
+"Erarraportojn sendu al <bug-texinfo@nu.org>; �eneralajn\n"
 "demandojn kaj opiniojn al <help-texinfo@gnu.org>.\n"
-"La hejmpagxo de Texinfo: <http://www.gnu.org/software/texinfo/>.\n"
+"La hejmpa�o de Texinfo: <http://www.gnu.org/software/texinfo/>.\n"
 "Por la diskutoj pri Esperanto-traduko uzu la dissendoliston\n"
 "<translation-team-eo@lists.sourceforge.net>."
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
-msgstr "La nodo \"%s\" ne troveblas."
+msgstr "La nodo «%s» ne troveblas."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
-msgstr "La nodo \"(%s)%s\" ne troveblas."
+msgstr "La nodo „(%s)%s‟ ne troveblas."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "Maleblas trovi fenestron!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
-msgstr "La muskursoro ne estas en cxi-fenestra nodo!"
+msgstr "La muskursoro ne estas en ĉi-fenestra nodo!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "Maleblas forigi la lastan fenestron"
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
-msgstr "En cxi tiu nodo malestas menuo."
+msgstr "En ĉi tiu nodo malestas menuo."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
-msgstr "Ne estas piednotoj en cxi tiu nodo."
+msgstr "Ne estas piednotoj en ĉi tiu nodo."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
-msgstr "Neniu referenco en cxi tiu nodo."
+msgstr "Neniu referenco en ĉi tiu nodo."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
-msgstr "Mankas ligilo \"%s\" por cxi tiu nodo."
+msgstr "Mankas ligilo «%s» por ĉi tiu nodo."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
-msgstr "Nekonata Info-komando \"%c\"; tajpu \"?\" por helpo."
+msgstr "Nekonata Info-komando „%c‟; tajpu „?‟ por helpo."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
-msgstr "La terminaloj de tipo \"%s\" ne estas suficxe inteligentaj por Info."
+msgstr "La terminaloj de tipo «%s» ne estas sufiĉe inteligentaj por Info."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
-msgstr "Tiu pagxo jam estas la lasta en cxi tiu nodo"
+msgstr "Tiu pa�o jam estas la lasta en ĉi tiu nodo"
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
-msgstr "Tio jam estas la unua pagxo de cxi tiu nodo"
+msgstr "Tio jam estas la unua pa�o de ĉi tiu nodo"
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "Nur unu fenestro."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "La fenestro rezultos tro malgranda."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Mankas spaco por helpa fenestro, bv forigi iun fenestron."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
-"La cxefaj komandoj info-fenestraj\n"
-"*********************************\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
-msgstr "\\%-10[quit-help]  Forlasu cxi tiun helpon.\n"
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
+msgstr "\\%-10[quit-help]  Forlasu ĉi tiun helpon.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit-help]  Forlasu la tutan Info.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Voku la lernilon pri Info.\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"Por elekti aliajn nodojn:\n"
-"-------------------------\n"
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[next-line]  Unu pa�on malantaŭen.\n"
+
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  Unu pa�on antaŭen.\n"
+
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Unu pa�on malantaŭen.\n"
+
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Unu pa�on antaŭen.\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr ""
-"\\%-10[next-node]  Iru al la tujsekva (\"Next\") nodo de cxi tiu nodo.\n"
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Iru al la komenco de ĉi tiu nodo.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr ""
-"\\%-10[prev-node]  Iru al la jxusantauxa (\"Previous\") nodo de cxi tiu "
-"nodo.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Iru al la tujsupra (\"Up\") nodo de cxi tiu nodo.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Iru al la fino de ĉi tiu nodo.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
-"\\%-10[menu-item]  Elektu menueron indikitan per nomo.\n"
-"      Elekto de menuero kauxzas transiron en alian nodon.\n"
+"\\%-10[move-to-next-xref]  Saltu sur la sekvan hipertekstan ligilon en ĉi "
+"tiu nodo.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
+#, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
-"\\%-10[xref-item]  Sekvu referencon  (legante la nomon de la referenco).\n"
+"\\%-10[select-reference-this-line]  Iru laÅ­ la subkursora hiperteksta ligo.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr ""
-"\\%-10[history-node]  Revenu al la Lasta nodo vizitita en cxi tiu fenestro.\n"
+"\\%-10[history-node]  Revenu al la Lasta nodo vizitita en ĉi tiu fenestro.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
 msgstr ""
-"\\%-10[move-to-next-xref]  Saltu sur la sekvan hipertekstan ligilon en cxi "
-"tiu nodo.\n"
+"\\%-10[prev-node]  Iru al la ĵusantaŭa („Previous‟) nodo de ĉi tiu nodo.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr ""
-"\\%-10[move-to-prev-xref]  Saltu sur la sekvan hipertekstan ligilon en cxi "
-"tiu nodo.\n"
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[next-node]  Iru al la tujsekva („Next‟) nodo de ĉi tiu nodo.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
 msgstr ""
-"\\%-10[select-reference-this-line]  Iru laux la subkursora hiperteksta "
-"ligo.\n"
+"\\%-10[prev-node]  Iru al la ĵusantaŭa („Previous‟) nodo de ĉi tiu nodo.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
-"\\%-10[dir-node]  Iru al la cxefkataloga nodo.  Ekvivalentas al \"g (DIR)"
-"\".\n"
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Iru al la tujsekva („Next‟) nodo de ĉi tiu nodo.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr "\\%-10[top-node]  Iru al la radika nodo.  Ekvivalentas al \"g Top\".\n"
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Iru al la tujsupra („Up‟) nodo de ĉi tiu nodo.\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"Por movigxi ene de nodo:\n"
-"------------------------\n"
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[end-of-node]  Iru al la fino de ĉi tiu nodo.\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[end-of-node]  Iru al la fino de ĉi tiu nodo.\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Iru al la komenco de cxi tiu nodo.\n"
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "  %-10s  Elektu resp. la unuan ... la naŭan eron de ĉi-noda menuo.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Iru al la fino de cxi tiu nodo.\n"
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Elektu la lastan eron de ĉi-noda menuo.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "\\%-10[next-line]  Unu pagxon antauxen.\n"
+#, fuzzy
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  Iru al la tajpota menuero.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "\\%-10[next-line]  Unu pagxon malantauxen.\n"
+#, fuzzy
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr ""
+"\\%-10[xref-item]  Sekvu referencon  (legante la nomon de la referenco).\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Unu pagxon antauxen.\n"
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  Vizitu nodon indikotan per la nomo.\n"
 
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Unu pagxon malantauxen.\n"
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  Serĉu sube indikotan signoĉenon,\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
 msgstr ""
-"Ceteraj komandoj:\n"
-"-----------------\n"
+"\\%-10[prev-node]  Iru al la ĵusantaŭa („Previous‟) nodo de ĉi tiu nodo.\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
 msgstr ""
-"\\%-10[menu-digit]  Elektu resp. la unuan ... la nauxan eron el cxi-noda "
-"menuo.\n"
-
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "\\%-10[last-menu-item]  Elektu la lastan eron de cxi-noda menuo.\n"
+"  %-10s  Serĉu indikotan signoĉenon en la indeksaj artikoloj de ĉi tiu "
+"Info-\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
+#, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
-"\\%-10[index-search]  Sercxu aperon de donita signocxeno en la "
-"indeksartikoloj de cxi\n"
+"\\%-10[index-search]  Serĉu aperon de donita signoĉeno en la indeksartikoloj "
+"de ĉi\n"
 "      tiu info-dosiero kaj elektu la nodon referencatan de la unua trovita "
 "artikolo.\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  Iru al nodo indikita per nomo.\n"
-"      Ankaux la dosiernomon vi povas inkludi, kiel en (DOSIERO)NODO.\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  Sercxu sube aperon de donita signocxeno kaj\n"
-"      vizitu la nodon en kiu trovigxos la sekva apero.\n"
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "Ĉesigu la kurantan operacion"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  Sercxu supre aperon de donita signocxeno kaj\n"
-"      vizitu la nodon en kiu trovigxos la jxusantauxa apero.\n"
+"La ĉefaj komandoj info-fenestraj\n"
+"*********************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
-msgstr "  %-10s  Forlasu cxi tiun helpon.\n"
+msgstr "  %-10s  Forlasu ĉi tiun helpon.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Forlasu la tutan Info.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Voku la lernilon pri Info.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
-msgstr "  %-10s  Iru al la tujsekva (\"Next\") nodo de cxi tiu nodo.\n"
+msgstr "  %-10s  Iru al la tujsekva („Next‟) nodo de ĉi tiu nodo.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
-msgstr "  %-10s  Iru al la jxusantauxa (\"Previous\") nodo de cxi tiu nodo.\n"
+msgstr "  %-10s  Iru al la ĵusantaŭa („Previous‟) nodo de ĉi tiu nodo.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
-msgstr "  %-10s  Iru al la tujsupra (\"Up\") nodo de cxi tiu nodo.\n"
-
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Iru al la tajpota menuero.\n"
+msgstr "  %-10s  Iru al la tujsupra („Up‟) nodo de ĉi tiu nodo.\n"
 
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
-msgstr "      Elekto de menuero kauxzas transiron en alian nodon.\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"\\%-10[menu-item]  Elektu menueron indikitan per nomo.\n"
+"      Elekto de menuero kaÅ­zas transiron en alian nodon.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Sekvu reFerencon  (legante la nomon de la referenco).\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
-msgstr "  %-10s  Revenu al la Lasta nodo vizitita en cxi tiu fenestro.\n"
+msgstr "  %-10s  Revenu al la Lasta nodo vizitita en ĉi tiu fenestro.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
-msgstr "  %-10s  Saltu sur la sekvan hipertekstan ligilon en cxi tiu nodo.\n"
+msgstr "  %-10s  Saltu sur la sekvan hipertekstan ligilon en ĉi tiu nodo.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
-msgstr "  %-10s  Iru laux la subkursora hiperteksta ligo.\n"
+msgstr "  %-10s  Iru laÅ­ la subkursora hiperteksta ligo.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
-msgstr "  %-10s  Iru al la cxefkataloga nodo.  Ekvivalentas al \"g (DIR)\".\n"
+msgstr "  %-10s  Iru al la ĉefkataloga nodo.  Ekvivalentas al „g (DIR)‟.\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
-msgstr "  %-10s  Iru al la radika nodo.  Ekvivalentas al \"g Top\".\n"
+msgstr "  %-10s  Iru al la radika nodo.  Ekvivalentas al „g Top‟.\n"
+
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Por movi�i ene de nodo:\n"
+"------------------------\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
-msgstr "  %-10s  Unu pagxon antauxen.\n"
+msgstr "  %-10s  Unu pa�on antaŭen.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
-msgstr "  %-10s  Unu pagxon malantauxen.\n"
+msgstr "  %-10s  Unu pa�on malantaŭen.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
-msgstr "  %-10s  Iru al la komenco de cxi tiu nodo.\n"
+msgstr "  %-10s  Iru al la komenco de ĉi tiu nodo.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
-msgstr "  %-10s  Iru al la fino de cxi tiu nodo.\n"
+msgstr "  %-10s  Iru al la fino de ĉi tiu nodo.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
-msgstr "  %-10s  Unu pagxon antauxen.\n"
+msgstr "  %-10s  Unu pa�on antaŭen.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
-msgstr "  %-10s  Unu pagxon malantauxen.\n"
+msgstr "  %-10s  Unu pa�on malantaŭen.\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
-msgstr "  %-10s  Elektu resp. la unuan ... la nauxan eron de cxi-noda menuo.\n"
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Ceteraj komandoj:\n"
+"-----------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
+msgstr "  %-10s  Elektu resp. la unuan ... la naŭan eron de ĉi-noda menuo.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
-msgstr "  %-10s  Elektu la lastan eron de cxi-noda menuo.\n"
+msgstr "  %-10s  Elektu la lastan eron de ĉi-noda menuo.\n"
 
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-"  %-10s  Sercxu indikotan signocxenon en la indeksaj artikoloj de cxi tiu "
-"Info-\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
-"      dosiero kaj elektu la nodon referencatan de la unua trovita artikolo.\n"
-
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Vizitu nodon indikotan per la nomo.\n"
+"\\%-10[index-search]  Serĉu aperon de donita signoĉeno en la indeksartikoloj "
+"de ĉi\n"
+"      tiu info-dosiero kaj elektu la nodon referencatan de la unua trovita "
+"artikolo.\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr "      Ankaux la dosiernomon vi povas inkludi, kiel en (DOSIERO)NODO.\n"
-
-#: info/infodoc.c:133
-#, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Sercxu sube indikotan signocxenon,\n"
+msgstr ""
+"\\%-10[goto-node]  Iru al nodo indikita per nomo.\n"
+"      AnkaÅ­ la dosiernomon vi povas inkludi, kiel en (DOSIERO)NODO.\n"
 
-#: info/infodoc.c:134 info/infodoc.c:136
+#: info/infodoc.c:129
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
-msgstr "        kaj vizitu la nodon en kiu trovigxos la sekva apero.\n"
+msgstr ""
+"\\%-10[search]  Serĉu sube aperon de donita signoĉeno kaj\n"
+"      vizitu la nodon en kiu trovi�os la sekva apero.\n"
 
-#: info/infodoc.c:135
-#, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Sercxu indikotan signocxenon supre en la dosiero,\n"
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  Serĉu sube aperon de donita signoĉeno kaj\n"
+"      vizitu la nodon en kiu trovi�os la sekva apero.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
-msgstr "La kuranta sercxvojo estas:\n"
+msgstr "La kuranta serĉvojo estas:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -755,15 +810,15 @@ msgstr ""
 "Komandoj disponeblaj en Info-fenestroj:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr ""
-"Komandoj disponeblaj en la ehxozono:\n"
+"Komandoj disponeblaj en la eĥozono:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -772,7 +827,7 @@ msgstr ""
 "La sekvaj komandoj vokeblas nur per  %s:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -780,106 +835,97 @@ msgstr ""
 "La sekvaj komandoj neniel vokeblas:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr "--- Uzu \"\\[history-node]\" aux \"\\[kill-node]\" por eliri ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
-msgstr "Eligu helpomesagxon"
+msgstr "Eligu helpomesa�on"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
-msgstr "Vizitu la Info-nodon \"(info)Help\""
+msgstr "Vizitu la Info-nodon „(info)Help‟"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "Eligu la informon pri KLAVO"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Priskribu klavon: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s estas nedifinita."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s estas nedifinita."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s estas ligita al %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Montru, kion tajpi por plenumi koncernan komandon"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Kie estas la komando: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
-msgstr "neniu klavo trovita por la komando \"%s\""
+msgstr "neniu klavo trovita por la komando «%s»"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s vokeblas nur per %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s vokeblas per %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
-msgstr "Malestas funkcio nomata \"%s\""
+msgstr "Malestas funkcio nomata «%s»"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Copyright (c) %s Free Software Foundation, Inc.\n"
-"NENIA garantio estas donita.  Vi rajtas pludoni ekzemplerojn de cxi tiu\n"
-"programo laux la kondicxoj de la GNUa Gxenerala Publika Permesilo.  Pluaj\n"
-"informoj troveblas en la dosieroj COPYING.\n"
+"Por elekti aliajn nodojn:\n"
+"-------------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
-msgstr "Malgxusta nombro da argumentoj"
+msgstr "Mal�usta nombro da argumentoj"
 
 #: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
-msgstr "ne malfermigxis eniga dosiero \"%s\""
+msgstr "ne malfermi�is eniga dosiero «%s»"
 
 #: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
-msgstr "maleblas krei eligan dosieron \"%s\""
+msgstr "maleblas krei eligan dosieron «%s»"
 
 #: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
-msgstr "eraro dum skribo en \"%s\""
+msgstr "eraro dum skribo en «%s»"
 
 #: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
-msgstr "eraro dum fermo de eliga dosiero \"%s\""
+msgstr "eraro dum fermo de eliga dosiero «%s»"
 
 #: info/infokey.c:450
 msgid "key sequence too long"
@@ -909,7 +955,7 @@ msgstr "tro longa sekcio"
 #: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
-msgstr "nekonata ago \"%s\"."
+msgstr "nekonata ago «%s»."
 
 #: info/infokey.c:698
 msgid "action name too long"
@@ -918,7 +964,7 @@ msgstr "tro longa agonomo"
 #: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
-msgstr "kromaj signoj post la ago \"%s\""
+msgstr "kromaj signoj post la ago «%s»"
 
 #: info/infokey.c:723
 msgid "missing variable name"
@@ -926,7 +972,7 @@ msgstr "mankas nomo de variablo"
 
 #: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
-msgstr "mankas \"=\" tuj post variablonomo"
+msgstr "mankas „=‟ tuj post variablonomo"
 
 #: info/infokey.c:741
 msgid "variable name too long"
@@ -939,7 +985,7 @@ msgstr "tro longa valoro"
 #: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
-msgstr "\"%s\", linio %u: "
+msgstr "«%s», linio %u: "
 
 #: info/infokey.c:906
 #, c-format
@@ -957,105 +1003,103 @@ msgstr ""
 "Sintakso: %s [OPCIO]... [ENIG-DOSIERO]\n"
 "\n"
 "Opcioj:\n"
-" --output=DOSIERO         Eligu en DOSIEROn (anatataux $HOME/.info).\n"
-" --help                   Eligu cxi tiun helpeton kaj finu.\n"
+" --output=DOSIERO         Eligu en DOSIEROn (anatataÅ­ $HOME/.info).\n"
+" --help                   Eligu ĉi tiun helpeton kaj finu.\n"
 " --version                Eligu la version de la programo kaj finu.\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
-msgstr "La misa infoklava dosiero \"%s\" ignorita (tro mallonga)"
+msgstr "La misa infoklava dosiero «%s» ignorita (tro mallonga)"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
-msgstr "La misa infoklava dosiero \"%s\" ignorita (tro longa)"
+msgstr "La misa infoklava dosiero «%s» ignorita (tro longa)"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
-msgstr "Eraro dum lego de infoklava dosiero \"%s\" (tro frue elcxerpita)"
+msgstr "Eraro dum lego de infoklava dosiero «%s» (tro frue elĉerpita)"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
-msgstr ""
-"Misa infoklava dosiero \"%s\" (magiaj nombroj); aktualigu gxin per infokey"
+msgstr "Misa infoklava dosiero «%s» (magiaj nombroj); aktualigu �in per infokey"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
-msgstr "Via infoklava dosiero \"%s\" malaktualas; aktualigu gxin per infokey"
+msgstr "Via infoklava dosiero «%s» malaktualas; aktualigu �in per infokey"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
-"Misa infoklava dosiero \"%s\" (misa sekcilongo) -- aktualigu gxin per infokey"
+"Misa infoklava dosiero «%s» (misa sekcilongo) -- aktualigu �in per infokey"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
-msgstr ""
-"Misa infoklava dosiero \"%s\" (misa sekcikodo); aktualigu gxin per infokey"
+msgstr "Misa infoklava dosiero «%s» (misa sekcikodo); aktualigu �in per infokey"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
-msgstr "Misaj datumoj en infoklava dosiero -- iuj klavasociajxoj ne validos"
+msgstr "Misaj datumoj en infoklava dosiero -- iuj klavasociaĵoj ne validos"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "Misaj datumoj en infoklava dosiero -- iuj valorizoj de variabloj ne validos"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
-msgstr "Legu la nomon de Info-komando kaj priskribu gxin"
+msgstr "Legu la nomon de Info-komando kaj priskribu �in"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Priskribu komandon: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
-msgstr "Legu en la ehxozono nomon de komando kaj gxin plenumu"
+msgstr "Legu en la eĥozono nomon de komando kaj �in plenumu"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
-msgstr "Maleblas plenumi ehxozonan (\"echo-area-\") komandon cxi tie."
+msgstr "Maleblas plenumi eĥozonan („echo-area-‟) komandon ĉi tie."
 
-#: info/m-x.c:154
-#, fuzzy, c-format
+#: info/m-x.c:153
+#, c-format
 msgid "Undefined command: %s"
-msgstr "Nekonata komando \"%s\"."
+msgstr "Nekonata komando:  %s"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "Fiksu la alton de la prezentata fenestro"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Alto de la ekrano estu (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
-"   La fontodosieroj tralaboritaj por fari cxi tiun dosieron:\n"
+"   La fontodosieroj tralaboritaj por fari ĉi tiun dosieron:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Maleblas prilabori la dosieron %s.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1067,32 +1111,37 @@ msgstr ""
 "  (Dosiero)Nodo                     Linioj  Longo  Entenanta Dosiero\n"
 "  --------------                    ------  -----  -----------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
 msgstr ""
 "Jen la menuo de nodoj kiujn vi lastatempe vizitis.\n"
-"Elektu iun el la menuo, aux uzu \"\\[history-node]\" en alia fenestro.\n"
+"Elektu iun el la menuo, aŭ uzu „\\[history-node]‟ en alia fenestro.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
-msgstr "Faru fenestron entenantan menuon de cxiuj nune vizititaj nodoj"
+msgstr "Faru fenestron entenantan menuon de ĉiuj nune vizititaj nodoj"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Elektu nodon jam vizititan en videbla fenestro"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Elektu vizititan nodon: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "La referenco malaperis! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1101,1215 +1150,1375 @@ msgstr ""
 "Bonvenon al Info, versio %s.  Tajpu \\[get-help-window] por helpo, \\[menu-"
 "item] por menuero."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
-msgstr "Mallevigxu al la sekva linio"
+msgstr "Mallevi�u al la sekva linio"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
-msgstr "Levigxu al la antauxa linio"
+msgstr "Levi�u al la antaŭa linio"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "Iru al la fino de la linio"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "Iru al la komenco de la linio"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "Sekva"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Estas legata la nodo \"Next\" ..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "La unua menuero estas elektata ..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "La nodo \"Next\" estas elektata ..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "%d-foje supren, poste al la sekva (\"Next\")."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "Malestas pluaj referencoj en la dokumento."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
-msgstr "Mankas ligilo \"Prev\" por cxi tiu nodo."
-
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Iro al la antauxa nodo \"Prev\" en cxi tiu fenestro."
+msgstr "Mankas ligilo „Prev‟ por ĉi tiu nodo."
 
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
-msgstr "En la dokumento mankas ligilo(j) \"Prev\" aux \"Up\" por tiu nodo."
-
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Levigxo al la nodo \"Up\" en cxi tiu fenestro."
+msgstr "En la dokumento mankas ligilo(j) „Prev‟ aŭ „Up‟ por tiu nodo."
 
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Iro al la lasta menuero de la nodo \"Prev\"."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
-msgstr "Movu antauxen aux malsupren en la strukturo de nodoj"
+msgstr "Movu antaÅ­en aÅ­ malsupren en la strukturo de nodoj"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
-msgstr "Movu malantauxen aux supren en la strukturo de nodoj"
+msgstr "Movu malantaÅ­en aÅ­ supren en la strukturo de nodoj"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
-msgstr "Rulumu antauxen en cxi tiu fenestro"
+msgstr "Rulumu antaŭen en ĉi tiu fenestro"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
-msgstr ""
-"Rulumu antauxen en cxi tiu fenestro kaj fiksu defauxltan fenestrograndon"
+msgstr "Rulumu antaŭen en ĉi tiu fenestro kaj fiksu defaŭltan fenestrograndon"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
-msgstr "Rulumu antauxen en cxi tiu fenestro sed restu en la nodo"
+msgstr "Rulumu antaŭen en ĉi tiu fenestro sed restu en la nodo"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
-"Rulumu antauxen en cxi tiu fenestro restante en la nodo kaj\n"
-"fiksu defauxltan fenestrograndon"
+"Rulumu antaŭen en ĉi tiu fenestro restante en la nodo kaj\n"
+"fiksu defaÅ­ltan fenestrograndon"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
-msgstr "Rulumu malantauxen en cxi tiu fenestro"
+msgstr "Rulumu malantaŭen en ĉi tiu fenestro"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
-"Rulumu malantauxen en cxi tiu fenestro kaj fiksu defauxltan fenestrograndon"
+"Rulumu malantaŭen en ĉi tiu fenestro kaj fiksu defaŭltan fenestrograndon"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
-msgstr "Rulumu malantauxen en cxi tiu fenestro sed restu en la nodo"
+msgstr "Rulumu malantaŭen en ĉi tiu fenestro sed restu en la nodo"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
-"Rulumu malantauxen en cxi tiu fenestro restante en la nodo kaj\n"
-"     fiksu defauxltan fenestrograndon"
+"Rulumu malantaŭen en ĉi tiu fenestro restante en la nodo kaj\n"
+"     fiksu defaÅ­ltan fenestrograndon"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
-msgstr "Iru al la komenco de cxi tiu nodo"
+msgstr "Iru al la komenco de ĉi tiu nodo"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
-msgstr "Iru al la fino de cxi tiu nodo"
+msgstr "Iru al la fino de ĉi tiu nodo"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "Linie rulumu suben"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "Linie rulumu supren"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "Duonekrane rulumu suben"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "Duonekrane rulumu supren"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "Elektu la sekvan fenestron"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
-msgstr "Elektu la antauxan fenestron"
+msgstr "Elektu la antaÅ­an fenestron"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "Disfendu la kurantan fenestron"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "Forigu la kurantan fenestron"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "Maleblas forigi fenestron permanentan"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
-msgstr "Forigu cxiujn ceterajn fenestrojn"
+msgstr "Forigu ĉiujn ceterajn fenestrojn"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "Rulumu la alian fenestron"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
-msgstr "Rulumu la alian fenestron malantauxen"
+msgstr "Rulumu la alian fenestron malantaÅ­en"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
-msgstr "(Mal)pligrandigu cxi tiun fenestron"
+msgstr "(Mal)pligrandigu ĉi tiun fenestron"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "Dispartigu la disponeblan ekranspacon inter la videblaj fenestroj"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
-msgstr "Baskulsxaltu la regximon de linifaldo en la kuranta fenestro"
+msgstr "Baskul�altu la re�imon de linifaldo en la kuranta fenestro"
 
-#: info/session.c:1848
-msgid "Select the Next node"
-msgstr "Elektu la nodon sekvan (\"Next\")"
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
 
 #: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
+msgid "Select the Next node"
+msgstr "Elektu la nodon sekvan („Next‟)"
+
+#: info/session.c:2035
 msgid "Select the Prev node"
-msgstr "Elektu la nodon antauxan (\"Prev\")"
+msgstr "Elektu la nodon antaŭan („Prev‟)"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
-msgstr "Elektu la nodon supran (\"Up\")"
+msgstr "Elektu la nodon supran („Up‟)"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
-msgstr "Elektu la lastan nodon en cxi tiu dosiero"
+msgstr "Elektu la lastan nodon en ĉi tiu dosiero"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
-msgstr "Cxi tiu fenestro ne havas pluajn nodojn"
+msgstr "Ĉi tiu fenestro ne havas pluajn nodojn"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
-msgstr "Elektu la unuan nodon en cxi tiu dosiero"
+msgstr "Elektu la unuan nodon en ĉi tiu dosiero"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
-msgstr "Elektu la lastan eron en la menuo de cxi tiu nodo"
+msgstr "Elektu la lastan eron en la menuo de ĉi tiu nodo"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
-msgstr "Elektu cxi tiun menueron"
+msgstr "Elektu ĉi tiun menueron"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
-msgstr "Cxi tiu menuo ne havas %d erojn."
+msgstr "Ĉi tiu menuo ne havas %d erojn."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menuero (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Menuero: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Sekvu referencon (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "Sekvu referencon: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
-msgstr "Legu menueron kaj elektu gxian nodon"
+msgstr "Legu menueron kaj elektu �ian nodon"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
-msgstr "Legu piednoton aux referencon kaj elektu gxian nodon"
+msgstr "Legu piednoton aŭ referencon kaj elektu �ian nodon"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
-msgstr "Iru al la komenco de la menuo de cxi tiu nodo"
+msgstr "Iru al la komenco de la menuo de ĉi tiu nodo"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr ""
-"Vizitu samtempe kiom eble plej multe da menueroj (cxiun en aparta fenestro)"
+"Vizitu samtempe kiom eble plej multe da menueroj (ĉiun en aparta fenestro)"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "Legu nodnomon kaj elektu la nodon"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "Iru al la nodo: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
-msgstr "En la nodo \"%s\" malestas menuo."
+msgstr "En la nodo «%s» malestas menuo."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
-msgstr "Menuero \"%s\" malestas en la nodo \"%s\"."
+msgstr "Menuero «%s» malestas en la nodo «%s»."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
-msgstr "Maleblas trovi nodon referencatan per \"%s\" en \"%s\"."
+msgstr "Maleblas trovi nodon referencatan per «%s» en «%s»."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Legu liston da menuoj, komencante per dir kaj sekvante ilin"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "Sekvu menuojn: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Trovu la nodon priskribantan programvokon"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Trovu la voknodon de [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
-msgstr "Legu referencon al manlibra pagxo kaj gxin elektu"
+msgstr "Legu referencon al manlibra pa�o kaj �in elektu"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
-msgstr "Manlibran pagxon: "
+msgstr "Manlibran pa�on: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
-msgstr "Elektu la nodon \"Top\" en cxi tiu dosiero"
+msgstr "Elektu la nodon „Top‟ en ĉi tiu dosiero"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
-msgstr "Elektu la nodon \"(dir)\""
+msgstr "Elektu la nodon „(dir)‟"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
-msgstr "Forvisxu la nodon (%s): "
+msgstr "Forvi�u la nodon (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
-msgstr "Maleblas forigi la nodon \"%s\""
+msgstr "Maleblas forigi la nodon «%s»"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "Maleblas forigi la lastan nodon"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
-msgstr "Elektu nodon plej jxuse elektitan"
+msgstr "Elektu nodon plej ĵuse elektitan"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
-msgstr "Forvisxu cxi tiun nodon"
+msgstr "Forvi�u ĉi tiun nodon"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
-msgstr "Legu la dosiernomon kaj gxin elektu"
+msgstr "Legu la dosiernomon kaj �in elektu"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Trovu la dosieron: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
-msgstr "Maleblas trovi \"%s\"."
+msgstr "Maleblas trovi «%s»."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
-msgstr "Maleblas krei eligan dosieron \"%s\"."
+msgstr "Maleblas krei eligan dosieron «%s»."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Prete."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
-msgstr "Estas skribata la nodo \"%s\" ..."
+msgstr "Estas skribata la nodo «%s» ..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
-msgstr "La enhavon de cxi tiu nodo metu en la dukton per INFO_PRINT_COMMAND"
+msgstr "La enhavon de ĉi tiu nodo metu en la dukton per INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
-msgstr "Ne malfermigxis dukto al \"%s\"."
+msgstr "Ne malfermi�is dukto al «%s»."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
-msgstr "Estas printata la nodo \"%s\" ..."
+msgstr "Estas printata la nodo «%s» ..."
+
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "Forvi�u ekde la kursoro �is la komenco de la linio"
 
-#: info/session.c:3567
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
-msgstr "Estas sercxata la subdosiero \"%s\" ..."
+msgstr "Estas serĉata la subdosiero «%s» ..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
-msgstr "Legu cxenon kaj sercxu gxin usklecodistinge"
+msgstr "Legu ĉenon kaj serĉu �in usklecodistinge"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
-msgstr "Legu cxenon kaj gxin sercxu"
+msgstr "Legu ĉenon kaj �in serĉu"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
-msgstr "Legu cxenon kaj gxin sercxu malantauxen"
-
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
-msgstr "%s%spor signocxeno [%s]: "
+msgstr "Legu ĉenon kaj �in serĉu malantaŭen"
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
-msgstr "Sercxu malantauxen"
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
+msgstr "%s%spor signoĉeno [%s]: "
 
-#: info/session.c:3672 info/session.c:3678
-msgid "Search"
-msgstr "Sercxu"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
 msgstr " usklecodistinge"
 
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
+msgstr "Serĉu malantaŭen"
+
+#: info/session.c:3870
+msgid "Search"
+msgstr "Serĉu"
 
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
-msgstr "Sercxo fiaskis."
+msgstr "Serĉo fiaskis."
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
-msgstr "Ripetu la jxusan sercxon samdirekte"
+msgstr "Ripetu la ĵusan serĉon samdirekte"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
-msgstr "Malestas pli frua sercxocxeno."
+msgstr "Malestas pli frua serĉoĉeno."
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
-msgstr "Ripetu la jxusan sercxon alidirekte"
+msgstr "Ripetu la ĵusan serĉon alidirekte"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
-msgstr "Interaktive sercxu cxenon tajpatan"
+msgstr "Interaktive serĉu ĉenon tajpatan"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "Interaktiva serĉo malantaŭen: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
-msgstr "Interaktiva sercxo malantauxen: "
+msgstr "Interaktiva serĉo malantaŭen: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "Interaktiva serĉo: "
+
+#: info/session.c:4048
 msgid "I-search: "
-msgstr "Interaktiva sercxo: "
+msgstr "Interaktiva serĉo: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "Fiasko "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
-msgstr "Iru al la antauxa referenco"
+msgstr "Iru al la antaÅ­a referenco"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "Iru al la sekva referenco"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
-msgstr "Elektu la referencon aux la menueron de cxi tiu linio"
+msgstr "Elektu la referencon aŭ la menueron de ĉi tiu linio"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
-msgstr "Cxesigu la kurantan operacion"
+msgstr "Ĉesigu la kurantan operacion"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Finu"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "Movu la kursoron sur indikitan linion de la fenestro"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
-msgstr "Refresxigi la ekranon"
+msgstr "Refre�igi la ekranon"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Eliru el Info"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
-msgstr "Plenumi komandon asociitan kun cxi tiu klavo minuskligita"
+msgstr "Plenumi komandon asociitan kun ĉi tiu klavo minuskligita"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Komando nekonata (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
-msgstr "\"%s\" ne validas"
+msgstr "«%s» ne validas"
 
-#: info/session.c:4495
-#, fuzzy, c-format
+#: info/session.c:4736
+#, c-format
 msgid "`%s' is invalid"
-msgstr "\"%s\" ne validas"
+msgstr "„%s‟ ne validas"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "Aldonu tiun ciferon al la kuranta argumento nombra"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
-msgstr "Komencu (aux 4-obligu) la kurantan argumenton nombran"
+msgstr "Komencu (aÅ­ 4-obligu) la kurantan argumenton nombran"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "Uzata interne de \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
-msgstr "readline: Virtuala memoro elcxerpita!\n"
+msgstr "readline: Virtuala memoro elĉerpita!\n"
 
 #: info/variables.c:37
 msgid "When \"On\", footnotes appear and disappear automatically"
-msgstr "Cxe \"On\", la piednotoj aperas kaj malaperas auxtomate"
+msgstr "Ĉe „On‟, la piednotoj aperas kaj malaperas aŭtomate"
 
 #: info/variables.c:41
 msgid "When \"On\", creating or deleting a window resizes other windows"
-msgstr ""
-"Cxe \"On\", kreo aux forigo de fenestro kauxzas rearangxon de la ceteraj"
+msgstr "Ĉe „On‟, kreo aŭ forigo de fenestro kaŭzas rearan�on de la ceteraj"
 
 #: info/variables.c:45
 msgid "When \"On\", flash the screen instead of ringing the bell"
-msgstr "Cxe \"On\", anstataux bleki fulmetu la ekranon"
+msgstr "Ĉe „On‟, anstataŭ bleki fulmetu la ekranon"
 
 #: info/variables.c:49
 msgid "When \"On\", errors cause the bell to ring"
-msgstr "Cxe \"On\", signalu pri eraro per bleko"
+msgstr "Ĉe „On‟, signalu pri eraro per bleko"
 
 #: info/variables.c:53
 msgid "When \"On\", Info garbage collects files which had to be uncompressed"
-msgstr ""
-"Cxe \"On\", Info traktas makulaturon post malpako de kunpremitaj dosieroj"
+msgstr "Ĉe „On‟, Info traktas makulaturon post malpako de kunpremitaj dosieroj"
 
 #: info/variables.c:56
 msgid "When \"On\", the portion of the matched search string is highlighted"
-msgstr "Cxe \"On\", la peco kongrua al la sercxocxeno emfazigxas"
+msgstr "Ĉe „On‟, la peco kongrua al la serĉoĉeno emfazi�as"
 
 #: info/variables.c:60
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "Determinas la konduton de rulumo fine de nodo"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr ""
-"La nombro de linioj rulumataj kiam la kursoro movigxas ekster la fenestron"
+"La nombro de linioj rulumataj kiam la kursoro movi�as ekster la fenestron"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
-msgstr "Cxe \"On\", Info akceptas kaj surekranigas la okbitajn signojn"
+msgstr "Ĉe „On‟, Info akceptas kaj surekranigas la okbitajn signojn"
+
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "Determinas la konduton de rulumo fine de nodo"
 
-#: info/variables.c:74
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "Klarigu la uzon de variablo"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Priskribu variablon: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Valorizu Info-variablon"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Valorizu variablon: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "Variablo %s ricevu la valoron (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "%s ricevu la valoron (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
-msgstr "--*** Etikedoj malaktualigxis ***"
+msgstr "--*** Etikedoj malaktuali�is ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), linioj ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d linioj --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d linioj --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Subdosiero: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opcio \"%s\" estas ambigua\n"
+msgid "%s: warning: "
+msgstr "%s: averto: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opcio \"--%s\" ne toleras argumenton\n"
+msgid " for %s"
+msgstr " por %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opcio \"%c%s\" ne toleras argumenton\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tPor ricevi kompletan liston da opcioj tajpu „%s --help‟.\n"
+
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Uzmaniero: %s [OPCIO]... TEXINFO-DOSIERO...\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Erarraportojn sendu al <bug-texinfo@nu.org>; �eneralajn\n"
+"demandojn kaj opiniojn al <help-texinfo@gnu.org>.\n"
+"La hejmpa�o de Texinfo: <http://www.gnu.org/software/texinfo/>.\n"
+"Por la diskutoj pri Esperanto-traduko uzu la dissendoliston\n"
+"<translation-team-eo@lists.sourceforge.net>."
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opcio \"%s\" bezonas argumenton\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Ĉi tio estas la dosiero .../info/dir, entenanta la pinton de la \n"
+"la hierarkio Info -- la ĉefkatalogan nodon nomatan (dir)Top.\n"
+"Unuafoje lanĉinte la programon Info, vi trafas en tiun nodon.\n"
+"\n"
+"%s\\tLa pinto de la INFO-hierarkio\n"
+"\n"
+"  Ĉi tie (en la Info-katalogo) estas menuo de la ĉefaj temoj.\n"
+"  Tajpu „q‟ por eliri; „?‟ por eligi ĉiujn komandojn de Info;\n"
+"  „d‟ por reveni ĉi tien; „h‟ vokas lernilon por komencantoj;\n"
+"  „mEmacs<Return>‟ disponigas la manlibron pri Emakso; ktp.\n"
+"\n"
+"  Se vi legas per Emakso, alklaku menueron aÅ­ referencon per la 2-a\n"
+"  musbutono por elekti la temon.\n"
+"\n"
+"%s\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nekonata opcio \"--%s\"\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: ne povas legi (%s) kaj ne povas krei (%s)\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nekonata opcio \"%c%s\"\n"
+msgid "%s: empty file"
+msgstr "%s: malplena dosiero"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY sen para END-INFO-DIR-ENTRY"
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY sen para START-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: misa opcio -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: dir-dosiero estas jam havigita: %s\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: nevalida opcio -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Indiku la Info-dosieron solfoje.\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opcio bezonas argumenton -- %c\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opcio \"-W %s\" estas ambigua\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opcio \"-W %s\" ne toleras argumenton\n"
+msgid "excess command line argument `%s'"
+msgstr "troa argumento komandlinia: «%s»"
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
-#, fuzzy, c-format
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr "Mankas enigdosiero; provu --help por pluaj informoj."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr "Mankas dosiero Info-katalogo (dir); provu --help por pluaj informoj."
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "Nenia informo por Info-katalogo trovi�is en «%s»"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "Trovi�is nenia informo Info-kataloga pri «%s»; nenio i�is forigita"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
+#, c-format
 msgid "arguments to @%s ignored"
-msgstr "Misa argumento por %c%s"
+msgstr "Argumentoj por @%s estas ignoritaj"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "januaro"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "februaro"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "marto"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "aprilo"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "majo"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "junio"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "julio"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
-msgstr "auxgusto"
+msgstr "aÅ­gusto"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "septembro"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "oktobro"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "novembro"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "decembro"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
-msgstr "dubinda signo \"%c\" en @var"
+msgstr "dubinda signo „%c‟ en @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
-msgstr "argumento de @sc tuta majuskla, do neniel sxangxita"
+msgstr "argumento de @sc tuta majuskla, do neniel �an�ita"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
-msgstr "\"{\" atendata, sed \"%c\" ricevita"
+msgstr "„{‟ atendata, sed „%c‟ ricevita"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
-msgstr "dosierfino ene de pretarangxita bloko (verb block)"
+msgstr "dosierfino ene de pretaran�ita bloko (verb block)"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
-msgstr "\"}\" atendata, sed \"%c\" ricevita"
+msgstr "„}‟ atendata, sed „%c‟ ricevita"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
+"«@strong{Note...}» estigas falsan referencon en Info; alivortigu por eviti "
+"tion"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
-msgstr "%c%s arkaikigxis"
+msgstr "%c%s arkaiki�is"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
-msgstr "@sp bezonas ne \"%s\" sed pozitivan argumenton nombran"
+msgstr "@sp bezonas ne «%s» sed pozitivan argumenton nombran"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Misa argumento por %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1789
-#, fuzzy, c-format
+#: makeinfo/cmds.c:2049
+#, c-format
 msgid "Bad argument to @%s"
-msgstr "Misa argumento por %c%s"
+msgstr "Misa argumento por @%s"
 
-#: makeinfo/cmds.c:1803
+# set_firstparagraphindent
+#: makeinfo/cmds.c:2063
 msgid "insert"
-msgstr ""
-
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "Mankas \"}\" en la argumento de @def"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Funkcio"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Makroo"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Speciala Formo"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Variablo"
+msgstr "en�ovu"
 
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Uzula opcio"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Ekzemplera variablo"
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Misa argumento por @%s"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Metodo"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "de"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "sur"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Mankas „}‟ en la argumento de @def"
 
 #: makeinfo/defun.c:711
-#, fuzzy, c-format
+#, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
-msgstr "Nur en \"%s\"-ensxovo uzeblas \"%sx\"."
+msgstr "Nur en „@%s‟-bloko uzeblas „@%s‟."
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
-msgstr ""
+msgstr "La «%s» antaŭ la eliga dosierindiko estas preterlasita"
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
-msgstr ""
+msgstr "«%s» estas preterlasita, ĉar okazas skribado en la ĉefeligujon"
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
+msgstr "Eliga bufro ne malplenas"
+
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Vidu "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
-msgstr "\"%c%s\" bezonas argumenton \"{...}\", ne nuran \"%s\""
+msgstr "„%c%s‟ bezonas argumenton „{...}‟, ne nuran «%s»"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
-msgstr "Mankas \"}\" por la piednoto \"%s\""
+msgstr "Mankas „}‟ por la piednoto «%s»"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "Piednoto difinita sen patra nodo"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Maleblas fari piednoton al piednoto"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "Piednotoj"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
-msgstr ""
+msgstr "%s: Ne prosperis malfermi CSS-dosieron: %s"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
-msgstr ""
-
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "Sen titolo"
+msgstr "%s:%d: CSS-dosiero fini�is en komento"
 
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr "[neatendite] mankas HTML-etikedo por elstakigo"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
-msgstr "[neatendite] misa nodnomo: \"%s\""
+msgstr "[neatendite] misa nodnomo: «%s»"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
-msgstr "Nekonata indekso \"%s\""
+msgstr "Nekonata indekso «%s»"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
-msgstr "Info ne povas trakti \":\" en indeksa artikolo \"%s\""
+msgstr "Info ne povas trakti „:‟ en indeksa artikolo «%s»"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
-msgstr "Jam estas indekso \"%s\""
+msgstr "Jam estas indekso «%s»"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
-msgstr "Nekonata indekso \"%s\" kajaux \"%s\" en @synindex"
+msgstr "Nekonata indekso «%s» kajaŭ «%s» en @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
-msgstr ""
+msgstr "(linio )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
-msgstr ""
+msgstr "(linio %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
-msgstr "Nekonata indekso \"%s\" en @printindex"
+msgstr "Nekonata indekso «%s» en @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
-msgstr "Artikolo por indekso \"%s\" estas ekster iu ajn nodo"
+msgstr "Artikolo por indekso «%s» estas ekster iu ajn nodo"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(ekster iu ajn nodo)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "Vidu "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
-msgstr ""
+msgstr "„@itemize‟ ne rajtas havi argumenton „@item‟"
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Misa tipo en la funkcio insertion_type_pname"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "Troo en la stako de enumeracioj"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "mankas sekva enumeracia litero, rekomencite ekde %c"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
-msgstr "%s bezonas argumenton: la arangxilon por %citem"
+msgstr "%s bezonas argumenton: la aran�ilon por %citem"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
-msgstr ""
+msgstr "La blokoj %cfloat ne rajtas ingi�i unu en alia"
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
-msgstr "\"@end\" atendis \"%s\", sed renkontis \"%s\""
+msgstr "„@end‟ atendis „%s‟, sed renkontis „%s‟"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
-msgstr "Mankas para \"%cend %s\""
+msgstr "Mankas para „%cend %s‟"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
-msgstr "%s bezonas literon aux ciferon"
+msgstr "%s bezonas literon aÅ­ ciferon"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
-msgstr "dosierfino ene de pretarangxita bloko"
+msgstr "dosierfino ene de pretaran�ita bloko"
 
-#: makeinfo/insertion.c:1913
-#, fuzzy, c-format
+#: makeinfo/insertion.c:1942
+#, c-format
 msgid "@%s not meaningful outside `@float' environment"
-msgstr "@%s estas sensenca ene de bloko \"@%s\""
+msgstr "@%s estas sensenca ekster bloko „@float‟"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
-msgstr "@menu jam antaux la unua @nodo; nodo \"Top\" kreitas"
+msgstr "@menu jam antaŭ la unua @nodo; nodo „Top‟ kreitas"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
-msgstr "eble via @top-nodo staru sub @ifnottex anstataux sub @ifinfo?"
+msgstr "eble via @top-nodo staru sub @ifnottex anstataÅ­ sub @ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
-msgstr "@detailmenu renkontita jam antaux la unua nodo; nodo \"Top\" kreitas"
+msgstr "@detailmenu renkontita jam antaŭ la unua nodo; nodo „Top‟ kreitas"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
-msgstr ""
+msgstr "@%s sencas nur en bloko „@titlepage‟ aŭ „@quotation‟"
 
-#: makeinfo/insertion.c:2032
-#, fuzzy, c-format
+#: makeinfo/insertion.c:2061
+#, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
-msgstr "@%s estas sensenca ene de bloko \"@%s\""
+msgstr "@%s ne sencas ekster bloko „@titlepage‟"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
-msgstr "Mankas para \"%c%s\""
+msgstr "Mankas para „%c%s‟"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
-msgstr "\"%c%s\" bezonas post si ion"
+msgstr "„%c%s‟ bezonas post si ion"
 
-#: makeinfo/insertion.c:2074
-#, fuzzy, c-format
+#: makeinfo/insertion.c:2103
+#, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
-msgstr "Misa argumento por \"%s\", \"%s\", uzanta \"%s\""
+msgstr "Misa argumento «%s» por «%s»; estos uzata «%s»"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
-msgstr "@%s estas sensenca ene de bloko \"@%s\""
+msgstr "@%s estas sensenca ene de bloko „@%s‟"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
-msgstr "@itemx estas sensenca ene de bloko \"%s\""
+msgstr "@itemx estas sensenca ene de bloko «%s»"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
-msgstr "%c%s renkontita ekster \"insertion block\""
+msgstr "%c%s renkontita ekster „insertion block‟"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
-msgstr "%s ne estas valida lingvokodo laux ISO 639"
+msgstr "%s ne estas valida lingvokodo laÅ­ ISO 639"
 
-#: makeinfo/lang.c:655
-#, fuzzy, c-format
+#: makeinfo/lang.c:1399
+#, c-format
 msgid "unrecognized encoding name `%s'"
-msgstr "nekonata nomo de kodosistemo: %s\""
+msgstr "Nekonata nomo de kodosistemo: «%s»"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
-msgstr "Pardonon, la kodo \"%s\" ne estas disponebla"
+msgstr "Pardonon, la kodo «%s» ne estas disponebla"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
-msgstr "misa kodoprezento: \"%s\""
+msgstr "misa kodoprezento: «%s»"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
-msgstr "%c%s atendas argumenton \"i\" aux \"j\", ne \"%c\""
+msgstr "%c%s atendas argumenton „i‟ aŭ „j‟, ne „%c‟"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
-msgstr "%c%s akceptas nur solsignan argumenton \"i\" aux \"j\""
+msgstr "%c%s akceptas nur solsignan argumenton „i‟ aŭ „j‟"
 
 #: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
-msgstr "makroo \"%s\" jam difinita antauxe"
+msgstr "makroo «%s» jam difinita antaŭe"
 
 #: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
-msgstr "cxi tie estas la antauxa difino de \"%s\""
+msgstr "ĉi tie estas la antaŭa difino de «%s»"
 
-#: makeinfo/macro.c:355
-#, fuzzy, c-format
+#: makeinfo/macro.c:359
+#, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
-msgstr ""
-"en makroo, \\ sekvata de \"%s\" (anstataux de \\ aux nomo de parametro)"
+msgstr "Dum makrogenerado: \\ sekvata de «%s» (anstataŭ de nomo de parametro)"
 
 #: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
-msgstr "Makroo \"%s\" en la linio %d havas troan argumenton"
+msgstr "Makroo «%s» en la linio %d havas troan argumenton"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
-msgstr "makroo %cend ne trovigxis"
+msgstr "makroo %cend ne trovi�is"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg utilas nur en sol-argumentaj makrooj"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "misa @end %s por @%s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Tro multe da eraroj!  Halt'.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: averto: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "Misloka %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "Por pluaj detaloj tajpu \"%s --help\".\n"
+msgstr "Por pluaj detaloj tajpu „%s --help‟.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Uzmaniero: %s [OPCIO]... TEXINFO-DOSIERO...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
-"Tradukas fontan Texinfo-dokumenton en diversajn aliajn formojn, defauxlte "
-"en\n"
-"Info-dosierojn tauxgajn por dialoga legado per Emakso aux per auxtonoma GNU-"
-"Info.\n"
+"Traduku fontan Texinfo-dokumenton en diversajn aliajn formojn, defaÅ­lte en\n"
+"Info-dosierojn taÅ­gajn por dialoga legado per Emakso aÅ­ aÅ­tonoma GNU-Info.\n"
 
-#: makeinfo/makeinfo.c:350
-#, c-format
+#: makeinfo/makeinfo.c:354
+#, fuzzy, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
-"Gxeneralaj opcioj:\n"
-"      --error-limit=NOM       Cxesu post NOM eraroj (defauxlte %d).\n"
-"      --force                 Retenu eligajxon ecx post eraroj.\n"
-"      --help                  Eligu cxi tiun helpon kaj finu.\n"
-"      --no-validate           Ne kontrolu la internodajn referencojn.\n"
-"      --no-warn               Ne eligu avertojn (ne koncernas "
-"erarmesagxojn).\n"
-"      --reference-limit=NUM   Avertu pri ne pli ol  N  referencoj (defauxlte "
-"%d).\n"
-"  -v, --verbose               Rakontu kio estas farata.\n"
-"      --version               Eligu la nomon, la version de la programo kaj "
-"eliru.\n"
-
-#: makeinfo/makeinfo.c:364
+"Äœeneralaj opcioj:\n"
+"      --error-limit=NOM\t    Ĉesu post NOM eraroj (defaŭlte %d)\n"
+"      --force\t\t    Retenu eligaĵon eĉ post eraroj\n"
+"      --help\t\t    Eligu ĉi tiun helpon kaj finu\n"
+"      --no-validate\t    Ne kontrolu la internodajn referencojn\n"
+"      --no-warn\t\t    Ne eligu avertojn (ne koncernas erarmesa�ojn)\n"
+"      --reference-limit=N   Avertu pri pli ol N referencoj (defaÅ­lte %d)\n"
+"  -v, --verbose\t\t    Rakontu kio estas farata\n"
+"      --version\t\t    Eligu la versio-informon kaj eliru\n"
+
+#: makeinfo/makeinfo.c:369
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
-msgstr ""
-"Por elekti celformon (defauxlte, Info):\n"
-"      --docbook             Generu en DocBook anstataux en Info.\n"
-"      --html                Generu en HTML anstataux en Info.\n"
-"      --xml                 Generu en XML (TexinfoML) anstataux en Info.\n"
-
-#: makeinfo/makeinfo.c:372
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
+msgstr ""
+"Por elekti celformon (defaÅ­lte, Info):\n"
+"      --docbook\t\t    Generu en DocBook anstataÅ­ en Info\n"
+"      --html\t\t    Generu en HTML anstataÅ­ en Info\n"
+"      --xml\t\t    Generu en XML (TexinfoML) anstataÅ­ en Info\n"
+"      --plaintext\t    Generu platan tekston anstataÅ­ Infoon\n"
+
+#: makeinfo/makeinfo.c:377
+#, fuzzy
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
-msgstr ""
-"Gxeneralaj opcioj generadaj:\n"
-"  -E, --macro-expand DOSIER  Konservu makrotraktitan fontajxon en DOSIERo,\n"
-"                               sen atenti cxiajn @setfilename.\n"
-"      --no-headers           Generu platan tekston, sen dispartigi en "
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
+msgstr ""
+"Äœeneralaj opcioj generadaj:\n"
+"  -E, --macro-expand DOSIER Konservu makrotraktitan fontaĵon en DOSIERo,\n"
+"                              sen atenti ĉiajn @setfilename\n"
+"      --no-headers          Generu platan tekston, sen dispartigi en "
 "nodojn,\n"
-"                               sen fari la \"Node:\"liniojn kaj menuojn; "
-"krome,\n"
-"                               eligu en la cxefeligujon manke de --output.\n"
-"      --no-split             Ne disfendu grandan Info- aux HTML-dosieron,\n"
-"                               faru unu solan rezultan dosieron.\n"
-"      --number-sections      Generu kun la numeroj de cxapitroj, sekcioj "
-"ktp.\n"
-"  -o, --output=DOSIER        Skribu en DOSIERon (DOSIERujon, por fenda "
-"HTML).\n"
-
-#: makeinfo/makeinfo.c:386
-#, c-format
+"                              sen linioj «Node:» kaj menuoj; krome, eligu\n"
+"                              en la ĉefeligujon manke de --output\n"
+"      --no-split            Ne disfendu grandan Info- aÅ­ HTML-dosieron,\n"
+"                              faru unu solan rezultan dosieron\n"
+"      --number-sections     Generu kun la numeroj de ĉapitroj, sekcioj ktp\n"
+"  -o, --output=DOSIER       Skribu en DOSIERon (DOSIERujon, por fenda HTML)\n"
+
+#: makeinfo/makeinfo.c:391
+#, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2317,42 +2526,50 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 "Opcioj por Info kaj plata teksto:\n"
-"      --enable-encoding       Eligu diakritajxojn kaj specialajn signojn\n"
-"                                laux @documentencoding.\n"
-"      --fill-column=N         Rompu Info-liniojn post  N  signoj (defauxlte %"
-"d)\n"
-"      --footnote-style=STILO  Arangxu la piednotojn laux  STILO:\n"
-"                                \"separate\" -- loku piednotojn en apartan "
-"nodon;\n"
-"                                \"end\"  -- loku ilin fine de la nodo en "
-"kiu\n"
-"                                ili estas difinitaj (la defauxlto).\n"
-"      --paragraph-indent=VAL  Alinea ensxovo estu  VAL  spacetoj (defauxlte %"
+"      --enable-encoding\t      Eligu diakritaĵojn kaj specialajn signojn\n"
+"\t\t\t\tlaÅ­ @documentencoding\n"
+"      --fill-column=N\t      Rompu Info-liniojn post N signoj (defaÅ­lte %d)\n"
+"      --footnote-style=STILO  Aran�u la piednotojn laŭ STILO:\n"
+"\t\t\t\t„separate‟ -- loku ilin en apartan nodon;\n"
+"\t\t\t\t„end‟  -- loku ilin fine de la nodo en kiu\n"
+"\t\t\t\t\t  ili estas difinitaj (la defaÅ­lto)\n"
+"      --paragraph-indent=VAL  Alinea en�ovo estu VAL spacetoj (defaŭlte %"
 "d);\n"
-"                                se VAL estas \"none\", ne ensxovu;\n"
-"                                se VAL estas \"asis\", obeu la fontan "
-"ensxovon.\n"
-"      --split-size=N          Fendu en dosierojn po  N  (defauxlte %d).\n"
+"\t\t\t\tse VAL estas „none‟, ne en�ovu;\n"
+"\t\t\t\tse VAL estas „asis‟, obeu la fontan en�ovon\n"
+"      --split-size=N\t      Fendu en dosierojn po N (defaÅ­lte %d)\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
+#, fuzzy
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
-msgstr ""
-
-#: makeinfo/makeinfo.c:409
-#, c-format
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
+msgstr ""
+"Opcioj por HTML:\n"
+"      --css-include=DOSIERO   Inkludu DOSIEROn en <style>-etikedon de "
+"HTMLaĵo;\n"
+"\t\t\t\tlegu la ĉefenigujon, se DOSIERO estas „-‟\n"
+
+#: makeinfo/makeinfo.c:418
+#, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
+"Opcioj por XML kaj Docbook:\n"
+"      --output-indent=VAL     De�ovu XML-elementojn je VAL spacetoj\n"
+"\t\t\t\t(defaÅ­lte %d).  Se VAL estas 0, forigu\n"
+"\t\t\t\tsensignifajn spacetojn\n"
+"\n"
 
-#: makeinfo/makeinfo.c:416
-#, fuzzy
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2362,17 +2579,13 @@ msgid ""
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 "Opcioj pri la fontodosieroj:\n"
-"  --commands-in-node-names    Permesu @-komandojn en nodnomoj.\n"
-"  -D VAR                      Difinu la variablon  VAR,  kiel per @set.\n"
-"  -I UJO                      Alkrocxu dosierUJOn al la sercxvojo de "
-"@include.\n"
-"  -P UJO                      Antauxmetu dosierUJOn al la sercxvojo de "
-"@include.\n"
-"  -U VAR                      Maldifinu la variablon  VAR,  kiel per "
-"@clear.\n"
+"  --commands-in-node-names    Permesu @-komandojn en nodnomoj\n"
+"  -D VAR\t\t      Difinu la variablon VAR, kvazaÅ­ per @set\n"
+"  -I UJO\t\t      Alkroĉu dosierUJOn al la serĉvojo de @include\n"
+"  -P UJO\t\t      Antaŭmetu dosierUJOn al la serĉvojo de @include\n"
+"  -U VAR\t\t      Maldifinu la variablon  VAR,  kiel per @clear\n"
 
-#: makeinfo/makeinfo.c:425
-#, fuzzy
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2391,23 +2604,26 @@ msgid ""
 "\n"
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
-"Kondicxa traktado cxe enigo:\n"
-"  --ifhtml         Traktu la pecojn sub @ifhtml kaj @html ecx se ne\n"
-"                      HTML estas generata\n"
-"  --ifinfo         Traktu la pecojn sub @ifinfo ecx se ne Info generatas\n"
-"  --ifplaintext    Traktu la pecojn sub @ifplaintext ecx se alia formo ol\n"
-"                      plata teksto estas generata\n"
-"  --iftex          Traktu la pecojn sub @iftex kaj @tex; implicas --no-"
-"split\n"
-"  --ifxml          Traktu la pecojn sub @ifxml kaj @xml\n"
-"  --no-ifhtml      Ne traktu la pecojn sub @ifhtml kaj @html\n"
-"  --no-ifinfo      Ne traktu la pecojn sub @ifinfo.\n"
+"Kondiĉa traktado ĉe enigo:\n"
+"  --ifdocbook\t   Traktu la pecojn sub @ifdocbook kaj @docbook eĉ se\n"
+"\t\t      ne Docbook estas generata\n"
+"  --ifhtml\t   Traktu la pecojn sub @ifhtml kaj @html eĉ se ne\n"
+"\t\t      HTML estas generata\n"
+"  --ifinfo\t   Traktu la pecojn sub @ifinfo eĉ se ne Info generatas\n"
+"  --ifplaintext\t   Traktu la pecojn sub @ifplaintext eĉ se alia formo ol\n"
+"\t\t      plata teksto estas generata\n"
+"  --iftex\t   Traktu la pecojn sub @iftex kaj @tex; implicas --no-split\n"
+"  --ifxml\t   Traktu la pecojn sub @ifxml kaj @xml\n"
+"  --no-ifdocbook   Ne traktu la pecojn sub @ifdocbook kaj @docbook\n"
+"  --no-ifhtml\t   Ne traktu la pecojn sub @ifhtml kaj @html\n"
+"  --no-ifinfo\t   Ne traktu la pecojn sub @ifinfo\n"
 "  --no-ifplaintext Ne traktu la pecojn sub @ifplaintext\n"
-"  --no-iftex       Ne traktu la pecojn sub @iftex kaj @tex\n"
-"  --no-ifxml       Ne traktu la pecojn sub @ifxml kaj @xml\n"
+"  --no-iftex\t   Ne traktu la pecojn sub @iftex kaj @tex\n"
+"  --no-ifxml\t   Ne traktu la pecojn sub @ifxml kaj @xml\n"
+"\n"
+"  Krome, ĉe la opcioj --no-ifFORMO, ja traktu la pecojn sub @ifnotFORMO.\n"
 
-#: makeinfo/makeinfo.c:444
-#, fuzzy
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2415,634 +2631,435 @@ msgid ""
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
-"La defauxlta konduto de la @if...-frazoj dependas je la celata formo:\n"
-"se HTML estas generata, --ifhtml sxaltigxas kaj la ceteraj, malsxaltigxas;\n"
-"cxe Info-generado, --ifinfo  sxaltigxas kaj la ceteraj, malsxaltigxas; \n"
-"se plata teksto estas generata, --ifplaintext  sxaltigxas kaj la ceteraj,\n"
-"malsxaltigxas.\n"
+"La defaÅ­lta konduto de la @if...-frazoj dependas je la celata formo:\n"
+"se HTML estas generata, --ifhtml aktivas kaj la ceteraj, malaktivas;\n"
+"ĉe Info-generado, --ifinfo aktivas kaj la ceteraj, malaktivas; \n"
+"se plata teksto estas generata, --ifplaintext aktivas kaj la ceteraj,\n"
+"malaktivas; ĉe XML-generado, --ifxml aktivas kaj la ceteraj, malaktivas.\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
+#, fuzzy
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "Ekzemploj:\n"
-" makeinfo UM.texi                     konservu Info laux @setfilename\n"
-" makeinfo --html UM.texi              konservu HTML laux @setfilename\n"
-" makeinfo --xml UM.texi               konservu Texinfo-XML laux "
-"@setfilename\n"
-" makeinfo --docbook UM.texi           konservu DocBook-XML laux "
-"@setfilename\n"
-" makeinfo --no-headers -o - UM.texi   sendu platan tekston en cxefeligujon\n"
+" makeinfo UM.texi\t\t      konservu Info laÅ­ @setfilename\n"
+" makeinfo --html UM.texi\t      konservu HTML laÅ­ @setfilename\n"
+" makeinfo --xml UM.texi\t\t      konservu Texinfo-XML laÅ­ @setfilename\n"
+" makeinfo --docbook UM.texi\t      konservu DocBook-XML laÅ­ @setfilename\n"
+" makeinfo --no-headers -o - UM.texi   sendu platan tekston en ĉefeligujon\n"
 "\n"
-" makeinfo --html --no-headers UM.texi konservu HTML sen \"Node:\"-linioj, "
-"menuoj\n"
-" makeinfo --number-sections UM.texi   konservu Info kun la sekcinumeroj\n"
-" makeinfo --no-split UM.texi          faru unu Info-dosieron, kiom ajn "
+" makeinfo --html --no-headers UM.texi konservu HTML sen la linioj «Node:»\n"
+" makeinfo --number-sections UM.texi   konservu Infoon kun sekcinumeroj\n"
+" makeinfo --no-split UM.texi\t      faru unu Info-dosieron, kiom ajn "
 "grandan\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
-msgstr ""
+msgstr "%s: Nekonata valoro de TEXINFO_OUTPUT_FORMAT: «%s».  Ignorita.\n"
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
-msgstr "%s: la argumento %s devas esti nombra, ne \"%s\".\n"
+msgstr "%s: La argumento %s devas esti nombro, ne «%s».\n"
 
-#: makeinfo/makeinfo.c:660
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:680
+#, c-format
 msgid "%s: could not open macro expansion output `%s'"
-msgstr "Fiaskis malfermo de makrotraktada eligdosiero \"%s\""
+msgstr "%s: Ne prosperis malfermi makrotraktadan eligdosieron «%s»"
 
-#: makeinfo/makeinfo.c:665
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:685
+#, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
-msgstr "Fiaskis malfermo de makrotraktada eligdosiero \"%s\""
+msgstr "%s: Ripeta dosierindiko «%s» por makrotraktada eligo estas ignorita.\n"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
-"%s: argumento de la opcio --paragraph-indent estu nombra, \"none\" aux\n"
-"\"asis\", ne \"%s\".\n"
+"%s: Post „--paragraph-indent‟ estu nombro, „none‟ aŭ „asis‟, ne „%s‟.\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
-msgstr ""
-"%s: argumento de la opcio --footnote-style estu \"separate\" aux\n"
-"\"end\", ne \"%s\".\n"
+msgstr "%s: Post --footnote-style estu „separate‟ aŭ „end‟, ne „%s‟.\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mankas dosiera argumento.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
-msgstr ""
+msgstr "Misa uzo de plurlinia komando «%c%s»."
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
-msgstr "\"%s\" atendatas"
+msgstr "«%s» atendatas"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
-msgstr "Provo krei dosierujon \"%s\" malsukcesis: %s"
+msgstr "Provo krei dosierujon «%s» malsukcesis: %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
-msgstr "Neniu \"%s\" trovita en \"%s\""
+msgstr "Neniu «%s» trovita en «%s»"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
-msgstr ""
-"%s: Makrotraktitajxo ne trafos en la cxefeligujon cxar Info iras tien.\n"
+msgstr "%s: Makrotraktitaĵo ne trafos en la ĉefeligujon ĉar Info iras tien.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
-msgstr "%s-dosiero \"%s\" estas generata el \"%s\".\n"
-
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "Cxi tiun dosieron %s generis Makeinfo-%s el %s.\n"
+msgstr "%s-dosiero «%s» estas generata el «%s».\n"
 
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
-"%s: La eligdosiero \"%s\" por makrotraktitajxo forigitas cxar estis eraroj;\n"
-"uzu la opcion --force por gxin reteni.\n"
+"%s: La eligdosiero «%s» por makrotraktitaĵo forigitas ĉar estis eraroj;\n"
+"uzu la opcion --force por �in reteni.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
-"%s: La eligdosiero \"%s\" forigitas cxar estis eraroj;\n"
-"uzu la opcion --force por gxin reteni.\n"
+"%s: La eligdosiero «%s» forigitas ĉar estis eraroj;\n"
+"uzu la opcion --force por �in reteni.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
-msgstr "Nekonata komando \"%s\"."
+msgstr "Nekonata komando «%s»."
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
-msgstr "Uzu vinkulojn por pasigi al \"@%s\" komandan argumenton"
+msgstr "Uzu vinkulojn por pasigi al „@%s‟ komandan argumenton"
 
-#: makeinfo/makeinfo.c:2314
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:2349
+#, c-format
 msgid "%c%s expected braces"
-msgstr "%c%s postulas vinkulojn \"{...}\""
+msgstr "%c%s postulas vinkulojn"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
-msgstr "Senpara \"}\""
+msgstr "Nepara „}‟"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "SEN_NOMO!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
-msgstr "%c%s sen \"}\""
+msgstr "%c%s sen „}‟"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
-msgstr "por HTML, la dosiero \"%s\" en la komando @image estas nelegebla: %s"
+msgstr "por HTML, la dosiero «%s» en la komando @image estas nelegebla: %s"
 
-#: makeinfo/makeinfo.c:3315
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:3440
+#, c-format
 msgid "No such file `%s'"
-msgstr "Neniu \"%s\" trovita en \"%s\""
+msgstr "Ne estas tia dosiero: «%s»"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
-msgstr "bilddosiero \"%s\" (por teksto) estas nelegebla: %s"
+msgstr "bilddosiero «%s» (por teksto) estas nelegebla: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "mankas dosiera argumento en la komando @image"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
-msgstr ""
+msgstr "Nedifinita flago: %s"
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
-msgstr "{Mankas Valoro Por \"%s\"}"
+msgstr "{Mankas Valoro Por «%s»}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s bezonas nomon"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
-msgstr "Pli frue ol la para @end %s renkontigxis dosierfino"
+msgstr "Pli frue ol la para @end %s renkonti�is dosierfino"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
-msgstr "\"%.40s...\" tro longas por malvolvo; malvolvo ne okazos"
+msgstr "„%.40s...‟ tro longas por malvolvo; malvolvo ne okazos"
 
 #: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
-msgstr "Mankas \"}\" en la sxablono de @multitable"
+msgstr "Mankas „}‟ en la �ablono de @multitable"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
-msgstr "la misa teksto \"%s\" post @multitable estas ignorita"
+msgstr "la misa teksto «%s» post @multitable estas ignorita"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
-msgstr "Tro da kolumnoj en elemento de \"multitable\" (%d maksimume)"
+msgstr "Tro da kolumnoj en elemento de „multitable‟ (%d maksimume)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
-msgstr "[neatendite] maleblas elekti %d-an kolumnon en \"multitable\"."
+msgstr "[neatendite] maleblas elekti %d-an kolumnon en „multitable‟."
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
-msgstr "komando @tab ekster \"multitable\"; ignorita"
+msgstr "komando @tab ekster „multitable‟; ignorita"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multekolumna eligo el la lasta linio:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
-msgstr "* kolumno %d-a: eligajxo = %s\n"
+msgstr "* kolumno %d-a: eligaĵo = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
-msgstr "Nodo \"%s\" jam difinita en la linio %d"
+msgstr "Nodo «%s» jam difinita en la linio %d"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
-msgstr "Estas arangxata la nodo \"%s\" ...\n"
+msgstr "Estas aran�ata la nodo «%s» ...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
-msgstr "Nodo \"%s\" bezonas subdividan komandon (ekz-e %c%s)"
+msgstr "Nodo «%s» bezonas subdividan komandon (ekz-e %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
-msgstr "Mankas nodnomo por la komando \"%c%s\""
+msgstr "Mankas nodnomo por la komando „%c%s‟"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
-msgstr "Dosiernoma kolizio por la ankro \"%s\" kaj la nodo \"%s\""
+msgstr "Dosiernoma kolizio por la ankro «%s» kaj la nodo «%s»"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
-msgstr ""
-"Cxi tiu @anchor-komando estas ignorita; la referencoj al gxi ne funkcios"
+msgstr "Ĉi tiu @anchor-komando estas ignorita; la referencoj al �i ne funkcios"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
-msgstr "Alinomu la ankron aux uzu la opcion \"--no-split\""
+msgstr "Alinomu la ankron aŭ uzu la opcion „--no-split‟"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
-msgstr "Nekonvena signocxeno fine de disfendita HTML-dosiero \"%s\""
-
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "Sekva:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Antauxa:"
+msgstr "Nekonvena signoĉeno fine de disfendita HTML-dosiero «%s»"
 
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "Supre:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
-msgstr "Dosiernoma kolizio por la ankroj \"%s\" kaj \"%s\""
+msgstr "Dosiernoma kolizio por la ankroj «%s» kaj «%s»"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
-msgstr "Ignorita @anchor-komando; la referencoj al gxi ne funkcios"
+msgstr "Ignorita @anchor-komando; la referencoj al �i ne funkcios"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
-msgstr "%s referencas neekzistantan nodon \"%s\" (cxu eraro en sekciarangxo?)"
-
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "Menuo"
+msgstr "%s referencas neekzistantan nodon «%s» (ĉu eraro en sekciaran�o?)"
 
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Referenco"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
-"La kampo \"Next\" de la nodo \"%s\" ne estas reciprokita (cxu misa "
-"sekciarangxo?)"
+"La kampo „Next‟ de la nodo «%s» ne estas reciprokita (ĉu misa sekciaran�o?)"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
-msgstr "Cxi tiu nodo (\"%s\") havas eraran kampon \"Prev\""
+msgstr "Ĉi tiu nodo («%s») havas eraran kampon „Prev‟"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "Antauxa"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
-msgstr "La kampo \"Prev\" de la nodo \"%s\" ne estas reciprokita"
+msgstr "La kampo „Prev‟ de la nodo «%s» ne estas reciprokita"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
-msgstr "Cxi tiu nodo (\"%s\") havas eraran kampon \"Next\""
+msgstr "Ĉi tiu nodo («%s») havas eraran kampon „Next‟"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
-msgstr "\"%s\" malhavas kampon \"Up\" (cxu eraro en sekciarangxo?)"
-
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "Supre"
+msgstr "«%s» malhavas kampon „Up‟ (ĉu eraro en sekciaran�o?)"
 
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
-msgstr "En \"%s\" mankas menuero por \"%s\", malgraux ties ligilo \"Up\"\""
+msgstr "En \"%s„ mankas menuero por ‟%s„, malgraŭ ties ligilo ‟Up„‟"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "la nodo \"%s\" estis referencita %d fojojn"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
-msgstr "la nodo \"%s\" ne estas referencita"
+msgstr "la nodo «%s» ne estas referencita"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
-msgstr ""
+msgstr "%s estas forigata\n"
 
-#: makeinfo/node.c:1727
-#, fuzzy, c-format
+#: makeinfo/node.c:1728
+#, c-format
 msgid "Can't remove file `%s': %s"
-msgstr "Provo krei dosierujon \"%s\" malsukcesis: %s"
+msgstr "Ne prosperis forigi dosierujon «%s»: %s"
 
 #: makeinfo/sectioning.c:122
-#, fuzzy, c-format
+#, c-format
 msgid "Appendix %c"
 msgstr "Aldono %c"
 
 #: makeinfo/sectioning.c:467
-#, fuzzy, c-format
+#, c-format
 msgid "Internal error (search_sectioning) `%s'!"
-msgstr "Interna eraro (search_sectioning) \"%s\"!"
+msgstr "Interna eraro (search_sectioning) „%s‟!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
-msgstr "Interna eraro (search_sectioning) \"%s\"!"
+msgstr "Interna eraro (search_sectioning) «%s»!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
-msgstr "%c%s arkaikigxis; uzu %c%s anstatauxe"
+msgstr "%c%s arkaiki�is; uzu %c%s anstataŭe"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Jam estas nodo kun sekcio %ctop"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Jen estas la nodo %ctop"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
-msgstr "%ctop aperis pli frue ol %cnode; la defauxlto uzota estas %s"
+msgstr "%ctop aperis pli frue ol %cnode; la defaÅ­lto uzota estas %s"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Enhavtabelo"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Maldetala enhavtabelo"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
-msgstr "dosiero \"%s\" en la komando @image estas nelegebla: %s"
+msgstr "dosiero «%s» en la komando @image estas nelegebla: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
+"@headitem lastelemente en @multitable rezultigas nevalidajn Docbook-"
+"dokumentojn"
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: averto: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " por %s"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "de"
 
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\tPor ricevi kompletan liston da opcioj tajpu \"%s --help\".\n"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "sur"
 
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Sintakso: %s [OPCIO]... [INFO-DOSIERO [DIR-DOSIERO]]\n"
-"\n"
-"Instalu aux forigu \"dir\"-ajxojn el INFO-DOSIERO en la Info-katalogo\n"
-"  DIR-DOSIERO.\n"
-"\n"
-"Opcioj:\n"
-"--delete          Forigu la ekzistantajn \"dir\"-ajxojn pri INFO-DOSIERO;\n"
-"                    ne ensxovu iun ajn novan \"dir\"-ajxon.\n"
-"--dir-file=NOMO   Indiku la dosieran NOMOn de Info-katalogo.\n"
-"                    Samkiel uzi la argumenton DIR-DOSIERO.\n"
-"--entry=TEKSTO    Ensxovu TEKSTOn kiel \"dir\"-ajxojn por Info-katalogo.\n"
-"                    TEKSTO havu la formon de menuera linio plus nul aux\n"
-"                    pluraj linioj kromaj, komencantaj per blanka spaco.\n"
-"                    Se estas pli ol unu \"dir\"-ajxo, ili cxiuj aldonigxos.\n"
-"                    Se estas nenia \"dir\"-ajxo, aldonigxos \"dir\"-ajxoj\n"
-"                    determinitaj el la informoj de la Info-dosiero.\n"
-"--help            Eligu la helpon.\n"
-"--info-file=DOSIERO Indiku Info-DOSIEROn instalendan en la Info-katalogo.\n"
-"                    Samkiel uzi la argumenton INFO-DOSIERO.\n"
-"--info-dir=UJO    Sinonimo por --dir-file=UJO/dir.\n"
-"--item=TEKSTO     Sinonimo por --entry=TEKSTO\n"
-"                    Cxiu \"dir\"-ajxo fakte estas menuero.\n"
-"--quiet           Ne eligu avertojn.\n"
-"--remove          Sinonimo por --delete.\n"
-"--section=SEKC    Metu la \"dir\"-ajxojn en sekcion SEKC de la Info-"
-"katalogo.\n"
-"                    Se pli ol unu sekcio estas indikitaj, cxiuj \"dir\"-"
-"ajxoj\n"
-"                    aldonigxas en ilin cxiujn.  Se neniu sekcio estas "
-"indikita,\n"
-"                    ili determinigxos el la informoj de la Info-dosiero.\n"
-"--version         Eligu la nomon, la version de la programo kaj eliru.\n"
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
 msgstr ""
-"Cxi tio estas la dosiero .../info/dir, entenanta la pinton de la \n"
-"la hierarkio Info -- la cxefkatalogan nodon nomatan (dir)Top.\n"
-"Unuafoje lancxinte la programon Info, vi trafas en tiun nodon.\n"
-"\n"
-"%s\\tLa pinto de la INFO-hierarkio\n"
-"\n"
-"  Cxi tie (en la Info-katalogo) estas menuo de la cxefaj temoj.\n"
-"  Tajpu \"q\" por eliri; \"?\" por eligi cxiujn komandojn de Info;\n"
-"  \"d\" por reveni cxi tien; \"h\" vokas lernilon por komencantoj;\n"
-"  \"mEmacs<Return>\" disponigas la manlibron pri Emakso; ktp.\n"
-"\n"
-"  Se vi legas per Emakso, alklaku menueron aux referencon per la 2-a\n"
-"  musbutono por elekti la temon.\n"
-"\n"
-"%s\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: ne povas legi (%s) kaj ne povas krei (%s)\n"
 
-#: util/install-info.c:600
+#: makeinfo/xref.c:252
 #, c-format
-msgid "%s: empty file"
-msgstr "%s: malplena dosiero"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY sen para END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY sen para START-INFO-DIR-ENTRY"
-
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Indiku la Info-dosieron solfoje.\n"
-
-#: util/install-info.c:1284
-#, c-format
-msgid "excess command line argument `%s'"
-msgstr "troa argumento komandlinia: \"%s\""
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
-msgstr "Mankas enigdosiero; provu --help por pluaj informoj."
-
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr "Mankas dosiero Info-katalogo (dir); provu --help por pluaj informoj."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr ""
 
-#: util/install-info.c:1313
+#: makeinfo/xref.c:390
 #, c-format
-msgid "no info dir entry in `%s'"
-msgstr "Nenia informo por Info-katalogo trovigxis en \"%s\""
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr ""
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "menuero \"%s\" jam ekzistas (por la dosiero \"%s\")"
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "Neniu referenco en ĉi tiu nodo."
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "Trovigxis nenia informo Info-kataloga pri \"%s\"; nenio igxis forigita"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr ""
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
-msgstr "eligu cxi tiun helpon kaj eliru"
+msgstr "eligu ĉi tiun helpon kaj eliru"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "konservu la labordosierojn post la traktado"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "ne konservu la labordosierojn post la traktado (defauxlto)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
-msgstr "sendu la eligajxon en DOSIEROn"
+msgstr "sendu la eligaĵon en DOSIEROn"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "eligu la uzatan version kaj eliru"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Uzmaniero: %s [OPCIO]... DOSIERO...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
-msgstr "Generu ordigitan indekson por cxiu TeX-a elig-DOSIERO.\n"
+msgstr "Generu ordigitan indekson por ĉiu TeX-a elig-DOSIERO.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
-msgstr "Kutime DOSIERO... estas \"umo.%c%c\" por dokumento \"umo.texi\".\n"
+msgstr "Kutime DOSIERO... estas „umo.%c%c‟ por dokumento „umo.texi‟.\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3051,65 +3068,379 @@ msgstr ""
 "\n"
 "Opcioj:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
+#: util/texindex.c:743
 #, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: ne indeksa dosiero laux Texinfo"
+msgid "failure reopening %s"
+msgstr "fiasko ĉe remalfermo de %s"
 
-#: util/texindex.c:968
+#: util/texindex.c:758 util/texindex.c:786
 #, c-format
-msgid "failure reopening %s"
-msgstr "fiasko cxe remalfermo de %s"
+msgid "%s: not a texinfo index file"
+msgstr "%s: ne indeksa dosiero laÅ­ Texinfo"
 
-#: util/texindex.c:1218
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
-msgstr "Mankas pagxnumero en %s"
+msgstr "Mankas pa�numero en %s"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "la artikolo %s sekvas artikolon kun kromnomo"
 
-#~ msgid "%s: Specify the Info directory only once.\n"
-#~ msgstr "%s: Indiku la Info-katalogon solfoje.\n"
-
-#~ msgid "\"\" is invalid"
-#~ msgstr "\"\" ne validas"
-
-#~ msgid "%s is an invalid ISO code, using %c"
-#~ msgstr "\"%s\" ne estas valida ISO-kodo; estos \"%c\" anstatauxe"
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10[search]  Serĉu sube aperon de donita signoĉeno kaj\n"
+#~ "      vizitu la nodon en kiu trovi�os la sekva apero.\n"
+
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10[goto-node]  Iru al nodo indikita per nomo.\n"
+#~ "      AnkaÅ­ la dosiernomon vi povas inkludi, kiel en (DOSIERO)NODO.\n"
 
-#~ msgid "Cannot specify more than one macro expansion output"
-#~ msgstr "Ne povas esti pli ol unu makrotraktada eligdosiero"
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr ""
+#~ "\\%-10[next-node]  Iru al la tujsekva („Next‟) nodo de ĉi tiu nodo.\n"
+
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr ""
+#~ "\\%-10[dir-node]  Iru al la ĉefkataloga nodo.  Ekvivalentas al \"g (DIR)"
+#~ "\".\n"
+
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr ""
+#~ "\\%-10[top-node]  Iru al la radika nodo.  Ekvivalentas al „g Top‟.\n"
+
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10[search-backward]  Serĉu supre aperon de donita signoĉeno kaj\n"
+#~ "      vizitu la nodon en kiu trovi�os la ĵusantaŭa apero.\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr "--- Uzu „\\[history-node]‟ aŭ „\\[kill-node]‟ por eliri ---\n"
 
-#~ msgid "File exists, but is not a directory"
-#~ msgstr "La dosiero ekzistas, sed gxi ne estas dosierujo"
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr ""
+#~ "\\%-10[move-to-prev-xref]  Saltu sur la sekvan hipertekstan ligilon en ĉi "
+#~ "tiu nodo.\n"
 
-#~ msgid "First argument to cross-reference may not be empty"
-#~ msgstr "La unua argumento de internoda referenco ne vaku"
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "Sintakso: %s [OPCIO]... [MENUERO...]\n"
+#~ "\n"
+#~ "Ebligas legi dokumentaron prezentitan en Info.\n"
+#~ "\n"
+#~ "Opcioj:\n"
+#~ "    --apropos=TEMO\t    Serĉu TEMOn en ĉiuj indeksoj de ĉiuj dokumentoj.\n"
+#~ "-d, --directory=UJO\t    Aldonu la dosierUJOn al INFOPATH.\n"
+#~ "    --dribble=DOSIERO\t    Notu la klavofrapojn de la uzanto en DOSIERO.\n"
+#~ "-f, --file=DOSIERO\t    Vizitu la Info-DOSIEROn.\n"
+#~ "-h, --help\t\t    Eligu ĉi tiun helpeton kaj finu.\n"
+#~ "    --index-search=ĈENO\t    Vizitu nodon referencatan per indeksartikolo "
+#~ "ĈENO.\n"
+#~ "-n, --node=NODO\t\t    Komencu per NODO.\n"
+#~ "-o, --output=DOSIERO\t    Eligu la elektitajn nodojn en DOSIEROn.\n"
+#~ "-R, --raw-escapes\t    Eligu ANSI-eskapilojn «krude» (la defaŭlto)\n"
+#~ "    --no-raw-escapes\t    Eligu ANSI-eskapilojn kiel tekstajn signojn\n"
+#~ "    --restore=DOSIERO\t    Legu la klavofrapojn el DOSIERO.\n"
+#~ "-O, --show-options, --usage Montru la nodon pri komandliniaj opcioj.\n"
+#~ "%s  --subnodes\t\t    Rekursie eligu la menuerojn.\n"
+#~ " -w, --where, --location    Eligu la fizikan situon de la info-dosiero\n"
+#~ "    --vi-keys\t\t    Uzu vi-eskan kaj less-eskan klavararan�on\n"
+#~ "    --version\t\t    Eligu la version de la programo kaj finu.\n"
+#~ "\n"
+#~ "La unua neopcia argumento, se donita, estas la nomo de unue vizitenda\n"
+#~ "menuero, serĉota en ĉiuj „dir‟-dosieroj troveblaj per INFOPATH.\n"
+#~ "Se �i mankas, Info kunfandas ĉiujn „dir‟-dosierojn kaj eligas la "
+#~ "rezulton.\n"
+#~ "La ceteraj argumentoj estas la nomoj de menueroj relative al la unue\n"
+#~ "vizitenda nodo.\n"
+#~ "\n"
+#~ "Ekzemploj:\n"
+#~ " info\t\t\t    eligu la menuon de la kataloga nodo\n"
+#~ " info emacs\t\t    komencu per la nodo „emacs‟ el la kataloga nodo\n"
+#~ " info emacs buffers\t    komencu per la nodo „buffers‟ el Emaksa "
+#~ "manlibro\n"
+#~ " info --show-options emacs  komencu per la Emaksaj komandliniaj opcioj\n"
+#~ " info -f ./um.info\t    eligu la dosieron ./um.info sen atenti „dir‟\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr "      Elekto de menuero kaÅ­zas transiron en alian nodon.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "      AnkaÅ­ la dosiernomon vi povas inkludi, kiel en (DOSIERO)NODO.\n"
+
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr "  %-10s  Serĉu indikotan signoĉenon supre en la dosiero,\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "        kaj vizitu la nodon en kiu trovi�os la sekva apero.\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "Estas legata la nodo „Next‟ ..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "La unua menuero estas elektata ..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "La nodo „Next‟ estas elektata ..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "%d-foje supren, poste al la sekva („Next‟)."
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "Iro al la antaŭa nodo „Prev‟ en ĉi tiu fenestro."
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "Levi�o al la nodo „Up‟ en ĉi tiu fenestro."
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "Iro al la lasta menuero de la nodo „Prev‟."
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "Funkcio"
+
+#~ msgid "Macro"
+#~ msgstr "Makroo"
+
+#~ msgid "Special Form"
+#~ msgstr "Speciala Formo"
+
+#~ msgid "Variable"
+#~ msgstr "Variablo"
+
+#~ msgid "User Option"
+#~ msgstr "Uzula opcio"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Ekzemplera variablo"
+
+#~ msgid "Method"
+#~ msgstr "Metodo"
+
+#~ msgid "Untitled"
+#~ msgstr "Sen titolo"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "Ĉi tiun dosieron %s generis Makeinfo-%s el %s.\n"
+
+#~ msgid "Next:"
+#~ msgstr "Sekva:"
 
-#~ msgid "see "
-#~ msgstr "vidu "
+#~ msgid "Previous:"
+#~ msgstr "AntaÅ­a:"
 
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "Referencon devas sekvi punkto aux komo, ne %c"
+#~ msgid "Up:"
+#~ msgstr "Supre:"
 
-#~ msgid "First argument to @inforef may not be empty"
-#~ msgstr "La unua argumento de @inforef ne vaku"
+#~ msgid "Menu"
+#~ msgstr "Menuo"
 
-#~ msgid "Node:"
-#~ msgstr "Nodo:"
+#~ msgid "Cross"
+#~ msgstr "Referenco"
 
-#~ msgid "%s: TOC should be here, but it was not found"
-#~ msgstr "%s: cxi tie mankas enhavtabelo"
+#~ msgid "Prev"
+#~ msgstr "AntaÅ­a"
 
-#~ msgid "virtual memory exhausted"
-#~ msgstr "virtuala memoro elcxerpitas"
+#~ msgid "Up"
+#~ msgstr "Supre"
 
-#~ msgid "No `%s.png' or `.jpg', and no extension supplied"
-#~ msgstr "Troveblas nek \"%s.png\" nek \".jpg\", kaj sufikso mankas"
+#, fuzzy
+#~ msgid "see "
+#~ msgstr "Vidu "
 
-#~ msgid "%s; for file `%s'.\n"
-#~ msgstr "%s; por la dosiero \"%s\".\n"
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "Sintakso: %s [OPCIO]... [INFO-DOSIERO [DIR-DOSIERO]]\n"
+#~ "\n"
+#~ "Instalu aŭ forigu „dir‟-aĵojn el INFO-DOSIERO en la Info-katalogo\n"
+#~ "  DIR-DOSIERO.\n"
+#~ "\n"
+#~ "Opcioj:\n"
+#~ "--delete          Forigu la ekzistantajn „dir‟-aĵojn pri INFO-DOSIERO;\n"
+#~ "                    ne en�ovu iun ajn novan „dir‟-aĵon.\n"
+#~ "--dir-file=NOMO   Indiku la dosieran NOMOn de Info-katalogo.\n"
+#~ "                    Samkiel uzi la argumenton DIR-DOSIERO.\n"
+#~ "--entry=TEKSTO    En�ovu TEKSTOn kiel „dir‟-aĵojn por Info-katalogo.\n"
+#~ "                    TEKSTO havu la formon de menuera linio plus nul aÅ­\n"
+#~ "                    pluraj linioj kromaj, komencantaj per blanka spaco.\n"
+#~ "                    Se estas pli ol unu „dir‟-aĵo, ili ĉiuj aldoni�os.\n"
+#~ "                    Se estas nenia „dir‟-aĵo, aldoni�os „dir‟-aĵoj\n"
+#~ "                    determinitaj el la informoj de la Info-dosiero.\n"
+#~ "--help            Eligu la helpon.\n"
+#~ "--info-file=DOSIERO Indiku Info-DOSIEROn instalendan en la Info-"
+#~ "katalogo.\n"
+#~ "                    Samkiel uzi la argumenton INFO-DOSIERO.\n"
+#~ "--info-dir=UJO    Sinonimo por --dir-file=UJO/dir.\n"
+#~ "--item=TEKSTO     Sinonimo por --entry=TEKSTO\n"
+#~ "                    Ĉiu „dir‟-aĵo fakte estas menuero.\n"
+#~ "--quiet           Ne eligu avertojn.\n"
+#~ "--remove          Sinonimo por --delete.\n"
+#~ "--section=SEKC    Metu la „dir‟-aĵojn en sekcion SEKC de la Info-"
+#~ "katalogo.\n"
+#~ "                    Se pli ol unu sekcio estas indikitaj, ĉiuj „dir‟-"
+#~ "aĵoj\n"
+#~ "                    aldoni�as en ilin ĉiujn.  Se neniu sekcio estas "
+#~ "indikita,\n"
+#~ "                    ili determini�os el la informoj de la Info-dosiero.\n"
+#~ "--version         Eligu la nomon, la version de la programo kaj eliru.\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "menuero «%s» jam ekzistas (por la dosiero «%s»)"
+
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr ""
+#~ "\\%-10[menu-digit]  Elektu resp. la unuan ... la naŭan eron el ĉi-noda "
+#~ "menuo.\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "la nodo «%s» estis referencita %d fojojn"
+
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "NENIA garantio estas donita.  Vi rajtas pludoni ekzemplerojn de ĉi tiu\n"
+#~ "programo laŭ la kondiĉoj de la GNUa Ĝenerala Publika Permesilo.\n"
+#~ "Pluaj informoj troveblas en la dosieroj COPYING.\n"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr ""
+#~ "      dosiero kaj elektu la nodon referencatan de la unua trovita "
+#~ "artikolo.\n"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (c) %s Free Software Foundation, Inc.\n"
+#~ "NENIA garantio estas donita.  Vi rajtas pludoni ekzemplerojn de ĉi tiu\n"
+#~ "programo laŭ la kondiĉoj de la GNUa Ĝenerala Publika Permesilo.  Pluaj\n"
+#~ "informoj troveblas en la dosieroj COPYING.\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-arg utilas nur en sol-argumentaj makrooj"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Enhavtabelo"
+
+#~ msgid "Short Contents"
+#~ msgstr "Maldetala enhavtabelo"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "konservu la labordosierojn post la traktado"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "ne konservu la labordosierojn post la traktado (defaÅ­lto)"
diff --git a/Build/source/utils/texinfo/po/es.gmo b/Build/source/utils/texinfo/po/es.gmo
new file mode 100644
index 00000000000..53b8eefd6d4
--- /dev/null
+++ b/Build/source/utils/texinfo/po/es.gmo
diff --git a/Build/source/utils/texinfo/po/es.po b/Build/source/utils/texinfo/po/es.po
new file mode 100644
index 00000000000..0a8e1c3aa77
--- /dev/null
+++ b/Build/source/utils/texinfo/po/es.po
@@ -0,0 +1,3392 @@
+# Spanish translations for texinfo-4.11.93.es.
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the texinfo package.
+#
+# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: texinfo-4.11.93.es\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2008-04-03 16:29+0200\n"
+"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr "Error de sistema desconocido"
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: la opción `%s' es ambigua\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: la opción `--%s' no permite argumento alguno\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: la opción `%c%s' no permite argumento alguno\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: la opción `%s' requiere un argumento\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opción desconocida `--%s'\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opción desconocida `%c%s'\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opción inválida -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opción inválida -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: la opción requiere un argumento -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: la opción `-W %s' es ambigua\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: la opción `-W %s' no permite argumento alguno\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "no más memoria disponible"
+
+#: info/echo-area.c:283 info/session.c:735
+msgid "Move forward a character"
+msgstr "Avanzar un carácter"
+
+#: info/echo-area.c:295 info/session.c:767
+msgid "Move backward a character"
+msgstr "Retroceder un carácter"
+
+#: info/echo-area.c:307
+msgid "Move to the start of this line"
+msgstr "Ir al principio de esta línea"
+
+#: info/echo-area.c:312
+msgid "Move to the end of this line"
+msgstr "Ir al final de esta línea"
+
+#: info/echo-area.c:320 info/session.c:808
+msgid "Move forward a word"
+msgstr "Avanzar una palabra"
+
+#: info/echo-area.c:360 info/session.c:881
+msgid "Move backward a word"
+msgstr "Retroceder una palabra"
+
+#: info/echo-area.c:400
+msgid "Delete the character under the cursor"
+msgstr "Borrar el carácter bajo el cursor"
+
+#: info/echo-area.c:430
+msgid "Delete the character behind the cursor"
+msgstr "Borrar el cáracter anterior a la posición del cursor"
+
+#: info/echo-area.c:451
+msgid "Cancel or quit operation"
+msgstr "Cancelar o abortar la operación"
+
+#: info/echo-area.c:466
+msgid "Accept (or force completion of) this line"
+msgstr "Aceptar (o forzar el completado de) esta línea"
+
+#: info/echo-area.c:471
+msgid "Insert next character verbatim"
+msgstr "Insertar siguiente carácter de forma literal"
+
+#: info/echo-area.c:479
+msgid "Insert this character"
+msgstr "Insertar este carácter"
+
+#: info/echo-area.c:497
+msgid "Insert a TAB character"
+msgstr "Insertar un carácter de tabulación (TAB)"
+
+#: info/echo-area.c:504
+msgid "Transpose characters at point"
+msgstr ""
+"Intercambiar los caracteres anterior y posterior a la posición del cursor"
+
+#: info/echo-area.c:555
+msgid "Yank back the contents of the last kill"
+msgstr "Pegar el último bloque de texto borrado"
+
+#: info/echo-area.c:562
+msgid "Kill ring is empty"
+msgstr "No existe información de anteriores bloques borrados"
+
+#: info/echo-area.c:575
+msgid "Yank back a previous kill"
+msgstr "Pegar el último borrado en bloque"
+
+#: info/echo-area.c:608
+msgid "Kill to the end of the line"
+msgstr "Borrar hasta el final de la línea"
+
+#: info/echo-area.c:621
+msgid "Kill to the beginning of the line"
+msgstr "Borrar hasta el principio de la línea"
+
+#: info/echo-area.c:633
+msgid "Kill the word following the cursor"
+msgstr "Borrar la palabra situada tras el cursor"
+
+#: info/echo-area.c:652
+msgid "Kill the word preceding the cursor"
+msgstr "Borrar la palabra situada antes el cursor"
+
+#: info/echo-area.c:867 info/echo-area.c:923
+msgid "No completions"
+msgstr "Nada que completar"
+
+#: info/echo-area.c:869
+msgid "Not complete"
+msgstr "Incompleto"
+
+#: info/echo-area.c:910
+msgid "List possible completions"
+msgstr "Listar posibles entradas"
+
+#: info/echo-area.c:927
+msgid "Sole completion"
+msgstr "Única entrada"
+
+#: info/echo-area.c:936
+msgid "One completion:\n"
+msgstr "Una entrada:\n"
+
+#: info/echo-area.c:937
+#, c-format
+msgid "%d completions:\n"
+msgstr "%d entradas:\n"
+
+#: info/echo-area.c:1084
+msgid "Insert completion"
+msgstr "Insertar entrada"
+
+#: info/echo-area.c:1219
+msgid "Building completions..."
+msgstr "Contruyendo lista de entradas..."
+
+#: info/echo-area.c:1339
+msgid "Scroll the completions window"
+msgstr "Avanzar en la lista de entradas"
+
+#: info/footnotes.c:212
+msgid "Footnotes could not be displayed"
+msgstr "Las notas a pie de página no pudieron ser mostradas"
+
+#: info/footnotes.c:238
+msgid "Show the footnotes associated with this node in another window"
+msgstr ""
+"Mostar las notas de pie de página asociadas con este nodo en otra ventana"
+
+#: info/footnotes.h:26
+msgid "---------- Footnotes ----------"
+msgstr "---- Notas a pie de página ----"
+
+#: info/indices.c:171
+msgid "Look up a string in the index for this file"
+msgstr "Buscar un texto en el índice de este fichero"
+
+#: info/indices.c:198
+msgid "Finding index entries..."
+msgstr "Buscando en el índice..."
+
+#: info/indices.c:206
+msgid "No indices found."
+msgstr "No se encontraron índices."
+
+#: info/indices.c:216
+msgid "Index entry: "
+msgstr "Entrada del índice: "
+
+#: info/indices.c:324
+msgid ""
+"Go to the next matching index item from the last `\\[index-search]' command"
+msgstr ""
+"Ir al siguiente elemento del índice que concuerde desde la última vez que "
+"el\n"
+"comando `\\[index-search]' fue ejecutado"
+
+#: info/indices.c:334
+msgid "No previous index search string."
+msgstr "No existe constancia previa de texto de búsqueda."
+
+#: info/indices.c:341
+msgid "No index entries."
+msgstr "No existen entradas en el índice."
+
+#: info/indices.c:374
+#, c-format
+msgid "No %sindex entries containing `%s'."
+msgstr "No existe constancia de entradas de `%sindex' que contengan `%s'."
+
+#: info/indices.c:375
+msgid "more "
+msgstr "más "
+
+#: info/indices.c:385
+msgid "CAN'T SEE THIS"
+msgstr "ESTO DEBER�A ESTAR INVISIBLE"
+
+#: info/indices.c:421
+#, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr ""
+"Encontrado `%s' en %s. (`\\[next-index-match]' tratará de encontrar la "
+"siguiente.)"
+
+#: info/indices.c:549
+#, c-format
+msgid "Scanning indices of `%s'..."
+msgstr "Buscando índices de `%s'..."
+
+#: info/indices.c:604
+#, c-format
+msgid "No available info files have `%s' in their indices."
+msgstr "No existen ficheros Info que contengan la palabra `%s' en sus índices."
+
+#: info/indices.c:630
+msgid "Grovel all known info file's indices for a string and build a menu"
+msgstr ""
+"Buscar un texto entre todos los ficheros Info disponibles y generar un menú"
+
+#: info/indices.c:634
+msgid "Index apropos: "
+msgstr "�ndice de apropos: "
+
+#: info/indices.c:662
+#, c-format
+msgid ""
+"\n"
+"* Menu: Nodes whose indices contain `%s':\n"
+msgstr ""
+"\n"
+"* Menú: Nodos cuyos índices contienen `%s':\n"
+
+#: info/info.c:273 info/infokey.c:899
+#, c-format
+msgid "Try --help for more information.\n"
+msgstr "Pruebe la opción `--help' para obtener más información.\n"
+
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licencia GPLv3+: GNU GPL versión 3 o posterior <http://gnu.org/licenses/gpl."
+"html>\n"
+"Esto es software libre: usted es libre de cambiarlo y redistribuirlo.\n"
+"Dicho software es provisto SIN GARANT�A, hasta donde permite la ley.\n"
+
+#: info/info.c:504
+#, c-format
+msgid "no index entries found for `%s'\n"
+msgstr ""
+"No se encontraron entradas de índice que concuerden con la palabra `%s'\n"
+
+#: info/info.c:598
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [MENU-ITEM...]\n"
+"\n"
+"Read documentation in Info format.\n"
+msgstr ""
+"Uso: %s [OPCIÓN]... [�TEM DE MENÚ...]\n"
+"\n"
+"Muestra documentación escrita en formato Info.\n"
+
+#: info/info.c:604
+msgid ""
+"Options:\n"
+"  -k, --apropos=STRING         look up STRING in all indices of all "
+"manuals.\n"
+"  -d, --directory=DIR          add DIR to INFOPATH.\n"
+"      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+"Opciones:\n"
+"  -k, --apropos=TEXTO          buscar TEXTO en los índices de todos los\n"
+"                                 manuales disponibles.\n"
+"  -d, --directory=RUTA         añadir RUTA a la variable INFOPATH.\n"
+"      --dribble=FICHERO        cargar combinaciones de teclas definidas por\n"
+"                                 el usuario desde el fichero FICHERO.\n"
+"  -f, --file=FICHERO           el FICHERO Info que visitar."
+
+#: info/info.c:611
+msgid ""
+"  -h, --help                   display this help and exit.\n"
+"      --index-search=STRING    go to node pointed by index entry STRING.\n"
+"  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+"  -h, --help                   mostrar este mensaje de ayuda.\n"
+"      --index-search=TEXTO     visitar el nodo al que el índice TEXTO "
+"apunta.\n"
+"  -n, --node=NOMBRE_NODO       nodo que mostrar del primero fichero Info.\n"
+"  -o, --output=FICHERO         guardar los nodos seleccionados en este "
+"FICHERO."
+
+#: info/info.c:617
+msgid ""
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
+"      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+"  -R, --raw-escapes            guardar escapes ANSI tal cual\n"
+"                                 (comportamiento por defecto).\n"
+"      --no-raw-escapes         mostrar escapes ANSI de forma \"literal\".\n"
+"      --restore=FICHERO        leer combinaciones de teclas iniciales del\n"
+"                                 fichero FICHERO.\n"
+"  -O, --show-options, --usage  ir al nodo donde se describen las opciones "
+"de\n"
+"                                 línea de comandos del programa al que el\n"
+"                                 fichero Info en cuestión se refiere."
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+"  -b, --speech-friendly        actúa acorde a como sintetizadores de voz\n"
+"                                 esperan que programas que los usan lo hagan."
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
+"      --vi-keys                use vi-like and less-like key bindings.\n"
+"      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+"      --subnodes               mostrar elementos del menú de forma "
+"recursiva.\n"
+"      --version                mostrar información de esta versión de "
+"Info      --vi-keys                usar combinaciones de teclas al estilo de "
+"los\n"
+"                                 programas `vi' y `less'.\n"
+"  -w, --where, --location      mostrar la ruta física del fichero Info en\n"
+"                                 cuestión."
+
+#: info/info.c:634
+msgid ""
+"\n"
+"The first non-option argument, if present, is the menu entry to start from;\n"
+"it is searched for in all `dir' files along INFOPATH.\n"
+"If it is not present, info merges all `dir' files and shows the result.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items relative to the initial node visited."
+msgstr ""
+"\n"
+"El primer argumento que no sea una opción de las arriba mencionadas, si\n"
+"hubiera alguno, correspondería a la entrada de menú que mostrar "
+"inicialmente;\n"
+"ésta es buscada en todos los ficheros `directorio' de cada una de las rutas\n"
+"mencionadas en la variable INFOPATH.  Si ésta no estuviera presente, Info\n"
+"recavaría información `directorio' y mostraría el resultado.  Cualquiera "
+"que\n"
+"fueran los argumentos restantes serían tratados como nombres de elementos "
+"del\n"
+"menú con respecto al nodo inicial visitado."
+
+#: info/info.c:641
+msgid ""
+"\n"
+"Examples:\n"
+"  info                       show top-level dir menu\n"
+"  info emacs                 start at emacs node from top-level dir\n"
+"  info emacs buffers         start at buffers node within emacs manual\n"
+"  info --show-options emacs  start at node with emacs' command line options\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
+msgstr ""
+"\n"
+"Ejemplos:\n"
+"  info                       muestra el directorio\n"
+"  info emacs                 muestra el nodo `emacs' en base al directorio\n"
+"  info emacs buffers         muestra el nodo `buffers' del fichero `emacs'\n"
+"  info --show-options emacs  muestra la página de opciones de línea de\n"
+"                               comandos para el programa `emacs'\n"
+"  info --subnodes -o out.txt emacs    escribe el manual de `emacs' al "
+"completo\n"
+"                                        en el fichero `out.txt'\n"
+"  info -f ./foo.info         muestra el fichero `./foo.info', sin buscar en\n"
+"                               el directorio"
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
+msgid ""
+"\n"
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Reporte cualquier tipo de problema que usted encuentra en el funcionamiento\n"
+"de esta programa <bug-texinfo@gnu.org>.  Preguntas y discusiones sobre\n"
+"Texinfo en general pueden ser dirigidas a <help-texinfo@gnu.org>.\n"
+"El sitio web de Texinfo es: http://www.gnu.org/software/texinfo/"
+
+#: info/info.c:684
+#, c-format
+msgid "Cannot find node `%s'."
+msgstr "Nodo `%s' no fue encontrado."
+
+#: info/info.c:685
+#, c-format
+msgid "Cannot find node `(%s)%s'."
+msgstr "El nodo `(%s)%s' no fue encontrado."
+
+#: info/info.c:686
+msgid "Cannot find a window!"
+msgstr "No podría encontrar una ventana!"
+
+#: info/info.c:687
+msgid "Point doesn't appear within this window's node!"
+msgstr "El cursor no parece estar sobre nodo alguno en esta ventana!"
+
+#: info/info.c:688
+msgid "Cannot delete the last window."
+msgstr "No se puede eliminar la última ventana."
+
+#: info/info.c:689
+msgid "No menu in this node."
+msgstr "No existe un menú en este nodo."
+
+#: info/info.c:690
+msgid "No footnotes in this node."
+msgstr "No hay notas de pie de página en este nodo."
+
+#: info/info.c:691
+msgid "No cross references in this node."
+msgstr "No hay enlaces en este nodo."
+
+#: info/info.c:692
+#, c-format
+msgid "No `%s' pointer for this node."
+msgstr "Este nodo no contiene enlace alguno a `%s'."
+
+#: info/info.c:693
+#, c-format
+msgid "Unknown Info command `%c'; try `?' for help."
+msgstr ""
+"`%c' no es un comando conocido; pruebe usted con `?' para acceder a la ayuda."
+
+#: info/info.c:694
+#, c-format
+msgid "Terminal type `%s' is not smart enough to run Info."
+msgstr "El tipo de terminal `%s' es incapaz de ejecutar Info."
+
+#: info/info.c:695
+msgid "You are already at the last page of this node."
+msgstr "Usted ya se encuentra en la última página de este nodo."
+
+#: info/info.c:696
+msgid "You are already at the first page of this node."
+msgstr "Usted ya se encuentra en la primera página de este nodo."
+
+#: info/info.c:697
+msgid "Only one window."
+msgstr "Una única ventana."
+
+#: info/info.c:698
+msgid "Resulting window would be too small."
+msgstr "La ventana resultante sería demasiado pequeña."
+
+#: info/info.c:699
+msgid "Not enough room for a help window, please delete a window."
+msgstr ""
+"No hay pantalla suficiente como para albergar la ventana de ayuda, elimine "
+"por favor alguna otra que no esté usando."
+
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
+msgstr "Comandos básicos para el manejo de Info\n"
+
+#: info/infodoc.c:47
+msgid "\\%-10[quit-help]  Close this help window.\n"
+msgstr "\\%-10[quit-help]  Salir de esta ventana de ayuda.\n"
+
+#: info/infodoc.c:48
+msgid "\\%-10[quit]  Quit Info altogether.\n"
+msgstr "\\%-10[quit]  Finalizar esta aplicación informática.\n"
+
+#: info/infodoc.c:49
+msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
+msgstr "\\%-10[get-info-help-node]  Invocar el tutorial de uso de Info.\n"
+
+#: info/infodoc.c:51
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-line]  Retroceder una línea.\n"
+
+#: info/infodoc.c:52
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  Avanzar una línea.\n"
+
+#: info/infodoc.c:53
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Retroceder una página.\n"
+
+#: info/infodoc.c:54
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Avanzar una página.\n"
+
+#: info/infodoc.c:55
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Ir al principio de este nodo.\n"
+
+#: info/infodoc.c:56
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Ir al final de este nodo.\n"
+
+#: info/infodoc.c:58
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr "\\%-10[move-to-next-xref]  Ir al siguiente enlace de hiper-texto.\n"
+
+#: info/infodoc.c:59
+msgid ""
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr ""
+"\\%-10[select-reference-this-line]  Seguir el enlace de hiper-texto bajo el "
+"cursor.\n"
+
+#: info/infodoc.c:60
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
+msgstr "\\%-10[history-node]  Ir al último nodo presente en esta ventana.\n"
+
+#: info/infodoc.c:62
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[global-prev-node]  Ir al nodo anterior en este documento.\n"
+
+#: info/infodoc.c:63
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[global-next-node]  Ir al nodo siguiente en este documento.\n"
+
+#: info/infodoc.c:64
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Ir al nodo anterior en este nivel.\n"
+
+#: info/infodoc.c:65
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Ir al nodo siguiente en este nivel.\n"
+
+#: info/infodoc.c:66
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Ir al nodo un nivel más arriba.\n"
+
+#: info/infodoc.c:67
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[top-node]  Ir al nodo cumbre de este documento.\n"
+
+#: info/infodoc.c:68
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[dir-node]  Ir al nodo principal o `directorio'.\n"
+
+#: info/infodoc.c:70
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr ""
+"1...9       Seleccionar el primer...noveno elemento del menú de este nodo.\n"
+
+#: info/infodoc.c:71
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr ""
+"\\%-10[last-menu-item]  Seleccionar el último elemento en el menú de este "
+"nodo.\n"
+
+#: info/infodoc.c:72
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr ""
+"\\%-10[menu-item]  Seleccionar un elemento del menú especificando su "
+"nombre.\n"
+
+#: info/infodoc.c:73
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "\\%-10[xref-item]  Seguir un enlace, especificando su nombre.\n"
+
+#: info/infodoc.c:74
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "\\%-10[goto-node]  Ir al nodo deseado, especificando su nombre.\n"
+
+#: info/infodoc.c:76
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "\\%-10[search]  Buscar hacia adelante el texto especificado.\n"
+
+#: info/infodoc.c:77
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[search-previous]  Buscar hacia atrás la próxima ocurrencia.\n"
+
+#: info/infodoc.c:78
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "\\%-10[search-next]  Buscar hacia adelante la próxima ocurrencia.\n"
+
+#: info/infodoc.c:79
+msgid ""
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
+msgstr ""
+"\\%-10[index-search]  Buscar texto en el índice de este fichero Info, y "
+"selec-\n"
+"              cionar el nodo al que el primer elemento encontrado se "
+"refiere.\n"
+
+#: info/infodoc.c:81
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "\\%-10[abort-key]  Cancelar la operación en curso.\n"
+
+#: info/infodoc.c:89
+msgid ""
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr ""
+"Comandos básicos para el manejo de Info\n"
+"***************************************\n"
+
+#: info/infodoc.c:92
+#, c-format
+msgid "  %-10s  Quit this help.\n"
+msgstr "  %-10s  Salir de esta pantalla de ayuda.\n"
+
+#: info/infodoc.c:93
+#, c-format
+msgid "  %-10s  Quit Info altogether.\n"
+msgstr "  %-10s  Salir de esta aplicación informática.\n"
+
+#: info/infodoc.c:94
+#, c-format
+msgid "  %-10s  Invoke the Info tutorial.\n"
+msgstr "  %-10s  Invocar el tutorial de uso de Info.\n"
+
+#: info/infodoc.c:98
+#, c-format
+msgid "  %-10s  Move to the `next' node of this node.\n"
+msgstr "  %-10s  Ir al nodo que consta como `siguiente' al actual.\n"
+
+#: info/infodoc.c:99
+#, c-format
+msgid "  %-10s  Move to the `previous' node of this node.\n"
+msgstr "  %-10s  Ir al nodo que consta como `anterior' al actual.\n"
+
+#: info/infodoc.c:100
+#, c-format
+msgid "  %-10s  Move `up' from this node.\n"
+msgstr "  %-10s  Ir al nodo que consta como `superior' al actual.\n"
+
+#: info/infodoc.c:101
+#, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"  %-10s  Seleccionar un ítem de menú por su nombre.\n"
+"              Seleccionar un ítem de menú causa que otro nodo sea "
+"seleccionado.\n"
+
+#: info/infodoc.c:103
+#, c-format
+msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
+msgstr "  %-10s  Seguir un enlace.  Lee el nombre del mismo.\n"
+
+#: info/infodoc.c:104
+#, c-format
+msgid "  %-10s  Move to the last node seen in this window.\n"
+msgstr "  %-10s  Ir al último nodo presente en esta ventana.\n"
+
+#: info/infodoc.c:105
+#, c-format
+msgid "  %-10s  Skip to next hypertext link within this node.\n"
+msgstr "  %-10s  Ir al siguiente enlace de hiper-texto en este nodo.\n"
+
+#: info/infodoc.c:106
+#, c-format
+msgid "  %-10s  Follow the hypertext link under cursor.\n"
+msgstr "  %-10s  Seguir el enlace de hiper-texto situado bajo el cursor.\n"
+
+#: info/infodoc.c:107
+#, c-format
+msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
+msgstr ""
+"  %-10s  Ir al nodo principal o `directorio'.  Equivalente a `g (DIR)'.\n"
+
+#: info/infodoc.c:108
+#, c-format
+msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
+msgstr "  %-10s  Ir al nodo cumbre.  Equivalente a `g Top'.\n"
+
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Moviéndose en torno a un nodo:\n"
+"------------------------------\n"
+
+#: info/infodoc.c:112
+#, c-format
+msgid "  %-10s  Scroll forward a page.\n"
+msgstr "  %-10s  Avanzar una página.\n"
+
+#: info/infodoc.c:113
+#, c-format
+msgid "  %-10s  Scroll backward a page.\n"
+msgstr "  %-10s  Retroceder una página.\n"
+
+#: info/infodoc.c:114
+#, c-format
+msgid "  %-10s  Go to the beginning of this node.\n"
+msgstr "  %-10s  Ir al principio de este nodo.\n"
+
+#: info/infodoc.c:115
+#, c-format
+msgid "  %-10s  Go to the end of this node.\n"
+msgstr "  %-10s  Ir al final de este nodo.\n"
+
+#: info/infodoc.c:116
+#, c-format
+msgid "  %-10s  Scroll forward 1 line.\n"
+msgstr "  %-10s  Avanzar una línea.\n"
+
+#: info/infodoc.c:117
+#, c-format
+msgid "  %-10s  Scroll backward 1 line.\n"
+msgstr "  %-10s  Retroceder una línea.\n"
+
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Otros comandos:\n"
+"---------------\n"
+
+#: info/infodoc.c:121
+#, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
+msgstr ""
+"  %-10s  Seleccionar el primer...noveno elemento del menú de este nodo.\n"
+
+#: info/infodoc.c:122
+#, c-format
+msgid "  %-10s  Pick last item in node's menu.\n"
+msgstr "  %-10s  Seleccionar el último elemento del menú de este nodo.\n"
+
+#: info/infodoc.c:125
+#, c-format
+msgid ""
+"  %-10s  Search for a specified string in the index entries of this Info\n"
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"  %-10s   Buscar texto en el índice de este fichero Info, y seleccionar\n"
+"              el nodo al que el primer elemento encontrado se refiere.\n"
+
+#: info/infodoc.c:127
+#, c-format
+msgid ""
+"  %-10s  Move to node specified by name.\n"
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"  %-10s  Ir a un nodo especificado por su nombre.\n"
+"              Puede incluir un nombre de fichero.  Por ejemplo:\n"
+"              (NOMBRE-FICHERO)NOMBRE-NODO.\n"
+
+#: info/infodoc.c:129
+#, c-format
+msgid ""
+"  %-10s  Search forward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"  %-10s  Buscar hacia adelante el texto especificado,\n"
+"              y seleccionar el nodo en que dicho texto es encontrado.\n"
+
+#: info/infodoc.c:131
+#, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"  %-10s  Buscar hacia atrás el texto especificado,\n"
+"              y seleccionar el nodo en que dicho texto es encontrado.\n"
+
+#: info/infodoc.c:312
+msgid "The current search path is:\n"
+msgstr "La lista de orden de búsqueda de ficheros actual es:\n"
+
+#: info/infodoc.c:316
+msgid ""
+"Commands available in Info windows:\n"
+"\n"
+msgstr ""
+"Comandos disponibles en ventanas Info:\n"
+"\n"
+
+#: info/infodoc.c:320
+msgid ""
+"Commands available in the echo area:\n"
+"\n"
+msgstr ""
+"Comandos disponibles en la ventana de mensajes:\n"
+"\n"
+
+#: info/infodoc.c:343
+#, c-format
+msgid ""
+"The following commands can only be invoked via %s:\n"
+"\n"
+msgstr ""
+"Los siguientes comandos sólo pueden ser especificados vía %s:\n"
+"\n"
+
+#: info/infodoc.c:347
+msgid ""
+"The following commands cannot be invoked at all:\n"
+"\n"
+msgstr ""
+"Los siguientes comandos no pueden ser invocados en forma alguna:\n"
+"\n"
+
+#: info/infodoc.c:477
+msgid "Display help message"
+msgstr "Mostrar mensaje de ayuda"
+
+#: info/infodoc.c:495
+msgid "Visit Info node `(info)Help'"
+msgstr "Visitar nodo Info `(info)Help'"
+
+#: info/infodoc.c:633
+msgid "Print documentation for KEY"
+msgstr "Imprimir la documentación relacionada con la tecla KEY"
+
+#: info/infodoc.c:645
+#, c-format
+msgid "Describe key: %s"
+msgstr "Describir la tecla: %s"
+
+#: info/infodoc.c:656
+#, c-format
+msgid "ESC %s is undefined."
+msgstr "ESC %s no ha sido definido."
+
+#: info/infodoc.c:672 info/infodoc.c:701
+#, c-format
+msgid "%s is undefined."
+msgstr "%s no ha sido definido."
+
+#: info/infodoc.c:722
+#, c-format
+msgid "%s is defined to %s."
+msgstr "%s ha sido definido como %s."
+
+#: info/infodoc.c:1145
+msgid "Show what to type to execute a given command"
+msgstr "Muestra qué teclas pulsar para un comando en específico"
+
+#: info/infodoc.c:1149
+msgid "Where is command: "
+msgstr "Comando \"donde está\": "
+
+#: info/infodoc.c:1171
+#, c-format
+msgid "`%s' is not on any keys"
+msgstr "`%s' no consta como tecla (o combinación de teclas) válida "
+
+#: info/infodoc.c:1178
+#, c-format
+msgid "%s can only be invoked via %s."
+msgstr "%s sólo puede ser invocado vía %s."
+
+#: info/infodoc.c:1182
+#, c-format
+msgid "%s can be invoked via %s."
+msgstr "%s puede ser invocado vía %s."
+
+#: info/infodoc.c:1187
+#, c-format
+msgid "There is no function named `%s'"
+msgstr "No existe función alguna llamada `%s'"
+
+#: info/infodoc.c:96
+msgid ""
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr ""
+"Seleccionando otros nodos:\n"
+"--------------------------\n"
+
+#: info/infokey.c:170
+msgid "incorrect number of arguments"
+msgstr "número de argumentos incorrecto"
+
+#: info/infokey.c:201
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "no se pudo abrir el fichero `%s'"
+
+#: info/infokey.c:215
+#, c-format
+msgid "cannot create output file `%s'"
+msgstr "no se pudo crear el fichero `%s'"
+
+#: info/infokey.c:226
+#, c-format
+msgid "error writing to `%s'"
+msgstr "error mientras se escribía al fichero `%s'"
+
+#: info/infokey.c:232
+#, c-format
+msgid "error closing output file `%s'"
+msgstr "error cerrando fichero `%s'"
+
+#: info/infokey.c:450
+msgid "key sequence too long"
+msgstr "secuencia de teclas demasiado larga"
+
+#: info/infokey.c:529
+msgid "missing key sequence"
+msgstr "secuencia de teclas ausente"
+
+#: info/infokey.c:610
+msgid "NUL character (\\000) not permitted"
+msgstr "El caracter `NUL' (\\000), no está permitido aquí"
+
+#: info/infokey.c:641
+#, c-format
+msgid "NUL character (^%c) not permitted"
+msgstr "El carácter nulo (^%c) no está permitido aquí"
+
+#: info/infokey.c:665
+msgid "missing action name"
+msgstr "nombre de acción ausente"
+
+#: info/infokey.c:681 info/infokey.c:756
+msgid "section too long"
+msgstr "sección demasiado larga"
+
+#: info/infokey.c:688
+#, c-format
+msgid "unknown action `%s'"
+msgstr "acción desconocida `%s'"
+
+#: info/infokey.c:698
+msgid "action name too long"
+msgstr "nombre de acción demasiado largo"
+
+#: info/infokey.c:712
+#, c-format
+msgid "extra characters following action `%s'"
+msgstr "extra caracteres tras nombre de acción `%s'"
+
+#: info/infokey.c:723
+msgid "missing variable name"
+msgstr "nombre de variable ausente"
+
+#: info/infokey.c:733
+msgid "missing `=' immediately after variable name"
+msgstr ""
+"ausencia del carácter `=' inmediatamente después del nombre de la variable"
+
+#: info/infokey.c:741
+msgid "variable name too long"
+msgstr "nombre de variable demasiado largo"
+
+#: info/infokey.c:765
+msgid "value too long"
+msgstr "valor demasiado largo"
+
+#: info/infokey.c:890
+#, c-format
+msgid "\"%s\", line %u: "
+msgstr "\"%s\", línea %u: "
+
+#: info/infokey.c:906
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INPUT-FILE]\n"
+"\n"
+"Compile infokey source file to infokey file.  Reads INPUT-FILE (default\n"
+"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n"
+"\n"
+"Options:\n"
+"  --output FILE        output to FILE instead of $HOME/.info\n"
+"  --help               display this help and exit.\n"
+"  --version            display version information and exit.\n"
+msgstr ""
+"Uso: %s [OPCIÓN]... [FICHERO]\n"
+"\n"
+"Compila el fichero FICHERO produciendo un fichero infokey.  Lee el fichero\n"
+"FICHERO (`$HOME/.infokey' por defecto) y escribe el fichero compilado como\n"
+"`$HOME/.info' (por defecto).\n"
+"\n"
+"Opciones:\n"
+"  --output FICHERO     escribir en fichero FICHERO, en vez de en $HOME/."
+"info\n"
+"  --help               mostrar este mensaje de ayuda.\n"
+"  --version            mostrar información de versión de esta aplicación\n"
+"                         informática.\n"
+
+#: info/infomap.c:955
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too small"
+msgstr "Ignorando fichero infokey `%s' (es demasiado pequeño)"
+
+#: info/infomap.c:958
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too big"
+msgstr "Ignorando fichero infokey `%s' (es demasiado grande)"
+
+#: info/infomap.c:971
+#, c-format
+msgid "Error reading infokey file `%s' - short read"
+msgstr "Error leyendo fichero infokey `%s' - lectura cortada"
+
+#: info/infomap.c:990
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
+msgstr ""
+"El fichero infokey `%s' es inválido (secuencia de identificación inválida),\n"
+"ejecute `infokey' sobre este para acutalizarlo"
+
+#: info/infomap.c:999
+#, c-format
+msgid "Your infokey file `%s' is out of date -- run infokey to update it"
+msgstr ""
+"Su fichero infokey `%s' es demasiado viejo,\n"
+"ejecute `infokey' sobre este para actualizarlo"
+
+#: info/infomap.c:1015
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section length) -- run infokey to update it"
+msgstr ""
+"El fichero infokey `%s' es inválido (longitud de sección errónea),\n"
+"ejecute `infokey' sobre este para actualizarlo"
+
+#: info/infomap.c:1036
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section code) -- run infokey to update it"
+msgstr ""
+"El fichero infokey `%s' es inválido (número de sección inválido),\n"
+"ejecute `infokey' sobre este para actualizarlo"
+
+#: info/infomap.c:1171
+msgid "Bad data in infokey file -- some key bindings ignored"
+msgstr ""
+"Datos erróneos en fichero infokey -- algunas combinaciones de teclas serán "
+"ignoradas"
+
+#: info/infomap.c:1221
+msgid "Bad data in infokey file -- some var settings ignored"
+msgstr ""
+"Datos erróneos en fichero infokey -- algunas variables que han sido "
+"declaradas serán ignoradas"
+
+#: info/m-x.c:68
+msgid "Read the name of an Info command and describe it"
+msgstr "Leer el nombre de un comando de Info y describirlo"
+
+#: info/m-x.c:72
+msgid "Describe command: "
+msgstr "Describir comando: "
+
+#: info/m-x.c:95
+msgid "Read a command name in the echo area and execute it"
+msgstr "Leer el nombre de un comando desde el área de mensajes y ejecutarlo"
+
+#: info/m-x.c:139
+msgid "Cannot execute an `echo-area' command here."
+msgstr "No se puede ejecutar el comando `echo-area' aquí."
+
+#: info/m-x.c:153
+#, c-format
+msgid "Undefined command: %s"
+msgstr "El comando `%s' no existe"
+
+#: info/m-x.c:159
+msgid "Set the height of the displayed window"
+msgstr "Establecer el ancho de la ventana"
+
+#: info/m-x.c:172
+#, c-format
+msgid "Set screen height to (%d): "
+msgstr "Establecer el ancho a (%d): "
+
+#: info/makedoc.c:166 info/makedoc.c:174
+#, c-format
+msgid ""
+"   Source files groveled to make this file include:\n"
+"\n"
+msgstr ""
+"   Los ficheros que han sido muestreados para construir este fichero "
+"incluyen:\n"
+"\n"
+
+#: info/makedoc.c:556
+#, c-format
+msgid "Couldn't manipulate the file %s.\n"
+msgstr "El fichero `%s' no pudo ser manipulado.\n"
+
+#: info/nodemenu.c:30
+msgid ""
+"\n"
+"* Menu:\n"
+"  (File)Node                        Lines   Size   Containing File\n"
+"  ----------                        -----   ----   ---------------"
+msgstr ""
+"\n"
+"* Menú:\n"
+"  (Fichero)Nodo                    Líneas  Tamaño  Fichero Original\n"
+"  -------------                    ------  ------  ----------------"
+
+#: info/nodemenu.c:201
+msgid ""
+"Here is the menu of nodes you have recently visited.\n"
+"Select one from this menu, or use `\\[history-node]' in another window.\n"
+msgstr ""
+"El siguiente es el menú de nodos que usted ha visitado recientemente.\n"
+"Seleccione uno, o use `\\[history-node]' en otra ventana.\n"
+
+#: info/nodemenu.c:223
+msgid "Make a window containing a menu of all of the currently visited nodes"
+msgstr ""
+"Crear una ventana que contenga un menú con los nodos visitados hasta ahora"
+
+#: info/nodemenu.c:303
+msgid "Select a node which has been previously visited in a visible window"
+msgstr "Seleccionar un nodo que ha sido previamente visitado"
+
+#: info/nodemenu.c:316
+msgid "Select visited node: "
+msgstr "Seleccionar nodo visitado: "
+
+#: info/nodemenu.c:336 info/session.c:2443
+#, c-format
+msgid "The reference disappeared! (%s)."
+msgstr "La referencia ha desaparecido! (%s)."
+
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr "Error en expresión regular: %s"
+
+#: info/session.c:164
+#, c-format
+msgid ""
+"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
+"for menu item."
+msgstr ""
+"Este es Info, versión %s. Teclee \\[get-help-window] para ayuda, \\[menu-"
+"item] para seleccionar un ítem de menú."
+
+#: info/session.c:625
+msgid "Move down to the next line"
+msgstr "Ir a la siguiente línea"
+
+#: info/session.c:661
+msgid "Move up to the previous line"
+msgstr "Ir a la línea anterior"
+
+#: info/session.c:696
+msgid "Move to the end of the line"
+msgstr "Ir al final de la línea"
+
+#: info/session.c:716
+msgid "Move to the start of the line"
+msgstr "Ir al principio de la línea"
+
+#: info/session.c:1007
+msgid "Next"
+msgstr "Siguiente"
+
+#: info/session.c:1023 info/session.c:1148
+msgid "No more nodes within this document."
+msgstr "No hay más nodos en este documento."
+
+#: info/session.c:1174
+msgid "No `Prev' for this node."
+msgstr "No hay nodo `Anterior' a este."
+
+#: info/session.c:1194
+msgid "No `Prev' or `Up' for this node within this document."
+msgstr "Este nodo no contiene `Anterior' ni `Superior'."
+
+#: info/session.c:1256
+msgid "Move forwards or down through node structure"
+msgstr "Moverse hacia adelante o abajo a través de la estructura de nodos"
+
+#: info/session.c:1272
+msgid "Move backwards or up through node structure"
+msgstr "Moverse hacia atrás o arriba a través de la estructura de nodos"
+
+#: info/session.c:1373
+msgid "Scroll forward in this window"
+msgstr "Avanzar en esta ventana"
+
+#: info/session.c:1381
+msgid "Scroll forward in this window and set default window size"
+msgstr "Avanzar en esta ventana y establecer el ancho de la misma"
+
+#: info/session.c:1389
+msgid "Scroll forward in this window staying within node"
+msgstr "Avanzar en esta ventana sin salir del nodo actual"
+
+#: info/session.c:1397
+msgid ""
+"Scroll forward in this window staying within node and set default window size"
+msgstr ""
+"Avanzar en esta ventana sin salir del nodo actual y establecer el ancho de "
+"la misma"
+
+#: info/session.c:1405
+msgid "Scroll backward in this window"
+msgstr "Retroceder en esta ventana"
+
+#: info/session.c:1413
+msgid "Scroll backward in this window and set default window size"
+msgstr "Retroceder en esta ventana y establecer el ancho de la misma"
+
+#: info/session.c:1422
+msgid "Scroll backward in this window staying within node"
+msgstr "Retroceder en esta ventana sin salir del nodo actual"
+
+#: info/session.c:1430
+msgid ""
+"Scroll backward in this window staying within node and set default window "
+"size"
+msgstr ""
+"Retroceder en esta ventana sin salir del nodo actual y establecer el ancho "
+"de la misma"
+
+#: info/session.c:1438
+msgid "Move to the start of this node"
+msgstr "Moverse al principio de este nodo"
+
+#: info/session.c:1445
+msgid "Move to the end of this node"
+msgstr "Moverse al final de este nodo"
+
+#: info/session.c:1452
+msgid "Scroll down by lines"
+msgstr "Avanzar por líneas"
+
+#: info/session.c:1469
+msgid "Scroll up by lines"
+msgstr "Retroceder por líneas"
+
+#: info/session.c:1487
+msgid "Scroll down by half screen size"
+msgstr "Avanzar media pantalla"
+
+#: info/session.c:1513
+msgid "Scroll up by half screen size"
+msgstr "Retroceder media pantalla"
+
+#: info/session.c:1542
+msgid "Select the next window"
+msgstr "Seleccionar la siguiente ventana"
+
+#: info/session.c:1581
+msgid "Select the previous window"
+msgstr "Seleccionar la ventana anterior"
+
+#: info/session.c:1632
+msgid "Split the current window"
+msgstr "Partir la ventana actual en dos mitades"
+
+#: info/session.c:1713
+msgid "Delete the current window"
+msgstr "Eliminar la ventana actual"
+
+#: info/session.c:1721
+msgid "Cannot delete a permanent window"
+msgstr "No se puede eliminar una ventana de tipo permanente"
+
+#: info/session.c:1753
+msgid "Delete all other windows"
+msgstr "Eliminar todas las otras ventanas"
+
+#: info/session.c:1799
+msgid "Scroll the other window"
+msgstr "Avanzar en la otra ventana"
+
+#: info/session.c:1820
+msgid "Scroll the other window backward"
+msgstr "Retroceder en la otra ventana"
+
+#: info/session.c:1826
+msgid "Grow (or shrink) this window"
+msgstr "Agrandar (o encoger) esta ventana"
+
+#: info/session.c:1837
+msgid "Divide the available screen space among the visible windows"
+msgstr ""
+"Dividir el espacio disponible de la pantalla entre las ventanas visibles"
+
+#: info/session.c:1844
+msgid "Toggle the state of line wrapping in the current window"
+msgstr "Activar o desactivar el modo `envolver-lineas' en la ventana actual"
+
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr "Activar o desactivar el uso de expresiones regulares durante búsquedas"
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr "Usando expresiones regulares durante búsquedas."
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr "Usando texto literal durante búsquedas."
+
+#: info/session.c:2027
+msgid "Select the Next node"
+msgstr "Seleccionar el nodo siguiente"
+
+#: info/session.c:2035
+msgid "Select the Prev node"
+msgstr "Seleccionar el nodo anterior"
+
+#: info/session.c:2043
+msgid "Select the Up node"
+msgstr "Seleccionar el nodo superior"
+
+#: info/session.c:2050
+msgid "Select the last node in this file"
+msgstr "Seleccionar el último nodo en este fichero"
+
+#: info/session.c:2077 info/session.c:2110
+msgid "This window has no additional nodes"
+msgstr "Esta ventana no dispone de nodos adicionales"
+
+#: info/session.c:2083
+msgid "Select the first node in this file"
+msgstr "Seleccionar el primer nodo en este fichero"
+
+#: info/session.c:2117
+msgid "Select the last item in this node's menu"
+msgstr "Seleccionar el último elemento del menú de este nodo"
+
+#: info/session.c:2123
+msgid "Select this menu item"
+msgstr "Seleccionar este elemento del menú"
+
+#: info/session.c:2156
+#, c-format
+msgid "There aren't %d items in this menu."
+msgstr "No hay %d elementos en este menú."
+
+#: info/session.c:2350 info/session.c:2351
+#, c-format
+msgid "Menu item (%s): "
+msgstr "Elemento del menú (%s): "
+
+#: info/session.c:2354
+msgid "Menu item: "
+msgstr "Elemento del menú: "
+
+#: info/session.c:2361 info/session.c:2362
+#, c-format
+msgid "Follow xref (%s): "
+msgstr "Seguir enlace (%s): "
+
+#: info/session.c:2365
+msgid "Follow xref: "
+msgstr "Seguir enlace: "
+
+#: info/session.c:2494
+msgid "Read a menu item and select its node"
+msgstr "Leer un elemento del menú y seleccionar el nodo al que corresponda"
+
+#: info/session.c:2502
+msgid "Read a footnote or cross reference and select its node"
+msgstr ""
+"Leer una nota de pie de página o enlace y seleccionar el nodo resultante"
+
+#: info/session.c:2508
+msgid "Move to the start of this node's menu"
+msgstr "Ir al principio del menú de este nodo"
+
+#: info/session.c:2532
+msgid "Visit as many menu items at once as possible"
+msgstr "Visitar de una sóla vez tantos elementos del menú como sea posible"
+
+#: info/session.c:2560
+msgid "Read a node name and select it"
+msgstr "Leer un nombre de nodo y seleccionarlo"
+
+#: info/session.c:2615 info/session.c:2620
+msgid "Goto node: "
+msgstr "Ir a nodo: "
+
+#: info/session.c:2684
+#, c-format
+msgid "No menu in node `%s'."
+msgstr "El nodo `%s' no contiene menú alguno."
+
+#: info/session.c:2730
+#, c-format
+msgid "No menu item `%s' in node `%s'."
+msgstr "No existe elemento de menú alguno llamado `%s' en el nodo `%s'."
+
+#: info/session.c:2760
+#, c-format
+msgid "Unable to find node referenced by `%s' in `%s'."
+msgstr "No se encontró ningún nodo referenciado por `%s' en `%s'."
+
+#: info/session.c:2810
+msgid "Read a list of menus starting from dir and follow them"
+msgstr ""
+"Leer una lista de menús comenzando desde el directorio especificado y "
+"seguirla"
+
+#: info/session.c:2812
+msgid "Follow menus: "
+msgstr "Seguir menús: "
+
+#: info/session.c:3005
+msgid "Find the node describing program invocation"
+msgstr "Encontrar el nodo que describe la invocación del programa en cuestión"
+
+#: info/session.c:3007
+#, c-format
+msgid "Find Invocation node of [%s]: "
+msgstr "Encontrar nodo de invocación de [%s]: "
+
+#: info/session.c:3045
+msgid "Read a manpage reference and select it"
+msgstr "Leer una referencia a páginas del manual y seleccionarla"
+
+#: info/session.c:3049
+msgid "Get Manpage: "
+msgstr "Página de manual a buscar: "
+
+#: info/session.c:3079
+msgid "Select the node `Top' in this file"
+msgstr "Seleccionar el nodo `Top' en este fichero"
+
+#: info/session.c:3085
+msgid "Select the node `(dir)'"
+msgstr "Seleccionar el nodo `(dir)'"
+
+#: info/session.c:3102 info/session.c:3104
+#, c-format
+msgid "Kill node (%s): "
+msgstr "Terminar nodo (%s): "
+
+#: info/session.c:3156
+#, c-format
+msgid "Cannot kill node `%s'"
+msgstr "No se pudo terminar el nodo `%s'"
+
+#: info/session.c:3166
+msgid "Cannot kill the last node"
+msgstr "No se puede terminar el último nodo"
+
+#: info/session.c:3252
+msgid "Select the most recently selected node"
+msgstr "Seleccionar el nodo usado más recientemente"
+
+#: info/session.c:3258
+msgid "Kill this node"
+msgstr "Terminar este nodo"
+
+#: info/session.c:3266
+msgid "Read the name of a file and select it"
+msgstr "Leer el nombre de un fichero y seleccionarlo"
+
+#: info/session.c:3270
+msgid "Find file: "
+msgstr "Fichero a buscar: "
+
+#: info/session.c:3287
+#, c-format
+msgid "Cannot find `%s'."
+msgstr "No se encontró `%s'."
+
+#: info/session.c:3330 info/session.c:3448
+#, c-format
+msgid "Could not create output file `%s'."
+msgstr "No se pudo crear el fichero `%s'."
+
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
+msgid "Done."
+msgstr "Hecho."
+
+#: info/session.c:3399
+#, c-format
+msgid "Writing node %s..."
+msgstr "Escribiendo nodo %s..."
+
+#: info/session.c:3475
+msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+msgstr "Volcar el contenido de este nodo a través de INFO_PRINT_COMMAND"
+
+#: info/session.c:3510
+#, c-format
+msgid "Cannot open pipe to `%s'."
+msgstr "No se pudo volcar sobre `%s'."
+
+#: info/session.c:3516
+#, c-format
+msgid "Printing node %s..."
+msgstr "Imprimiendo nodo %s..."
+
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr "La búsqueda continuó desde el final del documento."
+
+#: info/session.c:3738
+msgid "Search continued from the beginning of the document."
+msgstr "La búsqueda continuó desde el principio del documento."
+
+#: info/session.c:3755
+#, c-format
+msgid "Searching subfile %s ..."
+msgstr "Buscando sub-fichero %s ..."
+
+#: info/session.c:3812
+msgid "Read a string and search for it case-sensitively"
+msgstr "Leer un texto y buscarlo (mayúsculas y minúsculas son significantes)"
+
+#: info/session.c:3819
+msgid "Read a string and search for it"
+msgstr "Leer una cadena de texto y buscarla"
+
+#: info/session.c:3827
+msgid "Read a string and search backward for it"
+msgstr "Leer una cadena de texto y buscarla hacia atrás"
+
+#: info/session.c:3863 info/session.c:3869
+#, c-format
+msgid "%s%s%s [%s]: "
+msgstr "%s%s%s [%s]: "
+
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr "Buscar (exp.reg.)"
+
+#: info/session.c:3865 info/session.c:3871
+msgid " case-sensitively"
+msgstr " distinguiendo mayús./minús."
+
+#: info/session.c:3866 info/session.c:3872
+msgid " backward"
+msgstr " hacia atrás"
+
+#: info/session.c:3870
+msgid "Search"
+msgstr "Buscar"
+
+#: info/session.c:3911
+msgid "Search failed."
+msgstr "La búsqueda finalizó sin resultados."
+
+#: info/session.c:3929
+msgid "Repeat last search in the same direction"
+msgstr "Repetir la última búsqueda en la misma dirección que la anterior"
+
+#: info/session.c:3932 info/session.c:3942
+msgid "No previous search string"
+msgstr "No existe constancia de búsqueda anterior"
+
+#: info/session.c:3939
+msgid "Repeat last search in the reverse direction"
+msgstr "Repetir la última búsqueda en dirección contraria"
+
+#: info/session.c:3958 info/session.c:3964
+msgid "Search interactively for a string as you type it"
+msgstr "Buscar de forma interactiva un texto según usted lo escribe"
+
+#: info/session.c:4044
+msgid "Regexp I-search backward: "
+msgstr "Búsqueda interactiva hacia atrás (exp.reg.): "
+
+#: info/session.c:4045
+msgid "I-search backward: "
+msgstr "Búsqueda interactiva hacia atrás: "
+
+#: info/session.c:4047
+msgid "Regexp I-search: "
+msgstr "Búsqueda interactiva (exp.reg.): "
+
+#: info/session.c:4048
+msgid "I-search: "
+msgstr "Búsqueda interactiva: "
+
+#: info/session.c:4073 info/session.c:4075
+msgid "Failing "
+msgstr "Falló "
+
+#: info/session.c:4560
+msgid "Move to the previous cross reference"
+msgstr "Ir al enlace anterior"
+
+#: info/session.c:4578
+msgid "Move to the next cross reference"
+msgstr "Ir a la próxima referencia externa"
+
+#: info/session.c:4600
+msgid "Select reference or menu item appearing on this line"
+msgstr "Seleccionar la referencia o el elemento del menú situado en esta línea"
+
+#: info/session.c:4623
+msgid "Cancel current operation"
+msgstr "Cancelar la operación en curso"
+
+#: info/session.c:4630
+msgid "Quit"
+msgstr "Cancelado"
+
+#: info/session.c:4639
+msgid "Move the cursor to a specific line of the window"
+msgstr "Mover el cursor a una línea específica de la ventana"
+
+#: info/session.c:4671
+msgid "Redraw the display"
+msgstr "Redibujar los contenidos de la pantalla"
+
+#: info/session.c:4708
+msgid "Quit using Info"
+msgstr "Salir de esta aplicación informática"
+
+#: info/session.c:4721
+msgid "Run command bound to this key's lowercase variant"
+msgstr ""
+"Ejecutar comando asociado a la versión en minúsculas de esta tecla o "
+"combinación de teclas"
+
+#: info/session.c:4732
+#, c-format
+msgid "Unknown command (%s)."
+msgstr "Comando desconocido (%s)."
+
+#: info/session.c:4735
+#, c-format
+msgid "\"%s\" is invalid"
+msgstr "\"%s\" es inválido"
+
+#: info/session.c:4736
+#, c-format
+msgid "`%s' is invalid"
+msgstr "`%s' is inválido"
+
+#: info/session.c:4950
+msgid "Add this digit to the current numeric argument"
+msgstr "Sumar este dígito al argumento numérico actual"
+
+#: info/session.c:4959
+msgid "Start (or multiply by 4) the current numeric argument"
+msgstr "Comenzar (o multiplicar por 4) el argumento numérico actual"
+
+#: info/session.c:4974
+msgid "Internally used by \\[universal-argument]"
+msgstr "Internamente usado por \\[universal-argument]"
+
+#: info/tilde.c:336
+#, c-format
+msgid "readline: Out of virtual memory!\n"
+msgstr "readline: No más memoria virtual disponible!\n"
+
+#: info/variables.c:37
+msgid "When \"On\", footnotes appear and disappear automatically"
+msgstr ""
+"Cuando está activado, notas de pie de página aparecen y desaparecen de forma "
+"automática"
+
+#: info/variables.c:41
+msgid "When \"On\", creating or deleting a window resizes other windows"
+msgstr ""
+"Cuando está activado, crear o eliminar ventanas causa que las adyacentes "
+"sean redimensionadas"
+
+#: info/variables.c:45
+msgid "When \"On\", flash the screen instead of ringing the bell"
+msgstr ""
+"Cuado está activado, causa que la pantalla parpadee en vez de usar efectos "
+"sonoros"
+
+#: info/variables.c:49
+msgid "When \"On\", errors cause the bell to ring"
+msgstr "Cuando esta activado, errores producen un efecto sonoro"
+
+#: info/variables.c:53
+msgid "When \"On\", Info garbage collects files which had to be uncompressed"
+msgstr ""
+"Cuando está activado, Info recolecta ficheros que tuvieron que ser "
+"descomprimidos"
+
+#: info/variables.c:56
+msgid "When \"On\", the portion of the matched search string is highlighted"
+msgstr ""
+"Cuando está activado, la porción de cadena de texto que concuerda con la "
+"búsqueda en curso es mostrada en color llamativo"
+
+#: info/variables.c:60
+msgid "Controls what happens when scrolling is requested at the end of a node"
+msgstr "Controla que ocurre al intentar avanzar al final de un nodo"
+
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr "Lo mismo que `scroll-behaviour'"
+
+#: info/variables.c:69
+msgid "The number lines to scroll when the cursor moves out of the window"
+msgstr ""
+"El número de líneas que avanzar cuando el cursor se mueve fuera de la parte "
+"visible de la ventana"
+
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+"Controla si `scroll-behavior' afecta a comandos de movimiento del cursor"
+
+#: info/variables.c:77
+msgid "When \"On\", Info accepts and displays ISO Latin characters"
+msgstr ""
+"Cuando está activado, Info acepta y muestra caracteres codificados como ISO "
+"Latin"
+
+#: info/variables.c:81
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "Controla que ocurre al intentar avanzar al final del último nodo"
+
+#: info/variables.c:88
+msgid "Explain the use of a variable"
+msgstr "Explicar el uso de una variable"
+
+#: info/variables.c:94
+msgid "Describe variable: "
+msgstr "Describir variable: "
+
+#: info/variables.c:113
+msgid "Set the value of an Info variable"
+msgstr "Establecer el valor de una variable"
+
+#: info/variables.c:119
+msgid "Set variable: "
+msgstr "Establecer variable: "
+
+#: info/variables.c:137
+#, c-format
+msgid "Set %s to value (%d): "
+msgstr "Dar a %s el valor (%d): "
+
+#: info/variables.c:178
+#, c-format
+msgid "Set %s to value (%s): "
+msgstr "Dar a %s el valor (%s): "
+
+#: info/window.c:1150
+msgid "--*** Tags out of Date ***"
+msgstr "--*** Etiquetas antiguas ***"
+
+#: info/window.c:1161
+msgid "-----Info: (), lines ----, "
+msgstr "-----Info: (), líneas ----, "
+
+#: info/window.c:1168
+#, c-format
+msgid "-%s---Info: %s, %d lines --%s--"
+msgstr "-%s---Info: %s, %d líneas --%s--"
+
+#: info/window.c:1172
+#, c-format
+msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+msgstr "-%s%s-Info: (%s)%s, %d líneas --%s--"
+
+#: info/window.c:1179
+#, c-format
+msgid " Subfile: %s"
+msgstr " Sub-fichero: %s"
+
+#: install-info/install-info.c:221
+#, c-format
+msgid "%s: warning: "
+msgstr "%s: precaución: "
+
+#: install-info/install-info.c:270
+#, c-format
+msgid " for %s"
+msgstr " para %s"
+
+#: install-info/install-info.c:500
+#, c-format
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr ""
+"\tPruebe `%s --help' para obtener una lista de las opciones soportadas.\n"
+
+#: install-info/install-info.c:508
+#, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Uso: %s [OPCIÓN]... [FICHERO_INFO [FICHERO_�NDICE]]\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+"Añade al o elimina del fichero índice FICHERO_�NDICE las\n"
+"entradas encontradas en el fichero FICHERO_INFO."
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+"Opciones:\n"
+" --debug             reportar que se está haciendo\n"
+" --delete            eliminar del fichero índice FICHERO_�NDICE las "
+"entradas\n"
+"                     existentes que referencian el fichero FICHERO_INFO\n"
+" --description=TEXTO   la descripción de la entrada es "
+"TEXTO;                        usado junto con `--name' equivale al `--"
+"entry'.\n"
+" --dir-file=NOMBRE   el nombre del fichero índice;\n"
+"                     equivale al usar el argumento FICHERO_�NDICE.\n"
+" --dry-run           lo mismo que `--test'."
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+" --entry=TEXTO       insertar el texto TEXTO como entrada en el fichero "
+"índice\n"
+"                     especificado; TEXTO debe cumplir con el formato usado "
+"para\n"
+"                     describir elementos de menu en Info, más cero o más "
+"líneas\n"
+"                     extra que comiencen con un espacio en blanco.  Si "
+"usted\n"
+"                     especifica más de un elemento, todos serán añadidos; "
+"en\n"
+"                     caso contrario estos vendrán determinados por los "
+"datos\n"
+"                     existentes en el fichero Info en cuestión."
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+" --help              mostrar este texto de ayuda.\n"
+" --info-dir=DIRECTORIO   alias para `--dir-file=DIRECTORIO/dir.\n"
+" --info-file=FICHERO     el fichero Info que instalar en el directorio;\n"
+"                         equivale al usar el argumento FICHERO_INFO.\n"
+" --item=TEXTO        alias para `--entry=TEXTO'.\n"
+" --keep-old          no sustituir a entradas, ni eliminar secciones vacías.\n"
+" --menuentry=TEXTO   alias para `--name=TEXTO'.\n"
+" --name=TEXTO        el nombre de la entrada es TEXTO;                      "
+"usado junto con `--description' equivale al `--entry'.\n"
+" --no-indent         no bien arreglar nuevas entradas en el FICHERO_�NDICE.\n"
+" --quiet             suprimir mensajes de precaución."
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+" --regex=EXPREG    meter las entradas del fichero Info en cuestión en todas "
+"las\n"
+"                     secciones que concuerda con la expresión regular "
+"EXPREG\n"
+"                     (tratando mayúsculas y minúscualas por iguales)\n"
+" --remove          alias para `--delete'.\n"
+" --remove-exactly  eliminar el fichero Info en cuestión sólo si su nombre\n"
+"                     concuerda de forma exacta; ficheros con extensiones\n"
+"                     `.info' y/o `.gz' no son ignorados.\n"
+" --section=SECC    emplazar las entradas existentes en el fichero Info al "
+"que\n"
+"                     se hace referencia en la sección SECC del fichero "
+"índice.\n"
+"                     Si usted especifica más de una sección, todas las "
+"entradas\n"
+"                     serán añadidas en cada una de las secciones. Si "
+"ninguna,\n"
+"                     éstas serán determinadas a partir de la información\n"
+"                     contenida en el fichero Info en cuestión.\n"
+" --section EXPREG SECC  equivale a `--regex=EXPREG --section=SECC --add-"
+"once'."
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+" --silent          alias para `--quiet'.\n"
+" --test            suprimir la actualización del fichero índice "
+"FICHERO_�NDICE.\n"
+" --version         mostrar información sobre la versión de esta programa."
+
+#: install-info/install-info.c:570
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"Reporte cualquier tipo de problema que usted encuentra en el funcionamiento\n"
+"de esta programa <bug-texinfo@gnu.org>.  Preguntas y discusiones sobre\n"
+"Texinfo en general pueden ser dirigidas a <help-texinfo@gnu.org>.\n"
+"El sitio web de Texinfo es: http://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
+#, c-format
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Este es el fichero .../info/dir, el cual contiene el nodo situado\n"
+"en la cúspide de la jerarquía Info, lo cual se llama (dir)Top.\n"
+"La primera vez que usted invoque Info comenzará desde este punto.\n"
+"\n"
+"%s\tEsta es la cúspide de le jerarquía INFO\n"
+"\n"
+"  Este (el Directorio principal) proporciona un menú que contiene las "
+"entradas\n"
+"  mas usuales. Tecleando \"q\" saldrá de esta aplicación informática, "
+"tecleando\n"
+"  \"?\" prodrá producir un listado de todos los comandos disponibles a modo "
+"de\n"
+"  referencia; tecleando \"d\" volverá a esta pantalla, \"h\" provee de "
+"información\n"
+"  a usuarios/as primerizos/as; presionando \"m\" y escribiendo la palabra "
+"\"Emacs\"\n"
+"  podrá visitar el manual de Emacs, etc.\n"
+"\n"
+"  También puede usted usar Info desde Emacs. En la versión de Emacs con\n"
+"  ventanas puede hacer click con el botón izquierdo del ratón sobre "
+"elementos\n"
+"  de menú o sobre enlaces para seleccionarlos o seguirlos.\n"
+"\n"
+"%s\n"
+
+#: install-info/install-info.c:622
+#, c-format
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: No se pudo leer (%s) y no se pudo crear (%s)\n"
+
+#: install-info/install-info.c:715
+#, c-format
+msgid "%s: empty file"
+msgstr "%s: fichero vacío"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "`START-INFO-DIR-ENTRY' presente, pero sin pareja (END-INFO-DIR-ENTRY)"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "`END-INFO-DIR-ENTRY' presente, pero sin pareja (START-INFO-DIR-ENTRY)"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
+#, c-format
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: ya contiene un fichero índice: %s\n"
+
+#: install-info/install-info.c:2026
+#, c-format
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Sólo es necesario especificar el fichero Info una vez.\n"
+
+#: install-info/install-info.c:2059
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr "Expresión regular extra especificada, será ignorada `%s'"
+
+#: install-info/install-info.c:2071
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr "Error en la expresión regular `%s': %s"
+
+#: install-info/install-info.c:2129
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "Demasiados argumentos en la línea de comandos `%s'"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ""
+"No se ha especificado fichero de entrada;\n"
+"pruebe usted la opción `--help' para obetener más información."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+"Fichero índice no especificado;\n"
+"pruebe usted la opción `--help' para obtener más información."
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "No existe constancia de entrada `dir' en `%s'"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "No se encontraron entradas para `%s'; nada será borrado"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr "error `ferror' en descriptor de salida estándar (stdout)\n"
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr "error `fflush' en descriptor de salida estándar (stdout)\n"
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr "argumentos para @%s serán ignorados"
+
+#: makeinfo/cmds.c:779
+msgid "January"
+msgstr "Enero"
+
+#: makeinfo/cmds.c:779
+msgid "February"
+msgstr "Febrero"
+
+#: makeinfo/cmds.c:779
+msgid "March"
+msgstr "Marzo"
+
+#: makeinfo/cmds.c:779
+msgid "April"
+msgstr "Abril"
+
+#: makeinfo/cmds.c:779
+msgid "May"
+msgstr "Mayo"
+
+#: makeinfo/cmds.c:780
+msgid "June"
+msgstr "Junio"
+
+#: makeinfo/cmds.c:780
+msgid "July"
+msgstr "Julio"
+
+#: makeinfo/cmds.c:780
+msgid "August"
+msgstr "Agosto"
+
+#: makeinfo/cmds.c:780
+msgid "September"
+msgstr "Septiembre"
+
+#: makeinfo/cmds.c:780
+msgid "October"
+msgstr "Octubre"
+
+#: makeinfo/cmds.c:781
+msgid "November"
+msgstr "Noviembre"
+
+#: makeinfo/cmds.c:781
+msgid "December"
+msgstr "Diciembre"
+
+#: makeinfo/cmds.c:1131
+#, c-format
+msgid "unlikely character %c in @var"
+msgstr "carácter extraño %c en @var"
+
+#: makeinfo/cmds.c:1174
+msgid "@sc argument all uppercase, thus no effect"
+msgstr ""
+"Todos los argumentos dados a la primitiva `@sc' están en mayúsculas. No "
+"tendrán efecto alguno"
+
+#: makeinfo/cmds.c:1229
+#, c-format
+msgid "`{' expected, but saw `%c'"
+msgstr ""
+"a continuación se esperaba ver el símbolo `{', pero el carácter `%c' ha sido "
+"leído en su lugar"
+
+#: makeinfo/cmds.c:1269
+msgid "end of file inside verb block"
+msgstr "fin de fichero dentro de bloque `verb'"
+
+#: makeinfo/cmds.c:1277
+#, c-format
+msgid "`}' expected, but saw `%c'"
+msgstr ""
+"a continuación se esperaba ver el símbolo `}', pero el carácter `%c' ha sido "
+"leído en su lugar"
+
+#: makeinfo/cmds.c:1308
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+"@strong{Note...} produce una referencia no deseada en Info; reescríbalo para "
+"que esto no ocurra"
+
+#: makeinfo/cmds.c:1504
+#, c-format
+msgid "%c%s is obsolete"
+msgstr "%c%s es una sintaxis ya obsoleta"
+
+#: makeinfo/cmds.c:1612
+#, c-format
+msgid "@sp requires a positive numeric argument, not `%s'"
+msgstr "@sp requiere un argumento numérico positivo, no `%s'"
+
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
+#, c-format
+msgid "Bad argument to %c%s"
+msgstr "Argumento erróneo para %c%s"
+
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
+msgid "asis"
+msgstr "asis"
+
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
+msgid "none"
+msgstr "none"
+
+#: makeinfo/cmds.c:2049
+#, c-format
+msgid "Bad argument to @%s"
+msgstr "Argumento erróneo para @%s"
+
+#: makeinfo/cmds.c:2063
+msgid "insert"
+msgstr "insert"
+
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Argumento erróneo para @%s: %s"
+
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr "Se esperaba leer @%s \"on\" u \"off\", no `%s'"
+
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr "Sólo @%s 10 or 11 está soportado, no `%s'"
+
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "La construcción `@def arg' necesita de un símbolo `}' al final"
+
+#: makeinfo/defun.c:711
+#, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "Debe estar bajo la influencia del entorno `@%s' para poder usar `@%s'"
+
+#: makeinfo/files.c:434
+#, c-format
+msgid "%s: getwd: %s, %s\n"
+msgstr "%s: getwd: %s, %s\n"
+
+#: makeinfo/files.c:637
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr "se ha omitido `%s' antes del nombre de fichero de salida"
+
+#: makeinfo/files.c:645
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+"se ha omitido `%s', ya que estamos escribiendo al descriptor de salida "
+"estándar (stdout)"
+
+#: makeinfo/files.c:693
+msgid "Output buffer not empty."
+msgstr "El acumulador (buffer) de salida no está vacío."
+
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr "El tipo de construccion `float' `%s' no ha sido usado previamente"
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Véase "
+
+#: makeinfo/footnote.c:149
+#, c-format
+msgid "`%c%s' needs an argument `{...}', not just `%s'"
+msgstr "`%c%s' necesita de un argumento `{...}', y no simplemente de `%s'"
+
+#: makeinfo/footnote.c:164
+#, c-format
+msgid "No closing brace for footnote `%s'"
+msgstr "No se han cerrado llaves para la nota de pie de página `%s'"
+
+#: makeinfo/footnote.c:197
+msgid "Footnote defined without parent node"
+msgstr "Nota de pie de página definida sin nodo al que referirse"
+
+#: makeinfo/footnote.c:209
+msgid "Footnotes inside footnotes are not allowed"
+msgstr "No está permitido anidar notas a pie de página en sí mismas"
+
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
+msgid "Footnotes"
+msgstr "Notas a pie de página"
+
+#: makeinfo/html.c:86
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s: no se pudo abrir --css-file: %s"
+
+#: makeinfo/html.c:175
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d: --css-file finaliza con un comentario"
+
+#: makeinfo/html.c:421
+msgid "[unexpected] no html tag to pop"
+msgstr "[inesperado] no etiqueta `html' que procesar"
+
+#: makeinfo/html.c:764
+#, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[inesperado] el nombre de nodo `%s' es inválido"
+
+#: makeinfo/index.c:167
+#, c-format
+msgid "Unknown index `%s'"
+msgstr "�ndice desconocido `%s'"
+
+#: makeinfo/index.c:232
+#, c-format
+msgid "Info cannot handle `:' in index entry `%s'"
+msgstr "Info no puede manejar `:' en la entrada de índice `%s'"
+
+#: makeinfo/index.c:410
+#, c-format
+msgid "Index `%s' already exists"
+msgstr "Ya existe un índice llamado `%s'"
+
+#: makeinfo/index.c:453
+#, c-format
+msgid "Unknown index `%s' and/or `%s' in @synindex"
+msgstr "�ndice desconocido `%s' y/o `%s' en `@synindex'"
+
+#: makeinfo/index.c:676
+msgid "(line )"
+msgstr "(línea )"
+
+#: makeinfo/index.c:684
+#, c-format
+msgid "(line %*d)"
+msgstr "(línea %*d)"
+
+#: makeinfo/index.c:764
+#, c-format
+msgid "Unknown index `%s' in @printindex"
+msgstr "�ndice desconocido `%s' en `@printindex'"
+
+#: makeinfo/index.c:833
+#, c-format
+msgid "Entry for index `%s' outside of any node"
+msgstr "La entrada para el índice `%s' se encuentra fuera de nodo alguno"
+
+#: makeinfo/index.c:836 makeinfo/index.c:872
+msgid "(outside of any node)"
+msgstr "(fuera de nodo alguno)"
+
+#: makeinfo/insertion.c:161
+msgid "@item not allowed in argument to @itemize"
+msgstr "el uso de `@item' no está permitido como argumento de `@itemize'"
+
+#: makeinfo/insertion.c:242
+msgid "Broken-Type in insertion_type_pname"
+msgstr "Tipo erróneo en `insertion_type_pname'"
+
+#: makeinfo/insertion.c:338
+msgid "Enumeration stack overflow"
+msgstr "Desbordamiento de la pila por enumeración"
+
+#: makeinfo/insertion.c:370
+#, c-format
+msgid "lettering overflow, restarting at %c"
+msgstr ""
+"desbordamiento por tamaño de palabra, comenzando de nuevo en el carácter %c"
+
+#: makeinfo/insertion.c:639
+#, c-format
+msgid "%s requires an argument: the formatter for %citem"
+msgstr "`%s' requiere un argumento: el procesador de formato para %citem"
+
+#: makeinfo/insertion.c:727
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr "entornos `%cfloat' no pueden ser anidados"
+
+#: makeinfo/insertion.c:981
+#, c-format
+msgid "`@end' expected `%s', but saw `%s'"
+msgstr "Se esperaba ver `@end' `%s', pero se ha leído `%s'"
+
+#: makeinfo/insertion.c:1349
+#, c-format
+msgid "No matching `%cend %s'"
+msgstr "No hay constancia de final de bloque `%cend %s'"
+
+#: makeinfo/insertion.c:1618
+#, c-format
+msgid "%s requires letter or digit"
+msgstr "%s require una letra o número"
+
+#: makeinfo/insertion.c:1718
+msgid "end of file inside verbatim block"
+msgstr "fin de fichero sobre bloque de texto literal"
+
+#: makeinfo/insertion.c:1942
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s carece de sentido si se da fuera de entornos como `@float'"
+
+#: makeinfo/insertion.c:1978
+msgid "@menu seen before first @node, creating `Top' node"
+msgstr "`@menu' ha sido leído antes que `@node', se creará un nodo `Top'"
+
+#: makeinfo/insertion.c:1979
+msgid ""
+"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
+msgstr ""
+"¿Quizás su nodo `@top' debería quedar bajo la influencia de un bloque "
+"`@ifnottex' en vez de la de un bloque `@ifinfo'?"
+
+#: makeinfo/insertion.c:1991
+msgid "@detailmenu seen before first node, creating `Top' node"
+msgstr ""
+"`@detailmenu' ha sido leído antes que nodo alguno, se creará un nodo `Top'"
+
+#: makeinfo/insertion.c:2047
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"`@%s' carece de sentido fuera de influencias de entornos como `@titlepage' o "
+"`@quotation'"
+
+#: makeinfo/insertion.c:2061
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr ""
+"@%s carece de sentido fuera de influencias de entornos como `@titlepage'"
+
+#: makeinfo/insertion.c:2092
+#, c-format
+msgid "Unmatched `%c%s'"
+msgstr "Final de bloque inexistente (`%c%s')"
+
+#: makeinfo/insertion.c:2097
+#, c-format
+msgid "`%c%s' needs something after it"
+msgstr "`%c%s' necesita de algún argumento tras su declaración"
+
+#: makeinfo/insertion.c:2103
+#, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "`%s' no es un argumento correcto para `@%s', se usará `%s'"
+
+#: makeinfo/insertion.c:2200
+#, c-format
+msgid "@%s not meaningful inside `@%s' block"
+msgstr "`@%s' carece de sentido bajo la influencia de un bloque `@%s'"
+
+#: makeinfo/insertion.c:2209
+#, c-format
+msgid "@itemx not meaningful inside `%s' block"
+msgstr "`@itemx' carece de sentido bajo la influencia de un bloque `%s'"
+
+#: makeinfo/insertion.c:2383
+#, c-format
+msgid "%c%s found outside of an insertion block"
+msgstr "`%c%s' ha sido leído fuera de un bloque de inserción"
+
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr "No existe constancia de territorio por defecto para el lenguaje `%s'"
+
+#: makeinfo/lang.c:1281
+#, c-format
+msgid "%s is not a valid ISO 639 language code"
+msgstr ""
+"`%s' no es válido como código de lenguaje alguno que cumpla con ISO 639"
+
+#: makeinfo/lang.c:1399
+#, c-format
+msgid "unrecognized encoding name `%s'"
+msgstr "`%s' no se corresponde con ningún tipo de codificación conocido"
+
+#: makeinfo/lang.c:1407
+#, c-format
+msgid "sorry, encoding `%s' not supported"
+msgstr "lo sentimos, el tipo de codificación `%s' no está soportado"
+
+#: makeinfo/lang.c:1492
+#, c-format
+msgid "invalid encoded character `%s'"
+msgstr "carácter codificado no válido `%s'"
+
+#: makeinfo/lang.c:1800
+#, c-format
+msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgstr ""
+"el uso de `%c%s' presupone como siguientes argumentos `i' o `j', no `%c'"
+
+#: makeinfo/lang.c:1804
+#, c-format
+msgid "%c%s expects a single character `i' or `j' as argument"
+msgstr "el uso `%c%s' presupone como argumentos los caracteres `i' o `j'"
+
+#: makeinfo/macro.c:128
+#, c-format
+msgid "macro `%s' previously defined"
+msgstr "el macro `%s' ya ha sido definido en este documento"
+
+#: makeinfo/macro.c:132
+#, c-format
+msgid "here is the previous definition of `%s'"
+msgstr "la definición previa de `%s' se encuentra aquí"
+
+#: makeinfo/macro.c:359
+#, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr ""
+"\\ fue leído durante la expansión del macro seguido de `%s' en vez de por un "
+"parámetro válido"
+
+#: makeinfo/macro.c:401
+#, c-format
+msgid "Macro `%s' called on line %d with too many args"
+msgstr "La llamada al macro `%s' en la línea %d contiene demasiados argumentos"
+
+#: makeinfo/macro.c:580
+#, c-format
+msgid "%cend macro not found"
+msgstr "no se encontró declaración de final de macro (`%cend')"
+
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+"`@allow-recursion' consta como una primitiva obsoleta; use por favor "
+"`@rmacro' en su lugar"
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
+"`@quote-arg' consta como una primitiva obsoleta; sus argumentos son "
+"entrecomillados por defecto"
+
+#: makeinfo/macro.c:649
+#, c-format
+msgid "mismatched @end %s with @%s"
+msgstr "se esperaba leer `@end %s' pero se ha leído `@%s'"
+
+#: makeinfo/makeinfo.c:188
+#, c-format
+msgid "Too many errors!  Gave up.\n"
+msgstr ""
+"Demasiados errores!  Se da por finalizado el proceso de este fichero aquí.\n"
+
+#: makeinfo/makeinfo.c:306
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: precaución: "
+
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
+#, c-format
+msgid "Misplaced %c"
+msgstr "Carácter `%c' fuera de lugar"
+
+#: makeinfo/makeinfo.c:344
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Pruebe `%s --help' para obtener más información.\n"
+
+#: makeinfo/makeinfo.c:347
+#, c-format
+msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
+msgstr "Uso: %s [OPCIÓN]... FICHERO-TEXINFO...\n"
+
+#: makeinfo/makeinfo.c:350
+msgid ""
+"Translate Texinfo source documentation to various other formats, by default\n"
+"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
+msgstr ""
+"Convierte ficheros escritos en Texinfo a varios otros formatos, por defecto "
+"a\n"
+"formato Info, que puede ser leído con Emacs o el visor de ficheros Info de "
+"GNU.\n"
+
+#: makeinfo/makeinfo.c:354
+#, c-format
+msgid ""
+"General options:\n"
+"      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
+"      --force                 preserve output even if errors.\n"
+"      --help                  display this help and exit.\n"
+"      --no-validate           suppress node cross-reference validation.\n"
+"      --no-warn               suppress warnings (but not errors).\n"
+"  -v, --verbose               explain what is being done.\n"
+"      --version               display version information and exit.\n"
+msgstr ""
+"Opciones generales;\n"
+"      --error-limit=NÚMERO    dar por finalizado el proceso del fichero en\n"
+"                                cuestión tras un número de errors mayor o "
+"igual\n"
+"                                a NÚMERO (por defecto %d).\n"
+"      --document-language=TEXTO\n"
+"                              locale a usar con el fin de traducir "
+"primitivas\n"
+"                                Texinfo para el documento final (C por "
+"defecto).\n"
+"      --force                 generar documento de salida incluso si se\n"
+"                                encontraron errores durante el proceso.\n"
+"      --help                  mostrar este mensaje de ayuda.\n"
+"      --no-validate           suprimir la validación de enlaces.\n"
+"      --no-warn               suprimir mensajes de precaución (pero no "
+"errores).\n"
+"  -v, --verbose               explicar que se está haciendo durante el "
+"proceso\n"
+"                                del documento en cuestión.\n"
+"      --version               mostrar información sobre la versión de esta\n"
+"                                aplicación informática.\n"
+
+#: makeinfo/makeinfo.c:369
+#, no-wrap
+msgid ""
+"Output format selection (default is to produce Info):\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
+msgstr ""
+"Selección de formato de salida (por defecto se producen ficheros Info):\n"
+"      --docbook               generar un fichero en formato Docbook XML.\n"
+"      --html                  generar un fichero en formato HTML.\n"
+"      --xml                   generar un fichero en formato Texinfo XML.\n"
+"      --plaintext             generar un fichero en texto plano.\n"
+
+#: makeinfo/makeinfo.c:377
+msgid ""
+"General output options:\n"
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
+"menus\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
+msgstr ""
+"Opciones generales de salida:\n"
+"  -E, --macro-expand=FICHERO  escribir un fichero FICHERO en el que "
+"cualquier\n"
+"                                macro presente es expandido (primitivas\n"
+"                                `@setfilename' serán ignoradas).\n"
+"      --no-headers            suprimir separadores de nodos, líneas de "
+"`Nodo:'\n"
+"                                y menús del fichero Info (produciendo así\n"
+"                                texto plano) o de HTML (produciendo así un\n"
+"                                documento menor); también se escribe por\n"
+"                                defecto a la salida estándar (stdout).\n"
+"      --no-split              no generar un documento Info o HTML multi-"
+"página;\n"
+"                                generar un sólo documento que ocurre en una\n"
+"                                sóla página.\n"
+"      --number-sections       numerar capítulos y secciones.\n"
+"  -o, --output=FICHERO        escribir en fichero FICHERO (se toma como "
+"nombre\n"
+"                               de directorio si el formato de salida es "
+"HTML\n"
+"                               en modo multi-documento/multi-página).\n"
+
+#: makeinfo/makeinfo.c:391
+#, c-format
+msgid ""
+"Options for Info and plain text:\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
+"      --fill-column=NUM       break Info lines at NUM characters (default %"
+"d).\n"
+"      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
+"                                `separate' to put them in their own node;\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
+"      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
+"d).\n"
+"                                If VAL is `none', do not indent; if VAL is\n"
+"                                `asis', preserve existing indentation.\n"
+"      --split-size=NUM        split Info files at size NUM (default %d).\n"
+msgstr ""
+"Opciones para Info y texto plano:\n"
+"      --disable-encoding      no generar acentos y caracteres especiales en "
+"el\n"
+"                                documento de salida, ignorar la primitiva\n"
+"                                `@documentencoding' si está presente.\n"
+"      --enable-encoding       contradecir `--disable-encoding' (por "
+"defecto).\n"
+"      --fill-column=NÚMERO    no generar líneas que contengan un número de\n"
+"                                caracteres mayor que NÚMERO (por defecto %"
+"d).\n"
+"      --footnote-style=ESTILO generar notas a pie de página de acuerdo a "
+"ESTILO:\n"
+"                                `separate' para emplazarlas en un nodo "
+"propio;\n"
+"                                `end' para emplazarlas al final de cada "
+"nodo\n"
+"                                en el que son definidas (este es el estilo "
+"por\n"
+"                                defecto).\n"
+"      --paragraph-indent=NÚMERO\n"
+"                              proveer a párrafos con un márgen dado por el\n"
+"                                número de espacios NÚMERO (por defecto %d). "
+"Si\n"
+"                                NÚMERO fuese `none' no se insertarán "
+"márgenes;\n"
+"                                si NÚMERO es `asis', se preservarán los "
+"márgenes\n"
+"                                tal cual son leídos desde el fichero.\n"
+"      --split-size=NÚMERO     generar un documento multi-página, en el que "
+"cada\n"
+"                                una es de un tamaño NÚMERO (por defecto %"
+"d).\n"
+
+#: makeinfo/makeinfo.c:409
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
+msgstr ""
+"Opciones para HTML:\n"
+"      --css-include=FICHERO   si el formato de salida es HTML, incluir "
+"FICHERO\n"
+"                                dentro de directivas <style>; leer "
+"descriptor de\n"
+"                                fichero estándar (stdin) si FICHERO es -.\n"
+"      --css-ref=URL           generar referencias a una hoja de estilo CSS.\n"
+"      --transliterate-file-names\n"
+"                              producir nombres de ficheros en formato "
+"ASCII.\n"
+
+#: makeinfo/makeinfo.c:418
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+"Opcion para XML y Docbook:\n"
+"      --output-indent=NÚMERO   dar un número de espacios de margen dado por\n"
+"                               NÚMERO a elementos XML (por defecto %d).  Si\n"
+"                               NÚMERO fuese 0, espacios en blanco que "
+"pudieran\n"
+"                               ser ignorados sin alterar el significado del\n"
+"                               documento en cuestión lo serían.\n"
+
+#: makeinfo/makeinfo.c:425
+msgid ""
+"Input file options:\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
+msgstr ""
+"Opciones para ficheros de entrada:\n"
+"      --commands-in-node-names  permitir comandos `@' en nombres de nodo.\n"
+"  -D VARIABLE                   definir la variable VARIABLE, tal y como si "
+"así\n"
+"                                  hubiera sido especificado en el propio\n"
+"                                  documento mediante el uso de `@set "
+"VARIABLE'.\n"
+"  -I DIRECTORIO                 añadir el directorio DIRECTORIO al final de "
+"la\n"
+"                                  lista de búsqueda para primitivas "
+"`@include'.\n"
+"  -P DIRECTORIO                 añadir el directorio DIRECTORIO al "
+"principio\n"
+"                                  de la lista de búsqueda para primitivas\n"
+"                                  `@include'.\n"
+"  -U VARIABLE                   definir como nula la variable VARIABLE, tal "
+"y\n"
+"                                  como si así hubiera sido especificado en "
+"el\n"
+"                                  propio documento mediante el uso de\n"
+"                                  `@clear VARIABLE'.\n"
+
+#: makeinfo/makeinfo.c:434
+msgid ""
+"Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
+"  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
+"  --ifinfo          process @ifinfo even if not generating Info.\n"
+"  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
+"  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
+"  --no-ifhtml       do not process @ifhtml and @html text.\n"
+"  --no-ifinfo       do not process @ifinfo text.\n"
+"  --no-ifplaintext  do not process @ifplaintext text.\n"
+"  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
+msgstr ""
+"Opciones para el proceso condicional de ficheros de entrada:\n"
+"  --ifdocbook       procesar primitivas `@ifdocbook' y `@docbook' incluso "
+"cuando\n"
+"                      el formato de salida no es Docbook.\n"
+"  --ifhtml          procesar primitivas `@ifhtml' y `@html' incluso cuando "
+"el\n"
+"                      formato de salida no es HTML.\n"
+"  --ifinfo          procesar primitivas `@ifinfo' incluso cuando el formato "
+"de\n"
+"                      salida no es Info.\n"
+"  --ifplaintext     procesar primitivas `@ifplaintext' incluso cuando el "
+"formato\n"
+"                      de salida no es texto plano.\n"
+"  --iftex           procesar primitivas `@iftex' y `@tex', conlleva\n"
+"                      `--no-split'.\n"
+"  --ifxml           procesar primitivas `@ifxml' y `@xml'.\n"
+"  --no-ifdocbook    no procesar primitivas `@ifdocbook' o `@docbook'.\n"
+"  --no-ifhtml       no procesar primitivas `@ifhtml' o `@html'.\n"
+"  --no-ifinfo       no procesar primitivas `@ifinfo'.\n"
+"  --no-ifplaintext  no procesar primitivas `@ifplaintext'.\n"
+"  --no-iftex        no procesar primitivas `@iftex' o `@tex'.\n"
+"  --no-ifxml        no procesar primitivas `@ifxml' o `@xml'.\n"
+"\n"
+"  También, para las opciones de tipo --no-ifFORMATO, procesar "
+"`@ifnotFORMATO'.\n"
+
+#: makeinfo/makeinfo.c:453
+msgid ""
+"  The defaults for the @if... conditionals depend on the output format:\n"
+"  if generating HTML, --ifhtml is on and the others are off;\n"
+"  if generating Info, --ifinfo is on and the others are off;\n"
+"  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
+msgstr ""
+"  Las acciones por defecto para primitivas condicionales del tipo `@if...'\n"
+"  dependen en gran medida del formato de salida seleccionado:\n"
+"  si este es HTML, --ifhtml estará activo, mientras el resto no;\n"
+"  si este es Info, --ifinfo estará activo, mientras el resto no;\n"
+"  si este es texto plano, --ifplaintext estará activo, mientras el resto "
+"no;\n"
+"  si este es XML, --ifxml estará activo, mientras el resto no;\n"
+
+#: makeinfo/makeinfo.c:461
+msgid ""
+"Examples:\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
+"menus\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
+msgstr ""
+"Ejemplos:\n"
+"\n"
+"  makeinfo foo.texi                      escribe el fichero cuyo nombre "
+"viene\n"
+"                                         dado por el contenido de la "
+"primitiva\n"
+"                                         `@setfilename' en el fichero de\n"
+"                                         entrada, en formato Info.\n"
+"\n"
+"  makeinfo --html foo.texi               escribe el fichero cuyo nombre "
+"viene\n"
+"                                         dado por el contenido de la "
+"primitiva\n"
+"                                         `@setfilename' en el fichero de\n"
+"                                         entrada, en formato html.\n"
+"\n"
+"  makeinfo --docbook foo.texi            escribe el fichero cuyo nombre "
+"viene\n"
+"                                         dado por el contenido de la "
+"primitiva\n"
+"                                         `@setfilename' en el fichero de\n"
+"                                         entrada, en formato docbook.\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi  escribe el fichero cuyo nombre "
+"viene\n"
+"                                         dado por el contenido de la "
+"primitiva\n"
+"                                         `@setfilename' en el fichero de\n"
+"                                         entrada, en formato HTML, sin menus "
+"o\n"
+"                                         información alguna sobre nodos o\n"
+"                                         líneas.\n"
+"\n"
+"  makeinfo --number-sections foo.texi    escribe el fichero cuyo nombre "
+"viene\n"
+"                                         dado por el contenido de la "
+"primitiva\n"
+"                                         `@setfilename' en el fichero de\n"
+"                                         entrada, en formato Info, "
+"numerando\n"
+"                                         secciones y capítulos.\n"
+"\n"
+"  makeinfo --no-split foo.texi           escribe el fichero cuyo nombre "
+"viene\n"
+"                                         dado por el contenido de la "
+"primitiva\n"
+"                                         `@setfilename' en el fichero de\n"
+"                                         entrada, en formato Info, todo en "
+"un\n"
+"                                         mismo fichero.\n"
+
+#: makeinfo/makeinfo.c:619
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr "%s: Ignorando valor desconocido de TEXINFO_OUTPUT_FORMAT (`%s').\n"
+
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
+#, c-format
+msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgstr "%s: argumento de %s debe ser numérico, así que `%s' no es válido.\n"
+
+#: makeinfo/makeinfo.c:680
+#, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "%s: no se pudo abrir fichero `%s' para la expansión de macros"
+
+#: makeinfo/makeinfo.c:685
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "%s: ignorando segundo argumento para la expansión del macro `%s'.\n"
+
+#: makeinfo/makeinfo.c:732
+#, c-format
+msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgstr ""
+"%s: `--paragraph-indent' toma un argumento numérico/`none'/`asis', y no `%"
+"s'.\n"
+
+#: makeinfo/makeinfo.c:750
+#, c-format
+msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgstr ""
+"%s: `--footnote-style' toma como argumentos `separate' o `end', no `%s'.\n"
+
+#: makeinfo/makeinfo.c:825
+#, c-format
+msgid "%s: missing file argument.\n"
+msgstr "%s: se necesita nombre de fichero que procesar.\n"
+
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr "Comentario multi-línea `%c%s' usado inapropiadamente"
+
+#: makeinfo/makeinfo.c:1019
+#, c-format
+msgid "Expected `%s'"
+msgstr "Se esperaba `%s'"
+
+#: makeinfo/makeinfo.c:1496
+#, c-format
+msgid "Can't create directory `%s': %s"
+msgstr "No se pudo crear el directorio `%s': %s"
+
+#: makeinfo/makeinfo.c:1542
+#, c-format
+msgid "No `%s' found in `%s'"
+msgstr "No se encontró `%s' en `%s'"
+
+#: makeinfo/makeinfo.c:1622
+#, c-format
+msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
+msgstr ""
+"%s: Ignorando expansión de macro a descriptor de salida estándar (stdout) ya "
+"que la salida Info va a ser escrita en el mismo.\n"
+
+#: makeinfo/makeinfo.c:1652
+#, c-format
+msgid "Making %s file `%s' from `%s'.\n"
+msgstr "Generando %s fichero `%s' a partir de `%s'.\n"
+
+#: makeinfo/makeinfo.c:1719
+#, c-format
+msgid ""
+"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: El fichero de expansión de macros `%s' será borrado debido a la cantidad "
+"de errores encontrados; use `--force' para preservar el mismo.\n"
+
+#: makeinfo/makeinfo.c:1774
+#, c-format
+msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: El fichero `%s' será borrado debido a la cantidad de errores "
+"encontrados; use `--force' para preservar el mismo.\n"
+
+#: makeinfo/makeinfo.c:2068
+#, c-format
+msgid "Unknown command `%s'"
+msgstr "Comando desconocido `%s'"
+
+#: makeinfo/makeinfo.c:2090
+#, c-format
+msgid "Use braces to give a command as an argument to @%s"
+msgstr "Use llaves para suplir un comando como argumento a @%s"
+
+#: makeinfo/makeinfo.c:2349
+#, c-format
+msgid "%c%s expected braces"
+msgstr "%c%s se esperaban llaves"
+
+#: makeinfo/makeinfo.c:2362
+msgid "Unmatched }"
+msgstr "`}' desemparejada"
+
+#: makeinfo/makeinfo.c:2410
+msgid "NO_NAME!"
+msgstr "NO SE ENCONTRO FUNCIÓN!"
+
+#: makeinfo/makeinfo.c:2431
+#, c-format
+msgid "%c%s missing close brace"
+msgstr "%c%s se esperaba leer `}'"
+
+#: makeinfo/makeinfo.c:3434
+#, c-format
+msgid "@image file `%s' (for HTML) not readable: %s"
+msgstr "La imagen `%s' no es válida (para su salida en formato HTML): %s"
+
+#: makeinfo/makeinfo.c:3440
+#, c-format
+msgid "No such file `%s'"
+msgstr "El fichero `%s' no existe"
+
+#: makeinfo/makeinfo.c:3576
+#, c-format
+msgid "@image file `%s' (for text) unreadable: %s"
+msgstr ""
+"La imagen `%s' no es válida (para su salida en formato texto plano): `%s'"
+
+#: makeinfo/makeinfo.c:3585
+msgid "@image missing filename argument"
+msgstr "la primitiva `@image' carece de referencia a fichero alguno"
+
+#: makeinfo/makeinfo.c:3803
+#, c-format
+msgid "undefined flag: %s"
+msgstr "etiqueta indefinida: %s"
+
+#: makeinfo/makeinfo.c:3804
+#, c-format
+msgid "{No value for `%s'}"
+msgstr "{No se ha especificado un valor para `%s'}"
+
+#: makeinfo/makeinfo.c:3856
+#, c-format
+msgid "%c%s requires a name"
+msgstr "la construcción `%c%s' requiere un nombre"
+
+#: makeinfo/makeinfo.c:3962
+#, c-format
+msgid "Reached eof before matching @end %s"
+msgstr ""
+"Se ha alcanzado el fin de fichero y no hay constancia de fin de bloque "
+"(`@end %s')"
+
+#: makeinfo/makeinfo.c:4211
+#, c-format
+msgid "`%.40s...' is too long for expansion; not expanded"
+msgstr "`%.40s...' es demasiado largo para su expansión; no será expandido"
+
+#: makeinfo/multi.c:116
+msgid "Missing } in @multitable template"
+msgstr "Se esperaba leer `}' en la plantilla `@multitable'"
+
+#: makeinfo/multi.c:260
+#, c-format
+msgid "ignoring stray text `%s' after @multitable"
+msgstr "ignorando texto incoherente `%s' después de `@multitable'"
+
+#: makeinfo/multi.c:400
+#, c-format
+msgid "Too many columns in multitable item (max %d)"
+msgstr "Demasiadas columnas para el elemento multi-tabla (max %d)"
+
+#: makeinfo/multi.c:563
+#, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[inesperado] no se pudo seleccionar la columna #%d en la multi-tabla"
+
+#: makeinfo/multi.c:592
+msgid "ignoring @tab outside of multitable"
+msgstr "ignorando `@tab' no influenciado por el entorno `multitable'"
+
+#: makeinfo/multi.c:640
+#, c-format
+msgid "** Multicolumn output from last row:\n"
+msgstr "** Salida multi-columna desde la última fila:\n"
+
+#: makeinfo/multi.c:643
+#, c-format
+msgid "* column #%d: output = %s\n"
+msgstr "* columna #%d: salida = %s\n"
+
+#: makeinfo/node.c:279
+#, c-format
+msgid "Node `%s' previously defined at line %d"
+msgstr "El nodo `%s' ha sido definido previamente en la línea %d"
+
+#: makeinfo/node.c:647
+#, c-format
+msgid "Formatting node %s...\n"
+msgstr "Formateando nodo %s...\n"
+
+#: makeinfo/node.c:714
+#, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "El nodo `%s' requiere un comando de sección, como por ejemplo `%c%s'"
+
+#: makeinfo/node.c:878
+#, c-format
+msgid "No node name specified for `%c%s' command"
+msgstr "No se ha especificado nombre de nodo alguno para el comando `%c%s'"
+
+#: makeinfo/node.c:919 makeinfo/node.c:1160
+#, c-format
+msgid "Anchor `%s' and node `%s' map to the same file name"
+msgstr "El enlace `%s' y el nodo `%s' apuntan al mismo fichero"
+
+#: makeinfo/node.c:922
+msgid "This @anchor command ignored; references to it will not work"
+msgstr ""
+"Este comando `@anchor' será ignorado; referencias a este no estarán "
+"disponibles"
+
+#: makeinfo/node.c:924 makeinfo/node.c:1163
+msgid "Rename this anchor or use the `--no-split' option"
+msgstr "Renombre este enlace o use la opción `--no-split'"
+
+#: makeinfo/node.c:954
+#, c-format
+msgid "Unexpected string at end of split-HTML file `%s'"
+msgstr "Texto inesperado al final del fichero multi-página HMTL `%s'"
+
+#: makeinfo/node.c:1157
+#, c-format
+msgid "Anchors `%s' and `%s' map to the same file name"
+msgstr "Los enlaces `%s' y `%s' apuntan al mismo fichero"
+
+#: makeinfo/node.c:1162
+msgid "@anchor command ignored; references to it will not work"
+msgstr ""
+"El comando `@anchor' será ignorado; referencias a este no estarán disponibles"
+
+#: makeinfo/node.c:1359
+#, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr ""
+"`%s' hace referencia a un nodo inexistente (`%s'), quizás debido a un "
+"seccionado incorrecto del documento"
+
+#: makeinfo/node.c:1459
+#, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"El próximo campo del nodo `%s' no apunta a lugar alguno, quizás debido a un "
+"seccionado incorrecto del documento"
+
+#: makeinfo/node.c:1462
+#, c-format
+msgid "This node (%s) has the bad Prev"
+msgstr "Este nodo (%s) contiene una referencia inválida en el campo `Prev'"
+
+#: makeinfo/node.c:1517
+#, c-format
+msgid "Prev field of node `%s' not pointed to"
+msgstr "El campo `Prev' del nodo `%s' no apunta a sitio alguno"
+
+#: makeinfo/node.c:1521
+#, c-format
+msgid "This node (%s) has the bad Next"
+msgstr "Este nodo (%s) contiene una referencia inválida en el campo `Next'"
+
+#: makeinfo/node.c:1533
+#, c-format
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr ""
+"`%s' no contiene referencia a `Up', quizás debido a un seccionado incorrecto "
+"del documento"
+
+#: makeinfo/node.c:1602
+#, c-format
+msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
+msgstr ""
+"El nodo `%s' carece de elemento de menú alguno para `%s' aunque consta como "
+"destino para `Up'"
+
+#: makeinfo/node.c:1634
+#, c-format
+msgid "unreferenced node `%s'"
+msgstr "Nodo `%s' no referenciado"
+
+#: makeinfo/node.c:1724
+#, c-format
+msgid "Removing %s\n"
+msgstr "Eliminando %s\n"
+
+#: makeinfo/node.c:1728
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "No se pudo eliminar `%s': %s"
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr "Apéndice %c"
+
+#: makeinfo/sectioning.c:467
+#, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Error interno (search_sectioning) `%s'!"
+
+#: makeinfo/sectioning.c:563
+#, c-format
+msgid "Internal error (search_sectioning) \"%s\"!"
+msgstr "Error interno (search_sectioning) \"%s\"!"
+
+#: makeinfo/sectioning.c:624
+#, c-format
+msgid "%c%s is obsolete; use %c%s instead"
+msgstr "`%c%s' es una construcción obsoleta; use `%c%s' en su lugar"
+
+#: makeinfo/sectioning.c:640
+#, c-format
+msgid "Node with %ctop as a section already exists"
+msgstr "Ya existe un nodo con %ctop como sección"
+
+#: makeinfo/sectioning.c:648
+#, c-format
+msgid "Here is the %ctop node"
+msgstr "El nodo %ctop está aquí"
+
+#: makeinfo/sectioning.c:664
+#, c-format
+msgid "%ctop used before %cnode, defaulting to %s"
+msgstr "`%ctop' ha sido usado antes de `%cnode', asumiré `%s'"
+
+#: makeinfo/xml.c:1669
+#, c-format
+msgid "@image file `%s' unreadable: %s"
+msgstr "El fichero de imagen `%s' no es accesible: %s"
+
+#: makeinfo/xml.c:2014
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+"`@headitem' como último elemento de `@multitable' causa que el documento "
+"Docbook resultante sea inválido"
+
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "de"
+
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "en"
+
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "El primer argumento para un enlace siempre debería estar presente"
+
+#: makeinfo/xref.c:252
+#, c-format
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr "Nombre de fichero no especificado para el enlace HTML `%s'"
+
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr "Se alcanzó el fin de fichero mientras se esperaba ver `.' or `,'"
+
+#: makeinfo/xref.c:390
+#, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "`@%s' debe ser precedido por `.' o `,', no por `%c'"
+
+#: makeinfo/xref.c:392
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "Para generar enlaces entre paréntesis utilize `@pxref'"
+
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "El primer argumento de `@inforef' siempre debería estar presente"
+
+#: util/texindex.c:223
+msgid "display this help and exit"
+msgstr "mostrar este texto de ayuda"
+
+#: util/texindex.c:225
+msgid "send output to FILE"
+msgstr "enviar la salida al fichero FICHERO"
+
+#: util/texindex.c:227
+msgid "display version information and exit"
+msgstr "mostrar información sobre la versión de esta aplicación informática"
+
+#: util/texindex.c:237
+#, c-format
+msgid "Usage: %s [OPTION]... FILE...\n"
+msgstr "Uso: %s [OPCIÓN]... FICHERO...\n"
+
+#: util/texindex.c:238
+#, c-format
+msgid "Generate a sorted index for each TeX output FILE.\n"
+msgstr "Genera un índice ordenado para cada fichero TeX de salida FICHERO.\n"
+
+#: util/texindex.c:241
+#, c-format
+msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
+msgstr ""
+"FICHERO es generalmente especificado como `foo.%c%c' para un documento "
+"llamado `foo.texi'.\n"
+
+#: util/texindex.c:243
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Opciones:\n"
+
+#: util/texindex.c:743
+#, c-format
+msgid "failure reopening %s"
+msgstr "error al re-abrir %s"
+
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: no es un fichero índice de Info"
+
+#: util/texindex.c:993
+#, c-format
+msgid "No page number in %s"
+msgstr "No hay constancia de número de página en %s"
+
+#: util/texindex.c:1066
+#, c-format
+msgid "entry %s follows an entry with a secondary name"
+msgstr "la entrada %s sigue un elemento con nombre secundario"
diff --git a/Build/source/utils/texinfo/po/fr.gmo b/Build/source/utils/texinfo/po/fr.gmo
index daa9765f606..1b9f495dd45 100644
--- a/Build/source/utils/texinfo/po/fr.gmo
+++ b/Build/source/utils/texinfo/po/fr.gmo
diff --git a/Build/source/utils/texinfo/po/fr.po b/Build/source/utils/texinfo/po/fr.po
index 59e25de8c9c..629d75b7bfd 100644
--- a/Build/source/utils/texinfo/po/fr.po
+++ b/Build/source/utils/texinfo/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.7.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
 "PO-Revision-Date: 2004-12-06 08:00-05:00\n"
 "Last-Translator: Laurent Bourbeau <bourbeau@progiciels-bpi.ca>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -20,132 +20,198 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: l'option « %s » est ambiguë\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: l'option « --%s » ne permet pas un argument\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: l'option « %c%s » ne permet pas un argument\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: l'option « %s » exige un argument\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: option non reconnue « --%s »\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: option non reconnue « %c%s »\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: option illégale -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: option invalide -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: l'option exige un argument -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: l'option « -W %s » est ambiguë\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: l'option « -W %s » ne permet pas un argument\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, fuzzy, c-format
+msgid "memory exhausted"
+msgstr "mémoire virtuelle épuisée"
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "Avancer d'un caractère"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "Reculer d'un caractère"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "Se déplacer au début de cette ligne"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "Se déplacer à la fin de cette ligne"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "Avancer d'un mot"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "Reculer d'un mot"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Éliminer le caractère sous le curseur"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "Éliminer le caractère précédent le curseur"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Annuler ou opération de quitter"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Accepter cette ligne (ou en forcer la complétion)"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Insérer le prochain caractère textuellement"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Insérer ce caractère"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Insérer un caractère TAB (tabulation)"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Transposer les caractères en position du point courant"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Recoller le contenu du dernier effacement"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "L'anneau des effacements temporaires est vide"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Recoller un effacement antérieur"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "Effacer du point courant jusqu'à la fin de la ligne"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "Effacer du point courant jusqu'au début de la ligne"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "Effacer le mot suivant le curseur"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "Effacer le mot précédent le curseur"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Aucune complétion"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Non complet"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "Énumérer les complétions possibles"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "Une seule complétion"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "Une complétion:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d complétions:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "Insérer la complétion"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "Construction des complétions..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "Dérouler la fenêtre des complétions"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "Les notes en bas de page ne peuvent pas être affichées"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr ""
 "Montrer les notes en bas de page associées à ce noeud dans une autre fenêtre"
@@ -155,77 +221,77 @@ msgstr ""
 msgid "---------- Footnotes ----------"
 msgstr "----- Notes de bas de page ----"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "Rechercher une chaîne dans l'index pour ce fichier"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "Recherche des entrées d'index..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "Aucun indice retrouvé."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Entrée d'index: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Aller à prochaine référence d'index à partir de la dernière commande « "
 "\\[index-search] » "
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "Aucune autre chaîne de fouille d'index."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Aucune entrée d'index."
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "Aucune entrée %sindex contenant « %s »."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "plus "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "NE PEUT PAS VOIR CECI"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "« %s » repéré dans %s.  (« \\[next-index-match] » cherchera le prochain.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "Fouille des indices de « %s »..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "Aucun fichier info disponible n'a « %s » dans leurs indices."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Aplatir tous les indices de fichier Info connus pour une chaîne et "
 "construire un menu"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Index à-propos: "
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, c-format
 msgid ""
 "\n"
@@ -234,122 +300,99 @@ msgstr ""
 "\n"
 "* Menu: Noeuds dont les indices contiennent \"%s\":\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Utiliser --help pour plus d'informations.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
 #, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"AUCUNE garantie n'est donnée.  Vous pouvez redistribuer des copies\n"
-"de ce logiciel selon les termes de la licence GNU General Public License.\n"
-"Pour plus d'informations, consultez le fichier COPYING.\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "aucune entrée d'index retrouvée pour « %s »\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-"  -b, --speech-friendly        Être compatible au synthétiseur de voix.\n"
-
-#: info/info.c:597
+#: info/info.c:598
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+#, fuzzy
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+"  -b, --speech-friendly        Être compatible au synthétiseur de voix.\n"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Usage: %s [OPTION]... [ITEM-MENU...]\n"
-"\n"
-"Lire la documentation en format Info.\n"
-"\n"
-"Options:\n"
-"      --apropos=SUJET          Consulter SUJET dans tout indice de tout "
-"manuel.\n"
-"  -d, --directory=RÉP          Ajouter le RÉPertoire dans INFOPATH.\n"
-"      --dribble=FICHIER        Accumuler les clés-clavier de l'usager dans "
-"FICHIER.\n"
-"  -f, --file=FICHIER           Spécifier le fichier Info à visiter.\n"
-"  -h, --help                   Afficher ce menu d'aide et quitter.\n"
-"      --index-search=CHAÎNE    Aller au noeud pointé par CHAÎNE d'entrée "
-"d'index.\n"
-"  -n, --node=NOEUD             Spécifier les NOEUDS dans le fichier Info "
-"visité en premier.\n"
-"  -o, --output=FICHIER         Écrire dans FICHIER les noeuds sélectionnés.\n"
-"  -R, --raw-escapes            Ne pas enlever les séquences d'échappements "
-"ANSI des man pages.\n"
-"      --no-raw-escapes         Fournir les séquences d'échappements comme du "
-"texte.\n"
-"      --restore=FICHIER        Lire du FICHIER les clés-clavier initiales.\n"
-"  -O, --show-options, --usage  Aller au noeud des options de ligne-de-"
-"commande.\n"
-"%s    --subnodes               Écrire récursivement les items-menu.\n"
-"      --vi-keys                Utiliser les raccourcis-clavier comme vi et "
-"less.\n"
-"      --version                Afficher la version du logiciel et quitter.\n"
-"\n"
-"Le premier argument, n'étant pas une option et si présent, est l'entrée "
-"menu\n"
-"de départ; il est recherché dans tous les fichiers « dir » le long de "
-"INFOPATH.\n"
-"S'il est absent, Info fusionne tous les fichiers « dir » et montre le "
-"résultat.\n"
-"Tous les arguments subséquents sont traités comme des noms d'items de menu\n"
-"relatifs au noeud initial visité.\n"
-"\n"
-"Exemples:\n"
-"  info                       Montrer le menu dir de niveau-supérieur\n"
-"  info emacs                 Partir du noeud emacs dans dir niveau-"
-"supérieur\n"
-"  info emacs buffers         Partir du noeud buffers dans le niveau emacs\n"
-"  info --show-options emacs  Partir du noeud --show-options dans niveau "
-"emacs\n"
-"  info -f ./foo.info         Montrer le fichier ./foo.info, sans chercher "
-"dir\n"
-
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -361,424 +404,422 @@ msgstr ""
 "vos questions et autre discussion à help-texinfo@gnu.org.\n"
 "Site de Texinfo: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Ne peut pas trouver le noeud « %s »."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Ne peut pas trouver le noeud « (%s)%s »."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "Ne peut pas trouver une fenêtre permanente!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "Le point courant n'apparaît pas dans ce noeud de fenêtre!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "Ne peut pas éliminer la dernière fenêtre."
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "Aucun menu dans ce noeud."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "Aucune note de bas de page dans ce noeud."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "Aucune référence croisée dans ce noeud."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Aucun pointeur « %s » pour ce noeud."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Commande Info « %c> » inconnue; essayer « ? » pour de l'aide."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Le type de terminal « %s » n'est pas en mesure de rouler Info."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "Vous êtes déjà au point terminal de ce noeud."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "Vous êtes déjà au point initial de ce noeud."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "Une seule fenêtre."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "La fenêtre résultante sera trop petite."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Pas assez de place pour une fenêtre d'aide, fermer svp une fenêtre."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
-"Commandes de base en Info Windows\n"
-"---------------------------------\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "\\%-10[quit-help]  Quitter ce menu d'aide.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Quitter complètement le mode Info.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Faire appel au tutoriel Info.\n"
 
-# Est-ce vraiment un message à traduire?  NON.
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"Sélection d'autres modes:\n"
-"------------------------\n"
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-line]  Reculer de 1 ligne.\n"
+
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  Avancer de 1 ligne.\n"
+
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Reculer d'une page.\n"
+
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Avancer d'une page.\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  Aller au noeud « next » de ce noeud.\n"
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Aller au point initial de ce noeud.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  Aller au noeud « previous » de ce noeud.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Aller au noeud « up » à partir de ce noeud.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Aller au point terminal de ce noeud.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
-"\\%-10[menu-item]  Choisir un item menu à partir de son nom.\n"
-"              Choisir un item menu provoque la sélection d'un autre noeud.\n"
+"\\%-10[move-to-next-xref]  Sauter au prochain hyperlien à l'intérieur de ce "
+"noeud.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
+#, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
-"\\%-10[xref-item]  Suivre une référence croisée.  Lire le nom de la "
-"référence.\n"
+"\\%-10[select-reference-this-line]  Suivre l'hyperlien sous le curseur.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr ""
 "\\%-10[history-node]  Aller au dernier noeud observé dans cette fenêtre.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr ""
-"\\%-10[move-to-next-xref]  Sauter au prochain hyperlien à l'intérieur de ce "
-"noeud.\n"
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[prev-node]  Aller au noeud « previous » de ce noeud.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr ""
-"\\%-10[move-to-prev-xref]  Sauter au prochain hyperlien à l'intérieur de ce "
-"noeud.\n"
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[next-node]  Aller au noeud « next » de ce noeud.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr ""
-"\\%-10[select-reference-this-line]  Suivre l'hyperlien sous le curseur.\n"
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Aller au noeud « previous » de ce noeud.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
-"\\%-10[dir-node]  Aller au noeud « directory ».  Équivalent à « g (DIR) ».\n"
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Aller au noeud « next » de ce noeud.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr ""
-"\\%-10[top-node]  Aller au noeud supérieur Top.  Équivalent à « g Top ».\n"
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Aller au noeud « up » à partir de ce noeud.\n"
 
-# Est-ce vraiment un message à traduire?  NON.
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"Se déplacer à l'intérieur d'un noeud:\n"
-"------------------------------------\n"
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[end-of-node]  Aller au point terminal de ce noeud.\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[end-of-node]  Aller au point terminal de ce noeud.\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Aller au point initial de ce noeud.\n"
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr ""
+"  %-10s  Choisir d'abord ... le neuvième item dans le menu de noeuds.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Aller au point terminal de ce noeud.\n"
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr ""
+"\\%-10[last-menu-item]  Choisir le dernier item dans le menu de noeuds.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "\\%-10[next-line]  Avancer de 1 ligne.\n"
+#, fuzzy
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  Choisir l'item menu indiqué par le nom.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "\\%-10[prev-line]  Reculer de 1 ligne.\n"
+#, fuzzy
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr ""
+"\\%-10[xref-item]  Suivre une référence croisée.  Lire le nom de la "
+"référence.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Avancer d'une page.\n"
-
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Reculer d'une page.\n"
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  Aller au noeud indiqué par le nom.\n"
 
-# Est-ce vraiment un message à traduire?  NON.
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr ""
-"Autres commandes:\n"
-"----------------\n"
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  Fouiller vers l'avant pour une chaîne spécifiée,\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr ""
-"\\%-10[menu-digit]  Choisir d'abord ... le neuvième item dans le menu de "
-"noeuds.\n"
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[prev-node]  Aller au noeud « previous » de ce noeud.\n"
 
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
 msgstr ""
-"\\%-10[last-menu-item]  Choisir le dernier item dans le menu de noeuds.\n"
+"  %-10s  Fouiller pour une chaîne spécifiée dans les entrées d'index de ce "
+"fichier Info,\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
+#, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 "\\%-10[index-search]  Choisir la chaîne spécifiée dans les entrées d'index "
 "de ce Info\n"
 "              et sélectionner le noeud référencé par la première entrée "
 "trouvée.\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  Aller au noeud spécifié par le nom.\n"
-"              Vous pouvez aussi bien inclure un nom de fichier, comme dans "
-"(FILENAME)NODENAME.\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  Fouiller à reculons pour une chaîne spécifiée\n"
-"              et sélectionner le noeud dans lequel se trouve la prochaine "
-"occurrence.\n"
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "Annuler l'opération courante"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  Fouiller à reculons pour une chaîne spécifiée\n"
-"              et sélectionner le noeud dans lequel se trouve la prochaine "
-"occurrence.\n"
+"Commandes de base en Info Windows\n"
+"---------------------------------\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Quitter ce menu d'aide.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Quitter complètement le mode Info.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Faire appel au guide Info.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Aller au noeud « next » de ce noeud.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Aller au noeud « previous » de ce noeud.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Aller au noeud « up » à partir de ce noeud.\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Choisir l'item menu indiqué par le nom.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr ""
+"\\%-10[menu-item]  Choisir un item menu à partir de son nom.\n"
 "              Choisir un item menu provoque la sélection d'un autre noeud.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Suivre une référence croisée.  Lire le nom de la référence.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Aller au dernier noeud observé dans cette fenêtre.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Sauter au prochain hyperlien à l'intérieur de ce noeud.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Suivre l'hyperlien sous le curseur.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Aller au noeud « directory ».  Équivalent à « g (DIR) ».\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Aller au noeud supérieur Top.  Équivalent à « g Top ».\n"
 
-#: info/infodoc.c:118
+# Est-ce vraiment un message à traduire?  NON.
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Se déplacer à l'intérieur d'un noeud:\n"
+"------------------------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Avancer d'une page.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Reculer d'une page.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Aller au point initial de ce noeud.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Aller au point terminal de ce noeud.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Avancer de 1 ligne.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Reculer de 1 ligne.\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+# Est-ce vraiment un message à traduire?  NON.
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Autres commandes:\n"
+"----------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr ""
 "  %-10s  Choisir d'abord ... le neuvième item dans le menu de noeuds.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Choisir le dernier item dans le menu de noeuds.\n"
 
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-"  %-10s  Fouiller pour une chaîne spécifiée dans les entrées d'index de ce "
-"fichier Info,\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
+"\\%-10[index-search]  Choisir la chaîne spécifiée dans les entrées d'index "
+"de ce Info\n"
 "              et sélectionner le noeud référencé par la première entrée "
 "trouvée.\n"
 
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Aller au noeud indiqué par le nom.\n"
-
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
+"\\%-10[goto-node]  Aller au noeud spécifié par le nom.\n"
 "              Vous pouvez aussi bien inclure un nom de fichier, comme dans "
 "(FILENAME)NODENAME.\n"
 
-#: info/infodoc.c:133
-#, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Fouiller vers l'avant pour une chaîne spécifiée,\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
+#: info/infodoc.c:129
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
+"\\%-10[search]  Fouiller à reculons pour une chaîne spécifiée\n"
 "              et sélectionner le noeud dans lequel se trouve la prochaine "
 "occurrence.\n"
 
-#: info/infodoc.c:135
-#, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Fouiller à reculons pour une chaîne spécifiée\n"
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  Fouiller à reculons pour une chaîne spécifiée\n"
+"              et sélectionner le noeud dans lequel se trouve la prochaine "
+"occurrence.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "Le chemin de fouille courant est:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -786,7 +827,7 @@ msgstr ""
 "Commandes disponibles en Info Windows:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -794,7 +835,7 @@ msgstr ""
 "Commandes disponibles dans la zone « echo area »:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -803,7 +844,7 @@ msgstr ""
 "Les commandes suivantes peuvent être invoquées uniquement via %s:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -811,83 +852,74 @@ msgstr ""
 "Les commandes suivantes ne peuvent pas être invoquées:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-"--- Utiliser « \\[history-node] » ou « \\[kill-node] » pour sortir ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "Afficher le message d'aide"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "Visiter le noeud Info « (info)Help »"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "Imprimer la documentation relative à KEY"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Décrire la clé: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s est non défini."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s est non défini."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s est défini à %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Montrer quoi écrire afin d'exécuter une commande donnée"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Où se trouve la commande: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "« %s » ne se trouve pas sur une clé quelconque"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s peut être invoqué uniquement via %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s peut être invoqué via %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Il n'y a pas de fonction nommée « %s »"
 
-#: info/infokey.c:145
-#, c-format
+# Est-ce vraiment un message à traduire?  NON.
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"AUCUNE garantie n'est donnée.  Vous pouvez redistribuer des copies\n"
-"de ce logiciel selon les termes de la licence GNU General Public License.\n"
-"Pour plus d'informations, consultez le fichier COPYING.\n"
+"Sélection d'autres modes:\n"
+"------------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -1000,22 +1032,22 @@ msgstr ""
 "  --version             Afficher le version du logiciel et quitter.\n"
 "\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Fichier infokey invalide ignoré « %s » - trop petit"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Fichier infokey invalide ignoré « %s » - trop gros"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "Erreur de lecture du fichier infokey « %s » - lecture écourtée"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -1023,14 +1055,14 @@ msgstr ""
 "Fichier infokey invalide « %s » (nombre magique erroné) -- exécuter infokey "
 "pour le mettre à jour"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
-"Votre fichier infokey « %s » est désuet -- exécuter inforkey pour le mettre "
-"à jour"
+"Votre fichier infokey « %s » est désuet -- exécuter inforkey pour le mettre à "
+"jour"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -1038,7 +1070,7 @@ msgstr ""
 "Fichier infokey invalide « %s » (longueur de section erronée) -- exécuter "
 "infokey pour la mettre à jour"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -1046,49 +1078,49 @@ msgstr ""
 "Fichier infokey invalide « %s » (code de section erroné) -- exécuter infokey "
 "pour le mettre à jour"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 "Données erronées dans le fichier infokey -- quelques jumelages de clés "
 "ignorés"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "Données erronées dans le fichier infokey -- quelques initialisations de "
 "variables ignorées"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "Lire le nom d'une commande Info et la décrire"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Décrire la commande: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "Lire le nom d'une commande dans la zone « echo area » et l'exécuter"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Ne peut pas exécuter une commande « echo-area » en cet endroit."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, c-format
 msgid "Undefined command: %s"
 msgstr "commandes indéfinie: %s"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "Ajuster la hauteur de la fenêtre affichée"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Ajuster la hauteur de l'écran à (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1097,12 +1129,12 @@ msgstr ""
 "   Les fichiers sources aplatis pour faire ce fichier incluent:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Ne peut pas manipuler le fichier %s.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1114,7 +1146,7 @@ msgstr ""
 "  (Fichier)Noeud                    Lignes  Taille  Contenant Fichier(s)\n"
 "  --------------                    ------  ------  --------------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1123,25 +1155,30 @@ msgstr ""
 "Sélectionner en un de ce menu, ou utiliser « \\[history-node] » dans une "
 "autre fenêtre.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr ""
 "Faire une fenêtre contenant un menu de tous les noeuds actuellement visités"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Sélectionner un noeud qui a déjà été visité dans une fenêtre visible"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Sélectionner un noeud visité: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "La référence est disparue! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1151,111 +1188,82 @@ msgstr ""
 "Taper « \\[get-help-window] » pour obtenir de l'aide.\n"
 "Taper « \\[menu-item] » pour obtenir un item menu."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "Descendre à la ligne suivante"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "Monter à la ligne précédente"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "Aller à la fin de la ligne"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "Aller au début de la ligne"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "Noeud « Next »"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Suivre le noeud « Next »..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Sélectionner le premier item menu..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Sélectionner le noeud « Next »..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "Monter via « Up » %d fois, puis passer au noeud « Next »."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "Aucun autre noeud dans ce document."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "Aucun noeud « Prev » pour ce noeud."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Monter au noeud « Prev » dans cette fenêtre."
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "Aucun noeud « Prev » ou « Up » pour ce noeud dans ce document."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Monter au noeud « Up » dans cette fenêtre."
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Aller au dernier item menu du noeud « Prev »."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "Avancer ou descendre à travers la structure de noeuds"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "Reculer ou monter à travers la structure de noeuds"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "Défiler vers l'avant dans cette fenêtre"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 "Défiler vers l'avant dans cette fenêtre et en fixer la dimension par défaut"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr ""
 "Défiler vers l'avant dans cette fenêtre en demeurant à l'intérieur du noeud"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "Défiler vers l'avant dans cette fenêtre en demeurant à l'intérieur du noeud "
 "et en fixer la dimension par défaut"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "Défiler à reculons dans cette fenêtre"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
 "Défiler à reculons dans cette fenêtre et en fixer la dimension par défaut"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr ""
 "Défiler à reculons dans cette fenêtre en demeurant à l'intérieur de ce noeud"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1263,402 +1271,435 @@ msgstr ""
 "Défiler à reculons dans cette fenêtre en demeurant à l'intérieur du noeud et "
 "en fixer la dimension par défaut"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "Aller au point initial de ce noeud"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "Aller au point terminal de ce noeud"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "Défiler vers le bas par pas de N lignes"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "Défiler vers le haut par pas de N lignes"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "Défiler vers le bas par pas d'un demi écran"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "Défiler vers le haut par pas d'un demi écran"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "Sélectionner la fenêtre suivante"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "Sélectionner la fenêtre précédente"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "Diviser en deux la fenêtre courante"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "Éliminer la fenêtre courante"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "Ne peut pas éliminer une fenêtre permanente"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "Éliminer toutes les autres fenêtres"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "Défiler l'autre fenêtre"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "Défiler l'autre fenêtre à reculons"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "Agrandir (ou réduire) cette fenêtre"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "Répartir l'espace écran disponible parmi les fenêtres visibles"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Basculer l'état du remplissage de ligne dans la fenêtre courante"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "Sélectionner le noeud « Next »"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "Sélectionner le noeud « Prev »"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "Sélectionner le noeud « Up »"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "Sélectionner le dernier noeud dans ce fichier"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "Cette fenêtre a aucun noeud additionnel"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "Sélectionner le premier noeud dans ce fichier"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "Sélectionner le dernier item dans ce menu de noeuds"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "Sélectionner cet item menu"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Il n'y a pas %d items dans ce menu."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Item menu (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Item menu: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Suivre xref (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "Suivre xref: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "Lire un item menu et sélectionner son noeud"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr ""
 "Lire une note de bas de page ou une référence croisée et sélectionner son "
 "noeud"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "Aller au point initial de ce menu de noeuds"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "Visiter d'un seul coup autant d'items menu que possible"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "Lire un nom de noeud et sélectionner ce noeud"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "Aller au noeud: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Aucun menu dans le noeud « %s »."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Aucun item menu « %s » dans le noeud « %s »."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Incapable de trouver le noeud référencé par « %s » dans « %s »."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Lire une liste de menus en partant de « dir » et les suivre"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "Suivre les menus: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Trouver le noeud décrivant l'invocation au programme"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Trouver le noeud Invocation de [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "Lire une référence de page-manuel et la sélectionner"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "Obtenir la Page-manuel: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "Sélectionner le noeud « Top » dans ce fichier"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "Sélectionner le noeud « (dir) »"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Effacer le noeud (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Ne peut pas effacer le noeud « %s »"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "Ne peut pas effacer le dernier noeud"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "Choisir le noeud qui a été le plus récemment sélectionné"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "Effacer ce noeud"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "Lire le nom d'un fichier et le sélectionner"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Trouver le fichier: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Ne peut pas trouver « %s »."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Ne peut pas créer le fichier de sortie « %s »."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Terminé."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "Écriture du noeud « %s »..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "Acheminer les contenus de ce noeud à travers INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Ne peut ouvrir un tube de communication à « %s »."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "Impression du noeud « %s »..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "Effacer du point courant jusqu'au début de la ligne"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Fouille du sous-fichier « %s »..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr ""
 "Lire une chaîne et en faire la fouille en distinguant les majuscules et "
 "minuscules"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "Lire une chaîne et en faire la fouille"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "Lire une chaîne et en faire la fouille à reculons"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "%s%s pour la chaîne [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr " en distinguant les casses majuscules et minuscules "
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "Fouiller à reculons"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "Fouiller"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " en distinguant les casses majuscules et minuscules "
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "Fouille infructueuse."
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "Répéter la dernière fouille dans la même direction"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "Aucune chaîne de fouille antérieure"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "Répéter la dernière fouille dans la direction inverse"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "Fouiller interactivement pour une chaîne telle que vous la tapez"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "Fouille I-search à reculons: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "Fouille I-search à reculons: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "Fouille I-search: "
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "Fouille I-search: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "Échec "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "Aller à la référence croisée précédente"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "Aller à la prochaine référence croisée"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "Sélectionner la référence ou l'item menu apparaissant sur cette ligne"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "Annuler l'opération courante"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Quitter"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "Déplacer le curseur sur une ligne spécifique de la fenêtre"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "Redessiner l'affichage écran"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Quitter en utilisant Info"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr "Exécuter la commande liée à cette variante de touche en minuscule"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Commande inconnue (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "« %s » est invalide"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, c-format
 msgid "`%s' is invalid"
 msgstr "« %s » est invalide"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "Ajouter ce chiffre à l'argument numérique courant"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Enclencher (ou multiplier par 4) l'argument numérique courant"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "Utilisé internement par \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "lecture: Mémoire virtuelle épuisée!\n"
@@ -1678,8 +1719,8 @@ msgstr ""
 #: info/variables.c:45
 msgid "When \"On\", flash the screen instead of ringing the bell"
 msgstr ""
-"En position « On », un clignotement d'écran est utilisé plutôt qu'un bruit "
-"de cloche"
+"En position « On », un clignotement d'écran est utilisé plutôt qu'un bruit de "
+"cloche"
 
 #: info/variables.c:49
 msgid "When \"On\", errors cause the bell to ring"
@@ -1702,196 +1743,368 @@ msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr ""
 "Contrôler ce qui arrive lorsqu'un défilement est requis à la fin d'un noeud"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "Le nombre de lignes à défiler quand le curseur va hors de la fenêtre"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "En position « On », Info accepte et affiche les caractères ISO Latin"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr ""
+"Contrôler ce qui arrive lorsqu'un défilement est requis à la fin d'un noeud"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "Expliquer l'usage d'une variable"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Décrire la variable: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Fixer la valeur d'une variable Info"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Fixer la variable: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "Fixer %s à la valeur (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "Fixer %s à la valeur (%s): "
 
 # Est-ce vraiment un message à traduire?
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Étiquettes passées Date ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), lignes ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d lignes --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d lignes --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Sous-fichier: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: l'option « %s » est ambiguë\n"
+msgid "%s: warning: "
+msgstr "%s: avertissement: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'option « --%s » ne permet pas un argument\n"
+msgid " for %s"
+msgstr " pour %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: l'option « %c%s » ne permet pas un argument\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\\tUtiliser « %s --help » pour une liste complète des options.\n"
+
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Usage: %s [OPTION]... FICHIER-TEXINFO...\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Rapporter toute anomalie à bug-texinfo@gnu.org et poster\n"
+"vos questions et autre discussion à help-texinfo@gnu.org.\n"
+"Site de Texinfo: http://www.gnu.org/software/texinfo/"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'option « %s » exige un argument\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Ceci est le fichier .../info/dir, lequel contient le noeud \n"
+"le plus haut dans la hiérarchie Info, noeud appelé (dir)Top.\n"
+"La première fois que Info est invoqué, vous démarrez la recherche \n"
+"à partir de ce noeud.\n"
+"\n"
+"%s\tCeci est le haut de l'arborescence INFO\n"
+"\n"
+"  Ceci (le noeud Répertoire) fournit un menu des sujets majeurs.\n"
+"  Taper « q » pour quitter, « ? » pour lister toutes les commandes Info,\n"
+"  « d » pour revenir à cet endroit,\n"
+"  « h » fournit un guide d'initiation pour les nouveaux venus,\n"
+"  « mEmacs<Return> » démarre une consultation du manuel Emacs, etc.\n"
+"\n"
+"  En Emacs, vous pouvez cliquer avec le bouton-2 de la souris sur un item "
+"menu \n"
+"  ou sur une référence croisée pour le sélectionner.\n"
+"\n"
+"%s\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: option non reconnue « --%s »\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: ne peut pas lire (%s) et ne peut pas créer (%s)\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: option non reconnue « %c%s »\n"
+msgid "%s: empty file"
+msgstr "%s: fichier vide"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY non apparié avec END-INFO-DIR-ENTRY"
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY non apparié avec START-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: option illégale -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: a déjà un fichier répertoire: %s\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: option invalide -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Spécifier le fichier Info seulement une fois.\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: l'option exige un argument -- %c\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: l'option « -W %s » est ambiguë\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: l'option « -W %s » ne permet pas un argument\n"
+msgid "excess command line argument `%s'"
+msgstr "excédent d'argument de ligne de commande « %s »"
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ""
+"Aucun fichier d'entrée spécifié; utiliser --help pour plus d'informations."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr "Aucun fichier dir spécifié; utiliser --help pour plus d'informations."
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "aucune entrée répertoire Info dans « %s »"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "aucune entrée trouvée pour « %s »; rien n'a été éliminé"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "arguments à @%s ignorés"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "janvier"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "février"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "mars"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "avril"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "mai"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "juin"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "juillet"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "août"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "septembre"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "octobre"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "novembre"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "décembre"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "caractère %c improbable dans la macro @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "argument de la macro @sc tout en majuscules, alors aucun effet"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "« { » attendu, mais a vu « %c »"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "fin de fichier à l'intérieur du bloc verbe"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "« } » attendu, mais a vu « %c »"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1899,331 +2112,315 @@ msgstr ""
 "@strong{Note...} produit une table douteuse de références croisées dans "
 "Info; réécrire pour éviter cela"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s est périmé"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "La macro @sp exige un argument numérique positif, pas « %s »"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Mauvais argument à %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "« asis »"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "« none »"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Mauvais argument à @%s"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr "insérer"
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "Accolade « } » manquante dans @def arg"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Fonction"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Macro"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Forme Spéciale"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Variable"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Option de l'Usager"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Variable d'Instance"
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Mauvais argument à @%s"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Méthode"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "de"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "sur"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Accolade « } » manquante dans @def arg"
 
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "Doit être dans une insertion « @%s » afin d'utiliser « @%s »."
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr "« %s » omis avant le nom de fichier de sortie"
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr "« %s » omis avant l'écriture sur la sortie standard"
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr "Tampon de sortie n'est pas vide."
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Voir "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "« %c%s » nécessite un argument « {...} », non pas « %s » uniquement"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "Accolade fermante « } » manquante pour la note de bas de page « %s »"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "La note de bas de page est définie sans noeud parent"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Les notes de bas de page récursives ne sont pas permises"
 
 # Est-ce vraiement un message à traduire?
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "Notes de bas de page"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: ne peut ouvrir --css-file: %s"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s%d: --css-file terminé dans le commentaire"
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "Sans titre"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr "[inattendu] pas d'étiquette html à dépiler"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[inattendu] nom de noeud invalide: « %s »"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Nom d'index inconnu « %s »"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info ne peut traiter « : » dans l'entrée d'index « %s »"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "L'index « %s » existe toujours"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Nom d'index « %s » inconnu et/ou « %s » dans @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr "(ligne )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr "(ligne %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Nom d'index « %s » inconnu dans @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Entrée pour l'index « %s » à l'extérieure de tout noeud"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(à l'extérieur de tout noeud)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "Voir "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr "@item n'est pas permis dans l'agument @itemize"
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Type impossible dans la fonction insertion_type_pname"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "Débordement de la pile d'énumérations"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "débordement du lettrage, reprise à partir de %c"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s exige un argument: le formateur pour %citem"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr "%cenvironnements float ne peuvent être imbriqués"
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "« @end » s'attendait à « %s », mais a vu « %s »"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "« %cend %s » non apparié"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s exige une lettre ou un chiffre"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "fin de fichier à l'intérieur du bloc verbatim"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "@%s n'a aucun sens à l'extérieur de l'environnement « @float »"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu vu avant le premier @node, création du noeud « Top »"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "votre noeud @top devrait se retrouver peut-être dans @ifnottex plutôt que "
 "dans @ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu vu avant le premier noeud, création du noeud « Top »"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 "@%s n'a aucun sens à l'extérieur des environnements « @titlepage » et « "
 "@quotation »"
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "@%s n'a aucun sens à l'extérieur de l'environnement « @titlepage »"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "« %c%s » non apparié"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "« %c%s » a besoin de quelque chose après lui"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Mauvais argument « %s » à « @%s » utilisant « %s »"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "macro @%s inactive à l'intérieur d'un bloc « %s »"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "macro @itemx inactive à l'intérieur d'un bloc « %s »"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s est trouvé à l'extérieur d'un bloc d'insertion"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s n'est pas un code ISO 639 valide pour l'identification de langue"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "nom d'encodage non reconnu « %s »"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "désolé, l'encodage « %s » n'est pas supporté"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "caractère encodé invalide « %s »"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s s'attend à argument « i » ou « j », non pas « %c »"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s attend un argument d'un seul caractère « i » ou « j »"
@@ -2238,7 +2435,7 @@ msgstr "macro « %s » déjà définie précédemment"
 msgid "here is the previous definition of `%s'"
 msgstr "ici se trouve la définition précédente de « %s »"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
@@ -2249,46 +2446,50 @@ msgstr ""
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Macro « %s » appelée à la ligne %d avec trop d'arguments"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "macro %cend non trouvée"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "macro @quote-arg utile seulement pour des macros à un seul argument"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "macro @end %s non balancée avec @%s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Beaucoup trop d'erreurs!  Abandon.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: avertissement: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "%c égarée ou mal placée"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Utiliser « %s --help » pour plus d'informations.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Usage: %s [OPTION]... FICHIER-TEXINFO...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2296,17 +2497,17 @@ msgstr ""
 "Traduire une documentation Texinfo source en divers autres formats:\n"
 "Fichiers Info adéquats pour lire en ligne avec Emacs ou GNU Info autonome\n"
 
-#: makeinfo/makeinfo.c:350
-#, c-format
+#: makeinfo/makeinfo.c:354
+#, fuzzy, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
@@ -2323,14 +2524,14 @@ msgstr ""
 " -v, --verbose             En mode bavard, expliquer ce qui a été fait.\n"
 " --version                 Afficher la version du logiciel et quitter.\n"
 
-#: makeinfo/makeinfo.c:364
-#, no-wrap
+#: makeinfo/makeinfo.c:369
+#, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 "Options de sélection de format de sortie (par défaut produire Info):\n"
 " --docbook                 Écrire en format DocBook XML plutôt qu'en format Info.\n"
@@ -2338,20 +2539,24 @@ msgstr ""
 " --xml                     Produire en Texinfo XML plutôt qu'en format Info.\n"
 " --plaintext               Produire en formast plein texte plutôt qu'en format Info.\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
+#, fuzzy
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 "Options générales de sortie:\n"
 "  -E, --macro-expand FICHIER produire dans le FICHIER l'expension source de "
@@ -2368,18 +2573,21 @@ msgstr ""
 "  -o, --output=FICHIER      produire la sortie dans le FICHIER (répertoire "
 "si division en HTML),\n"
 
-#: makeinfo/makeinfo.c:386
-#, c-format
+#: makeinfo/makeinfo.c:391
+#, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2404,23 +2612,27 @@ msgstr ""
 " --split-size=NUM        séparer les fichiers Info selon la taille NUM (par "
 "défaut %d).\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
+#, fuzzy
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 "      --css-include=FICHIER       inclure le FICHIER dans le <style> de "
 "sortie HTML;\n"
 "                                  lire de stdin si le FICHIER est -.\n"
 
-#: makeinfo/makeinfo.c:409
-#, c-format
+#: makeinfo/makeinfo.c:418
+#, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 "      --output-indent=VAL       indenter les éléments XML à l'aide dee VAL "
@@ -2428,7 +2640,7 @@ msgstr ""
 "                                  Si VAL vaut 0, les espaces pouvant être "
 "ignorés sont éliminés.\n"
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2448,7 +2660,7 @@ msgstr ""
 " -U VAR                    Rendre indéfinie une variable, comme avec "
 "@clear.\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2488,7 +2700,7 @@ msgstr ""
 "  Aussi pour l'options --no-ifFORMAT, ne pas traiter le textuel "
 "@ifnotFORMAT.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2504,19 +2716,21 @@ msgstr ""
 "» ;\n"
 "en génération XML, --ifxml est « on » et les autres sont « off ».\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
+#, fuzzy
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "Examples:\n"
 "  makeinfo foo.texi                    Écrire en Info dans @setfilename de "
@@ -2537,28 +2751,28 @@ msgstr ""
 "  makeinfo --no-split foo.texi         Écrire un fichier Info même "
 "volumineux\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr "%s: valeur TEXINFO_OUTPUT_FORMAT non reconnue est ignoré « %s »\n"
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: l'argument %s doit être numérique, non pas « %s ».\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s: ne peut ouvrir la sortie d'expansion de macro « %s »"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s: ignorer la sortie de l'expansion de la seconde macro « %s »\n"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
@@ -2566,56 +2780,50 @@ msgstr ""
 "ou\n"
 "« asis », non pas « %s ».\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: l'argument de l'option --footnote-style doit être « separate » ou\n"
 "« end », non pas « %s ».\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: absence d'un argument fichier.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Commande multilignes %c%s utilisé de manière incorrecte"
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "« %s » attendue"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Ne peut créer le répertoire « %s »: %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Aucun « %s » trouvé dans « %s »"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Sauter l'expansion de macro qui irait sur stdout comme la sortie Info.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Fabrication du fichier %s « %s » à partir de « %s ».\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr ""
-"Ceci est le fichier Info %s, produit par Makeinfo version %s à partir %s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2623,258 +2831,220 @@ msgstr ""
 "%s: Enlèvement du fichier de sortie de macro « %s » à cause d'erreurs;\n"
 "utiliser l'option --force pour préserver.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: Enlèvement du fichier de sortie « %s » à cause d'erreurs;\n"
 "utiliser l'option --force pour préserver.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Commande inconnue « %s »."
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 "Utiliser des accolades pour donner une commande comme argument à « @%s »"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s accolades attendues"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "Accolade « } » non appariée"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "NOM_INCONNU!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s accolade fermante manquante"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "commande @image dans un fichier (pour HTML) « %s » illisible: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, c-format
 msgid "No such file `%s'"
 msgstr "Aucun fichier  « %s »"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "commande @image avec un fichier (texte) « %s » illisible: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "commande @image ayant un argument fichier absent"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr "fanion indéfini: %s"
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Aucune valeur pour « %s »}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s exige un nom"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Fin de fichier rencontré avant l'appariement de @end %s"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
-msgstr ""
-"«  %.40s...  » est trop long pour l'expansion; n'a pas fait d'expansion"
+msgstr "«  %.40s...  » est trop long pour l'expansion; n'a pas fait d'expansion"
 
 #: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr "Accolade « } » manquante dans un patron @multitable"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "abandon du texte orphelin « %s » après la commande @multitable"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Trop de colonnes dans un item de multitable (%d max)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr ""
 "[inattendu] ne peut pas sélectionner la colonne #%d dans une multitable."
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "inhibition d'une commande @tab à l'extérieur d'une multitable"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Sortie en multicolonnes à partir de la dernière rangée:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* colonne #%d: sortie = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Le noeud « %s » défini antérieurement à la ligne %d"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Écriture du noeud « %s »...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Le noeud « %s » exige une commande de subdivision (i.e. %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Aucun nom de noeud spécifié pour la commande « %c%s »"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Ancre « %s » et mode « %s » pointe vers le même nom de fichier"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 "Commande @anchor ignorée; les références vers celle-ci ne fonctionneront pas"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Renommer cette ancre ou utiliser l'option « --no-split »"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "Chaîne inattendue à la fin du fichier morcelé HTML « %s »"
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "Noeud « Next »:"
-
-# Est-ce vraiment un message à traduire?
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Noeud « Previous »:"
-
-# Est-ce vraiment un message à traduire?
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "Noeud « Up »:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Ancre « %s » et mode « %s » pointe vers le même nom de fichier"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 "Commande @anchor ignorée; les références vers celle-ci ne fonctionneront pas"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 "%s réfère à un noeud « %s » inexistant (à mois d'un sectionnement incorrect?)"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "Menu"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Référence"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
-"Le champ Next du noeud « %s » n'a pas de pointeur de retour en amont (à "
-"moins d'un sectionnement incorrect?)"
+"Le champ Next du noeud « %s » n'a pas de pointeur de retour en amont (à moins "
+"d'un sectionnement incorrect?)"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Ce noeud (%s) a un noeud « Prev » erroné"
 
-# Est-ce vraiment un message à traduire?
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "Noeud « Previous »"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Le champ Prev du noeud « %s » n'a pas de pointeur de retour en amont"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Ce noeud (%s) a un noeud « Next » erroné"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "« %s » n'a pas de champ Up (à moins d'un sectionnement incorrect?)"
 
-# Est-ce vraiment un message à traduire?
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "Noeud « Up »"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
-"Le noeud « %s » manque d'un item menu pour « %s » en dépit d'être son noeud "
-"« Up » cible"
-
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "Le noeud « %s » a été référencé %d fois"
+"Le noeud « %s » manque d'un item menu pour « %s » en dépit d'être son noeud « "
+"Up » cible"
 
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "noeud « %s » non référencé"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr "Retrait de %s\n"
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Ne peut enlever le fichier « %s »: %s"
@@ -2889,273 +3059,108 @@ msgstr "Annexe %c"
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "Erreur interne (search_sectioning) « %s »!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Erreur interne (search_sectioning) « %s »!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s est périmé; utiliser plutôt %c%s"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Le noeud avec %ctop en tant que section existe déjà"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Le noeud %ctop se trouve ici"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "noeud %ctop utilisé avant %cnode, %s implicitement"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Table des matières"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Sommaire"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "commande @image avec un fichier « %s » illisible: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 "@headitem comme dernier item de @multitable produit des documents Docbook "
 "invalides"
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: avertissement: "
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "de"
 
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " pour %s"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "sur"
 
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\\tUtiliser « %s --help » pour une liste complète des options.\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "Premier argument de références croisée peut ne pas être vide"
 
-#: util/install-info.c:434
+#: makeinfo/xref.c:252
 #, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Usage: %s [OPTION]... [INFO-FICHIER [DIR-FICHIER]]\n"
-"\n"
-"Installer ou éliminer des entrées dir à partir de INFO-FICHIER dans le "
-"fichier\n"
-"répertoire Info DIR-FICHIER.\n"
-"\n"
-"Options:\n"
-" --delete          Éliminer les entrées existantes pour INFO-FICHIER à "
-"partir\n"
-"                   de DIR-FICHIER; ne pas insérer aucunes nouvelles "
-"entrées.\n"
-" --dir-file=NOM    Spécifier le NOM du répertoire de fichiers Info.\n"
-"                   Ceci équivaut à utiliser l'argument DIR-FICHIER.\n"
-" --entry=TEXTE     Insérer TEXTE comme une entrée du répertoire Info.\n"
-"                   TEXTE doit avoir la forme d'une ligne d'item menu Info\n"
-"                   avec zéro ou plusieurs lignes en extra commençant avec\n"
-"                   un blanc.  Si plus d'une entrée est spécifiée, elles\n"
-"                   seront toutes ajoutées.  Si aucune n'est indiquée,\n"
-"                   elles seront déterminées à partir de l'information\n"
-"                   se trouvant dans le fichier Info lui-même.\n"
-" --help            Afficher ce menu d'aide et quitter.\n"
-" --info-file=FICHIER Spécifier le FICHIER Info à installer dans le "
-"répertoire\n"
-"                   de fichiers Info.  Ceci équivaut à utiliser l'argument\n"
-"                   INFO-FICHIER.\n"
-" --info-dir=RÉP    Identique à l'option --dir-file=RÉP/dir.\n"
-" --item=TEXTE      Identique à l'option --entry=TEXTE\n"
-"                   Une entrée de répertoire Info est en fait un item menu.\n"
-" --quiet           Supprimer les avertissements.\n"
-" --remove          Identique à l'option --delete.\n"
-" --section=SEC     Mettre cette entrée de fichier dans la section SEC du\n"
-"                   répertoire.  Si plus d'une section est spécifiée, toutes\n"
-"                   les entrées sont ajoutées dans chacune des sections.\n"
-"                   Si aucune section n'est spécifiée, elles seront "
-"déterminées\n"
-"                   à partir de l'information dans le fichier Info lui-même.\n"
-" --version         Afficher le nom et la version du logiciel et quitter.\n"
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
-"Ceci est le fichier .../info/dir, lequel contient le noeud \n"
-"le plus haut dans la hiérarchie Info, noeud appelé (dir)Top.\n"
-"La première fois que Info est invoqué, vous démarrez la recherche \n"
-"à partir de ce noeud.\n"
-"\n"
-"%s\tCeci est le haut de l'arborescence INFO\n"
-"\n"
-"  Ceci (le noeud Répertoire) fournit un menu des sujets majeurs.\n"
-"  Taper « q » pour quitter, « ? » pour lister toutes les commandes Info,\n"
-"  « d » pour revenir à cet endroit,\n"
-"  « h » fournit un guide d'initiation pour les nouveaux venus,\n"
-"  « mEmacs<Return> » démarre une consultation du manuel Emacs, etc.\n"
-"\n"
-"  En Emacs, vous pouvez cliquer avec le bouton-2 de la souris sur un item "
-"menu \n"
-"  ou sur une référence croisée pour le sélectionner.\n"
-"\n"
-"%s\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: ne peut pas lire (%s) et ne peut pas créer (%s)\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: fichier vide"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY non apparié avec END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY non apparié avec START-INFO-DIR-ENTRY"
-
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr "%s: a déjà un fichier répertoire: %s\n"
-
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Spécifier le fichier Info seulement une fois.\n"
 
-#: util/install-info.c:1284
-#, c-format
-msgid "excess command line argument `%s'"
-msgstr "excédent d'argument de ligne de commande « %s »"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
 msgstr ""
-"Aucun fichier d'entrée spécifié; utiliser --help pour plus d'informations."
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr "Aucun fichier dir spécifié; utiliser --help pour plus d'informations."
-
-#: util/install-info.c:1313
-#, c-format
-msgid "no info dir entry in `%s'"
-msgstr "aucune entrée répertoire Info dans « %s »"
+#: makeinfo/xref.c:390
+#, fuzzy, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "« . » ou « , » doit suivre une référence croisée, non pas %c"
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "item menu « %s » déjà existant, pour le fichier « %s »"
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "Aucune référence croisée dans ce noeud."
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "aucune entrée trouvée pour « %s »; rien n'a été éliminé"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "Premier argument de @inforef peut ne pas être vide"
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "afficher cet aide-mémoire et quitter"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "conserver les fichiers temporaires après le traitement"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "ne pas conserver les fichiers temporaires après le traitement (défaut)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "envoyer la sortie dans FICHIER"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "afficher la version du logiciel et quitter"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Usage: %s [OPTION]... FICHIER...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Générer un index trié pour chaque FICHIER de sortie TeX.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 "Habituellement FICHIER... est indiqué comme « foo.%c%c » pour un document « "
 "foo.texi ».\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3164,27 +3169,434 @@ msgstr ""
 "\n"
 "Options:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: pas un fichier index en format Texinfo"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "échec lors de la réouverture de %s"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: pas un fichier index en format Texinfo"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "Aucun numéro de page dans %s"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "l'entrée %s suit une entrée ayant un nom secondaire"
 
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10[search]  Fouiller à reculons pour une chaîne spécifiée\n"
+#~ "              et sélectionner le noeud dans lequel se trouve la prochaine "
+#~ "occurrence.\n"
+
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10[goto-node]  Aller au noeud spécifié par le nom.\n"
+#~ "              Vous pouvez aussi bien inclure un nom de fichier, comme "
+#~ "dans (FILENAME)NODENAME.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "\\%-10[next-node]  Aller au noeud « next » de ce noeud.\n"
+
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr ""
+#~ "\\%-10[dir-node]  Aller au noeud « directory ».  Équivalent à « g (DIR) ».\n"
+
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr ""
+#~ "\\%-10[top-node]  Aller au noeud supérieur Top.  Équivalent à « g Top ».\n"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-forward-page-only]  Scroll forward within this node.\n"
+#~ msgstr "\\%-10[scroll-forward]  Avancer de 1 ligne.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[scroll-backward-page-only]  Scroll backward within this node.\n"
+#~ msgstr "\\%-10[scroll-backward]  Reculer de 1 ligne.\n"
+
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10[search-backward]  Fouiller à reculons pour une chaîne spécifiée\n"
+#~ "              et sélectionner le noeud dans lequel se trouve la prochaine "
+#~ "occurrence.\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr ""
+#~ "--- Utiliser « \\[history-node] » ou « \\[kill-node] » pour sortir ---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr ""
+#~ "\\%-10[move-to-prev-xref]  Sauter au prochain hyperlien à l'intérieur de "
+#~ "ce noeud.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "Usage: %s [OPTION]... [ITEM-MENU...]\n"
+#~ "\n"
+#~ "Lire la documentation en format Info.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=SUJET          Consulter SUJET dans tout indice de tout "
+#~ "manuel.\n"
+#~ "  -d, --directory=RÉP          Ajouter le RÉPertoire dans INFOPATH.\n"
+#~ "      --dribble=FICHIER        Accumuler les clés-clavier de l'usager "
+#~ "dans FICHIER.\n"
+#~ "  -f, --file=FICHIER           Spécifier le fichier Info à visiter.\n"
+#~ "  -h, --help                   Afficher ce menu d'aide et quitter.\n"
+#~ "      --index-search=CHAÎNE    Aller au noeud pointé par CHAÎNE d'entrée "
+#~ "d'index.\n"
+#~ "  -n, --node=NOEUD             Spécifier les NOEUDS dans le fichier Info "
+#~ "visité en premier.\n"
+#~ "  -o, --output=FICHIER         Écrire dans FICHIER les noeuds "
+#~ "sélectionnés.\n"
+#~ "  -R, --raw-escapes            Ne pas enlever les séquences "
+#~ "d'échappements ANSI des man pages.\n"
+#~ "      --no-raw-escapes         Fournir les séquences d'échappements comme "
+#~ "du texte.\n"
+#~ "      --restore=FICHIER        Lire du FICHIER les clés-clavier "
+#~ "initiales.\n"
+#~ "  -O, --show-options, --usage  Aller au noeud des options de ligne-de-"
+#~ "commande.\n"
+#~ "%s    --subnodes               Écrire récursivement les items-menu.\n"
+#~ "      --vi-keys                Utiliser les raccourcis-clavier comme vi "
+#~ "et less.\n"
+#~ "      --version                Afficher la version du logiciel et "
+#~ "quitter.\n"
+#~ "\n"
+#~ "Le premier argument, n'étant pas une option et si présent, est l'entrée "
+#~ "menu\n"
+#~ "de départ; il est recherché dans tous les fichiers « dir » le long de "
+#~ "INFOPATH.\n"
+#~ "S'il est absent, Info fusionne tous les fichiers « dir » et montre le "
+#~ "résultat.\n"
+#~ "Tous les arguments subséquents sont traités comme des noms d'items de "
+#~ "menu\n"
+#~ "relatifs au noeud initial visité.\n"
+#~ "\n"
+#~ "Exemples:\n"
+#~ "  info                       Montrer le menu dir de niveau-supérieur\n"
+#~ "  info emacs                 Partir du noeud emacs dans dir niveau-"
+#~ "supérieur\n"
+#~ "  info emacs buffers         Partir du noeud buffers dans le niveau "
+#~ "emacs\n"
+#~ "  info --show-options emacs  Partir du noeud --show-options dans niveau "
+#~ "emacs\n"
+#~ "  info -f ./foo.info         Montrer le fichier ./foo.info, sans chercher "
+#~ "dir\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr ""
+#~ "              Choisir un item menu provoque la sélection d'un autre "
+#~ "noeud.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "              Vous pouvez aussi bien inclure un nom de fichier, comme "
+#~ "dans (FILENAME)NODENAME.\n"
+
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr "  %-10s  Fouiller à reculons pour une chaîne spécifiée\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "              et sélectionner le noeud dans lequel se trouve la prochaine "
+#~ "occurrence.\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "Suivre le noeud « Next »..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "Sélectionner le premier item menu..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "Sélectionner le noeud « Next »..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "Monter via « Up » %d fois, puis passer au noeud « Next »."
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "Monter au noeud « Prev » dans cette fenêtre."
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "Monter au noeud « Up » dans cette fenêtre."
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "Aller au dernier item menu du noeud « Prev »."
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "Fonction"
+
+#~ msgid "Macro"
+#~ msgstr "Macro"
+
+#~ msgid "Special Form"
+#~ msgstr "Forme Spéciale"
+
+#~ msgid "Variable"
+#~ msgstr "Variable"
+
+#~ msgid "User Option"
+#~ msgstr "Option de l'Usager"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Variable d'Instance"
+
+#~ msgid "Method"
+#~ msgstr "Méthode"
+
+#~ msgid "Untitled"
+#~ msgstr "Sans titre"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr ""
+#~ "Ceci est le fichier Info %s, produit par Makeinfo version %s à partir %"
+#~ "s.\n"
+
+#~ msgid "Next:"
+#~ msgstr "Noeud « Next »:"
+
+# Est-ce vraiment un message à traduire?
+#~ msgid "Previous:"
+#~ msgstr "Noeud « Previous »:"
+
+# Est-ce vraiment un message à traduire?
+#~ msgid "Up:"
+#~ msgstr "Noeud « Up »:"
+
+#~ msgid "Menu"
+#~ msgstr "Menu"
+
+#~ msgid "Cross"
+#~ msgstr "Référence"
+
+# Est-ce vraiment un message à traduire?
+#~ msgid "Prev"
+#~ msgstr "Noeud « Previous »"
+
+# Est-ce vraiment un message à traduire?
+#~ msgid "Up"
+#~ msgstr "Noeud « Up »"
+
+#~ msgid "see "
+#~ msgstr "voir "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "Usage: %s [OPTION]... [INFO-FICHIER [DIR-FICHIER]]\n"
+#~ "\n"
+#~ "Installer ou éliminer des entrées dir à partir de INFO-FICHIER dans le "
+#~ "fichier\n"
+#~ "répertoire Info DIR-FICHIER.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --delete          Éliminer les entrées existantes pour INFO-FICHIER à "
+#~ "partir\n"
+#~ "                   de DIR-FICHIER; ne pas insérer aucunes nouvelles "
+#~ "entrées.\n"
+#~ " --dir-file=NOM    Spécifier le NOM du répertoire de fichiers Info.\n"
+#~ "                   Ceci équivaut à utiliser l'argument DIR-FICHIER.\n"
+#~ " --entry=TEXTE     Insérer TEXTE comme une entrée du répertoire Info.\n"
+#~ "                   TEXTE doit avoir la forme d'une ligne d'item menu "
+#~ "Info\n"
+#~ "                   avec zéro ou plusieurs lignes en extra commençant "
+#~ "avec\n"
+#~ "                   un blanc.  Si plus d'une entrée est spécifiée, elles\n"
+#~ "                   seront toutes ajoutées.  Si aucune n'est indiquée,\n"
+#~ "                   elles seront déterminées à partir de l'information\n"
+#~ "                   se trouvant dans le fichier Info lui-même.\n"
+#~ " --help            Afficher ce menu d'aide et quitter.\n"
+#~ " --info-file=FICHIER Spécifier le FICHIER Info à installer dans le "
+#~ "répertoire\n"
+#~ "                   de fichiers Info.  Ceci équivaut à utiliser "
+#~ "l'argument\n"
+#~ "                   INFO-FICHIER.\n"
+#~ " --info-dir=RÉP    Identique à l'option --dir-file=RÉP/dir.\n"
+#~ " --item=TEXTE      Identique à l'option --entry=TEXTE\n"
+#~ "                   Une entrée de répertoire Info est en fait un item "
+#~ "menu.\n"
+#~ " --quiet           Supprimer les avertissements.\n"
+#~ " --remove          Identique à l'option --delete.\n"
+#~ " --section=SEC     Mettre cette entrée de fichier dans la section SEC du\n"
+#~ "                   répertoire.  Si plus d'une section est spécifiée, "
+#~ "toutes\n"
+#~ "                   les entrées sont ajoutées dans chacune des sections.\n"
+#~ "                   Si aucune section n'est spécifiée, elles seront "
+#~ "déterminées\n"
+#~ "                   à partir de l'information dans le fichier Info lui-"
+#~ "même.\n"
+#~ " --version         Afficher le nom et la version du logiciel et quitter.\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "item menu « %s » déjà existant, pour le fichier « %s »"
+
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr ""
+#~ "\\%-10[menu-digit]  Choisir d'abord ... le neuvième item dans le menu de "
+#~ "noeuds.\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "Le noeud « %s » a été référencé %d fois"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright © %s Free Software Foundation, Inc.\n"
+#~ "AUCUNE garantie n'est donnée.  Vous pouvez redistribuer des copies\n"
+#~ "de ce logiciel selon les termes de la licence GNU General Public "
+#~ "License.\n"
+#~ "Pour plus d'informations, consultez le fichier COPYING.\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "macro @quote-arg utile seulement pour des macros à un seul argument"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Table des matières"
+
+#~ msgid "Short Contents"
+#~ msgstr "Sommaire"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "conserver les fichiers temporaires après le traitement"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr ""
+#~ "ne pas conserver les fichiers temporaires après le traitement (défaut)"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr ""
+#~ "              et sélectionner le noeud référencé par la première entrée "
+#~ "trouvée.\n"
+
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "AUCUNE garantie n'est donnée.  Vous pouvez redistribuer des copies\n"
+#~ "de ce logiciel selon les termes de la licence GNU General Public "
+#~ "License.\n"
+#~ "Pour plus d'informations, consultez le fichier COPYING.\n"
+
 # Est-ce que c'est " " ou «   » comme caractères?
 #~ msgid "\"\" is invalid"
 #~ msgstr "\"\" est invalide"
@@ -3201,27 +3613,12 @@ msgstr "l'entrée %s suit une entrée ayant un nom secondaire"
 #~ msgid "File exists, but is not a directory"
 #~ msgstr "Le fichier existe mais n'est pas un répertoire"
 
-#~ msgid "First argument to cross-reference may not be empty"
-#~ msgstr "Premier argument de références croisée peut ne pas être vide"
-
-#~ msgid "see "
-#~ msgstr "voir "
-
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "« . » ou « , » doit suivre une référence croisée, non pas %c"
-
-#~ msgid "First argument to @inforef may not be empty"
-#~ msgstr "Premier argument de @inforef peut ne pas être vide"
-
 #~ msgid "Node:"
 #~ msgstr "Noeud:"
 
 #~ msgid "%s: TOC should be here, but it was not found"
 #~ msgstr "%s: Table des matières devrait être là, elle ne s'y trouve pas"
 
-#~ msgid "virtual memory exhausted"
-#~ msgstr "mémoire virtuelle épuisée"
-
 #~ msgid "No `%s.png' or `.jpg', and no extension supplied"
 #~ msgstr "Aucun « %s.png » ou « .jpg » et aucune extension fournie"
 
@@ -3231,12 +3628,6 @@ msgstr "l'entrée %s suit une entrée ayant un nom secondaire"
 #~ msgid "`%s' has no Up field"
 #~ msgstr "Le noeud %s a un champ « Up » manquant"
 
-#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-#~ msgstr "\\%-10[scroll-forward]  Avancer de 1 ligne.\n"
-
-#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-#~ msgstr "\\%-10[scroll-backward]  Reculer de 1 ligne.\n"
-
 #~ msgid ""
 #~ "Email bug reports to bug-texinfo@gnu.org,\n"
 #~ "general questions and discussion to help-texinfo@gnu.org."
diff --git a/Build/source/utils/texinfo/po/he.gmo b/Build/source/utils/texinfo/po/he.gmo
index 37652ea6973..e319810554b 100644
--- a/Build/source/utils/texinfo/po/he.gmo
+++ b/Build/source/utils/texinfo/po/he.gmo
diff --git a/Build/source/utils/texinfo/po/he.po b/Build/source/utils/texinfo/po/he.po
index 9f4f519bfac..6a4227e1f71 100644
--- a/Build/source/utils/texinfo/po/he.po
+++ b/Build/source/utils/texinfo/po/he.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.2\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
 "PO-Revision-Date: 2002-04-03 12:31+0300\n"
 "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n"
 "Language-Team: Hebrew <eliz@gnu.org>\n"
@@ -14,132 +14,198 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `%c%s' ïééôàî\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s úéðëú øåáò `%c%s' ääåæî-éúìá ïééôàî\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: é÷åç-éúìá ïééôàî -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s úéðëú øåáò éåâù ïééôàî -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: èðîåâøà áééçî ïééôàî -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `-W %s' ïééôàî\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `-W %s' ïééôàî\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, fuzzy, c-format
+msgid "memory exhausted"
+msgstr "éìàèøéåä ïåøëæä øîâð"
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "äîéã÷ ãçà åú ïîñ ææä"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "äøåçà ãçà åú ïîñ ææä"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "äøåùä úìéçúì ïîñ ææä"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "äøåùä óåñì ïîñ ææä"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "äîéã÷ úçà äìéî ïîñ ææä"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "äøåçà úçà äìéî ïîñ ææä"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "åéìò ïîñäù åúä ÷çî"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "ïîñä éðôìù åúä ÷çî"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "äðåøçà äìåòô ÷ñôä åà ìèá"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "(êøåö ùé íà äúåà íìùä) òåöéáì åæ äøåù ìá÷"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "éìåìéî ïôåàá àáä åúä óñåä"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "äæ åú óñåä"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "TAB óñåä"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "ïîñä ãéìù íéåú éðù ìù øãñ äðù"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "äðåøçà ä÷éçî ìù ïëåú øæçä"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "ä÷éø úå÷éçîä úøéâà úòáè"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "úîãå÷ ä÷éçî ïëåú øæçä"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "äøåùä óåñ ãò ÷çî"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "äøåù úìéçú ãò ÷çî"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "ïîñä éøçàù äìéîä ÷çî"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "ïîñä éðôìù äìéîä ÷çî"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "äîìùä óà ïéà"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "íìù àì"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "úåéøùôà úåîìùä âöä"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "äãéçé äîìùä"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "             :úçà äîìùä\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "             :úåîìùä %d\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "äîìùä óñåä"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "...úåîìùä úîéùø áéëøî"
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "úåîìùää ïåìç úà ìåìâ"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "íééìåù úåøòä âéöäì ïúéð àì"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr "åæ ä÷ñéôì íééìåù úåøòä âöä"
 
@@ -147,73 +213,73 @@ msgstr "åæ ä÷ñéôì íééìåù úåøòä âöä"
 msgid "---------- Footnotes ----------"
 msgstr "---------- Footnotes ----------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "äæ õáå÷ ìù ñ÷ãðéàá úæåøçî ùôç"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "...íéñ÷ãðéàä ìë úà ÷øåñ"
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr ".ñ÷ãðéà óà àöîð àì"
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Index entry: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr "äðåøçà `\\[index-search]' úãå÷ôî úæåøçî íàåúä óñåð ñ÷ãðéà èéøô ùôç"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr ".ñ÷ãðéàá ùåôéçì úîãå÷ úæåøçî ïéà"
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr ".ñ÷ãðéà éèéøô åàöîð àì"
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, fuzzy, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr " øúåé"
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "!úåàøéäì êéøö åðéàù èñ÷è"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, fuzzy, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr "(.ãåò àåöîì äñðé `\\[next-index-match]') .\"%s\" èéøô %s-á éúàöî"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, fuzzy, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "...\"%s\" ìù íéñ÷ãðéàä ìë úà ÷øåñ"
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, fuzzy, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr ".åìù ñ÷ãðéàá \"%s\" ìéëî ïàë íéð÷úåîäî Info õáå÷ óà"
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "úàöîù äîî èéøôú äðáå úæåøçî íäá ùôç ,íéòåãé Info éöá÷ ìù íéñ÷ãðéàä ìëá èèç"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Index apropos: "
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -222,113 +288,99 @@ msgstr ""
 "\n"
 "* Menu: (úåîéàúîä úåà÷ñôäå \"%s\" íéìéëîä ñ÷ãðéà éèéøô)\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr ".øúåé áø òãéî úâöäì --help äñð\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
-#, fuzzy, c-format
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"   Copyright (C) %s Free Software Foundation, Inc.\n"
-"åæ äðëåú õéôäì íëúåëæ .úåéøçà áúëá äååìî äðéà åæ úéðëåú\n"
-"         .GNU General Public License ïåéùøä éàðúì íàúäá\n"
-"           .COPYING õáå÷á åðééò ,åìà íéðéðòá èåøéô øúéì\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-"      .øåáéã æúðñîì åîéàúäì éãë êñîì äáéúë ïôåà äðù -b, --speech-friendly\n"
-
-#: info/info.c:597
-#, fuzzy, c-format
+#: info/info.c:598
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+#, fuzzy
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+"      .øåáéã æúðñîì åîéàúäì éãë êñîì äáéúë ïôåà äðù -b, --speech-friendly\n"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"            %s [íéðééôàî]... [...èéøôúî íéôéòñ] :ùåîéù ïôåà\n"
-"\n"
-"                        .Info èîøåôá íéëåøòä ãåòéú éöá÷á ïééò\n"
-"\n"
-"                                                                :íéðééôàî\n"
-"     .ùîúùîì êéøãî ìë ìù íéñ÷ãðéàä ìëá SUBJECT ùôç      --apropos=SUBJECT\n"
-"                 .INFOPATH-á äîéùøì DIR äé÷éú óñåä  -d, --directory=DIR\n"
-"          .FILENAME õáå÷á íéù÷îä úåöéçì ìë úà íåùø      --dribble=FILENAME\n"
-"               .FILENAME õáå÷á øùà ùîúùî êéøãî âöä  -f, --file=FILENAME\n"
-"                      .úéðëúäî àöå äæ äøæò êñî âöä  -h, --help\n"
-".äéìà ìéáåî ñ÷ãðéàäù ä÷ñéô âöäå ñ÷ãðéàá úæåøçî ùôç      --index-"
-"search=STRING\n"
-"          .ïåùàø Info õáå÷ êåúî NODENAME ä÷ñéô âöä  -n, --node=NODENAME\n"
-"           .FILENAME õáå÷ êåúì åøçáðù úåà÷ñéô áåúë  -o, --output=FILENAME\n"
-"              .man éôãî ANSI ìù äø÷áä éååú ÷ìñú ìà  -R, --raw-escapes\n"
-"                 .FILENAME õáå÷î íéù÷î úåöéçì øæçù      --restore=FILENAME\n"
-"         .äãå÷ôä úøåù ìù íéðééôàî úèøôîä ä÷ñéô âöä  -O, --show-options, --"
-"usage\n"
-"%s   .èìôì ïìåë áåúëå éáéñøå÷ø øãñá úåà÷ñéô ïéá øåáò      --subnodes\n"
-"            .Less åà vi-ì äîåãá úåãå÷ôì íéù÷î øåù÷      --vi-keys\n"
-"                    .àöå úéðëåúä úñøéâ ìò òãéî âöä      --version\n"
-"\n"
-";ìéçúäì ùé åðîîù èéøôúî óéòñ ïééöî ,íéé÷ àåä íà ,ïééôàî åðéàù ïåùàø èðîåâøà\n"
-"                  .INFOPATH úîéùø êøåàì `dir' éöá÷ ìëá äæ óéòñ ùôçú úéðëåúä\n"
-"     .`dir' éöá÷ ìëî áëøåîä èéøôú âéöú info ,ïééôàî åðéàù èðîåâøà óà ïéà íà\n"
-"                èéøôúäî ìçä ,èéøôú éôéòñ úåîùë åùøåôé ïåùàøì øáòî íéèðîåâøà\n"
-"                                                     .äâöåäù äðåùàøä ä÷ñéôá\n"
-"\n"
-"                                                                   :úåàîâåã\n"
-"                          dir õáå÷î áà-èéøôú âöä  info\n"
-"       emacs èéøô òéáöî äéìà ä÷ñéôì êì áà-èéøôúî  info emacs\n"
-"buffers èéøôì êùîä íùîå emacs óéòñì êì áà-èéøôúî  info emacs buffers\n"
-"   emacs ìù äãå÷ôä úøåù éðééôàî úøàúîä ä÷ñéô âöä  info --show-options emacs\n"
-"    dir èéøôú êøã øåáòì éìáî ./foo.info õáå÷ âöä  info -f ./foo.info\n"
-"\n"
-"                           ,bug-texinfo@gnu.org-ì äì÷ú éçååéã çåìùì àð\n"
-"                   .help-texinfo@gnu.org-ì ïåéãì íéàùåðå úåéììë úåìàùå\n"
 
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -340,396 +392,402 @@ msgstr ""
 "               .help-texinfo@gnu.org-ì ïåéãì íéàùåðå úåéììë úåìàùå\n"
 "         .http://www.gnu.org/software/texinfo/ :Texinfo ìù úéáä óã"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr ".äàöîð àì `%s' ä÷ñéô"
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr ".äàöîð àì `%s' õáå÷á `%s' ä÷ñéô"
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "!ïåìç óà àöîð àì"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "!äæ ïåìçá úâöåîä ä÷ñéôá àöîð åðéà ïîñä"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr ".ãéçé ïåìç ÷åçîì ïúéð àì"
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr ".íéèéøôú ïéà åæ ä÷ñéôá"
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr ".íééìåù úåøòä ïéà åæ ä÷ñéôá"
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr ".íéøåùé÷ ïéà åæ ä÷ñéôá"
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr ".%sì äééðôä ïéà åæ ä÷ñéôá"
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr ".äøæò úìá÷ì `?' äñð ;Info-ì úøëåî äðéà `%c' äãå÷ô"
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ".Info õéøäì éãë åéã ììëåùî åðéà `%s' âåñî âö"
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr ".åæ ä÷ñéô ìù ïåøçàä ãåîòá øáë ä/úà"
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr ".åæ ä÷ñéô ìù ïåùàøä ãåîòá øáë ä/úà"
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr ".ãçà ïåìç ÷ø íéé÷"
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr ".éãî øúåé ïè÷ äéä ïåìçä"
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr ".åäùìë ïåìç ÷åçîì àð ;äøæò ïåìç âéöäì íå÷î ÷éôñî ïéà"
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
-"                     Info úåðåìçá úåéñéñá úåãå÷ô\n"
-"                     ***************************\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "\\%-10[quit-help]  äæ äøæò ïåìç øåâñ\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Info úéðëúî éøîâì àö\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Info ùîúùîì êéøãî âöä\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"                           :úåøçà úåà÷ñéôá äøéçá\n"
-"                           ---------------------\n"
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "  %-10s  äøåçà úçà äøåù ïîñ ææä\n"
+
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "  %-10s  äîéã÷ úçà äøåù ïîñ ææä\n"
+
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  äøåçà ãçà óã ìåìâ\n"
+
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  äîéã÷ ãçà óã ìåìâ\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  úéçëåð ä÷ñéô éøçà äàáä ä÷ñéôì øåáò\n"
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  úéçëåð ä÷ñéô úìéçúì ïîñ ææä\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  úéçëåð ä÷ñéô éðôìù ä÷ñéôì øåáò\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  úéçëåð ä÷ñéô ìù áà-ú÷ñéôì øåáò\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  úéçëåð ä÷ñéô óåñì ïîñ ææä\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
-msgstr ""
-"\\%-10[menu-item]  åîù é\"ôò èéøôúî óéòñ øçá\n"
-"            .úøçà ä÷ñéôì øáòîì úîøåâ èéøôúî äøéçá\n"
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr "\\%-10[move-to-next-xref]  úéçëåð ä÷ñéôá àáä øåùé÷ì ïîñ ææä\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
+#, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
-msgstr "\\%-10[xref-item]  øåùé÷ä íù àøå÷ ;øåùé÷ øçà áå÷ò\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr "\\%-10[select-reference-this-line]  åéìò àöîð ïîñäù øåùé÷ éøçà áå÷ò\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr "\\%-10[history-node]  äæ ïåìçá äâöåäù äðåøçàä ä÷ñéôì øåæç\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr "\\%-10[move-to-next-xref]  úéçëåð ä÷ñéôá àáä øåùé÷ì ïîñ ææä\n"
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[prev-node]  úéçëåð ä÷ñéô éðôìù ä÷ñéôì øåáò\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr "\\%-10[move-to-prev-xref]  úéçëåð ä÷ñéôá íãå÷ä øåùé÷ì ïîñ ææä\n"
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[next-node]  úéçëåð ä÷ñéô éøçà äàáä ä÷ñéôì øåáò\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr "\\%-10[select-reference-this-line]  åéìò àöîð ïîñäù øåùé÷ éøçà áå÷ò\n"
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  úéçëåð ä÷ñéô éðôìù ä÷ñéôì øåáò\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr "\\%-10[dir-node]  `\\[goto-node] (DIR)'-ì êøò-äååù ;DIR ä÷ñéôì øåáò\n"
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  úéçëåð ä÷ñéô éøçà äàáä ä÷ñéôì øåáò\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr "\\%-10[top-node]  `\\[goto-node] Top'-ì êøò-äååù ;Top ä÷ñéôì øåáò\n"
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  úéçëåð ä÷ñéô ìù áà-ú÷ñéôì øåáò\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"                           :ä÷ñéô êåúá ïîñ úòåðú\n"
-"                           ---------------------\n"
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[end-of-node]  úéçëåð ä÷ñéô óåñì ïîñ ææä\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[end-of-node]  úéçëåð ä÷ñéô óåñì ïîñ ææä\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  úéçëåð ä÷ñéô úìéçúì ïîñ ææä\n"
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "  %-10s  úéçëåðä ä÷ñéôä èéøôúá éòéùú ãò ïåùàø óéòñ øçá\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  úéçëåð ä÷ñéô óåñì ïîñ ææä\n"
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  úéçëåðä ä÷ñéôä èéøôúá ïåøçà óéòñ øçá\n"
 
 #: info/infodoc.c:72
 #, fuzzy
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "  %-10s  äîéã÷ úçà äøåù ïîñ ææä\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  åîù é\"ôò èéøôúî óéòñ øçá\n"
 
 #: info/infodoc.c:73
 #, fuzzy
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "  %-10s  äøåçà úçà äøåù ïîñ ææä\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "\\%-10[xref-item]  øåùé÷ä íù àøå÷ ;øåùé÷ øçà áå÷ò\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  äîéã÷ ãçà óã ìåìâ\n"
-
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  äøåçà ãçà óã ìåìâ\n"
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  äîù é\"ôò ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr ""
-"                                   :úåøçà úåãå÷ô\n"
-"                                   -------------\n"
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  äæ Info õáå÷á êìéàå ïàëî úæåøçî ùôç\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "\\%-10[menu-digit]  úéçëåðä ä÷ñéôä èéøôúá éòéùú ãò ïåùàø óéòñ øçá\n"
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[prev-node]  úéçëåð ä÷ñéô éðôìù ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "\\%-10[last-menu-item]  úéçëåðä ä÷ñéôä èéøôúá ïåøçà óéòñ øçá\n"
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "  %-10s  øåáòå äæ Info õáå÷ ìù íéñ÷ãðéàá úæåøçî ùôç\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
+#, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 "\\%-10[index-search]  øåáòå äæ Info õáå÷ ìù íéñ÷ãðéàá úæåøçî ùôç\n"
 "                 íàåú àöîðù ïåùàø ñ÷ãðéà èéøô äòéáöî äéìà ä÷ñéôì\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  äîù é\"ôò ä÷ñéôì øåáò\n"
-"              .(FILENAME)NODENAME-á åîë ä÷ñéôä íùî ÷ìçë õáå÷ íù ïééöì ïúéð\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  äæ Info õå÷á êìéàå ïàëî úæåøçî ùôç\n"
-"                    .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "úéçëåð äìåòô ìèá"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  äæ Info õå÷á äøåçàå ïàëî úæåøçî ùôç\n"
-"                              .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
+"                     Info úåðåìçá úåéñéñá úåãå÷ô\n"
+"                     ***************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  äæ äøæò ïåìç øåâñ\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Info úéðëúî éøîâì àö\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Info ùîúùîì êéøãî âöä\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  úéçëåð ä÷ñéô éøçà äàáä ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  úéçëåð ä÷ñéô éðôìù ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  úéçëåð ä÷ñéô ìù áà-ú÷ñéôì øåáò\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  åîù é\"ôò èéøôúî óéòñ øçá\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
-msgstr "              .úøçà ä÷ñéôì øáòîì úîøåâ èéøôúî äøéçá\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"\\%-10[menu-item]  åîù é\"ôò èéøôúî óéòñ øçá\n"
+"            .úøçà ä÷ñéôì øáòîì úîøåâ èéøôúî äøéçá\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  øåùé÷ä íù àøå÷ ;øåùé÷ øçà áå÷ò\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  äæ ïåìçá äâöåäù äðåøçàä ä÷ñéôì øåæç\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  úéçëåð ä÷ñéôá àáä øåùé÷ì ïîñ ææä\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  åéìò àöîð ïîñäù øåùé÷ éøçà áå÷ò\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  `g (DIR)'-ì êøò-äååù ;DIR ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  `g Top'-ì êøò-äååù ;Top ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"                           :ä÷ñéô êåúá ïîñ úòåðú\n"
+"                           ---------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  äîéã÷ ãçà óã ìåìâ\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  äøåçà ãçà óã ìåìâ\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  úéçëåð ä÷ñéô úìéçúì ïîñ ææä\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s úéçëåð ä÷ñéô óåñì ïîñ ææä\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  äîéã÷ úçà äøåù ïîñ ææä\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  äøåçà úçà äøåù ïîñ ææä\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"                                   :úåøçà úåãå÷ô\n"
+"                                   -------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  úéçëåðä ä÷ñéôä èéøôúá éòéùú ãò ïåùàø óéòñ øçá\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  úéçëåðä ä÷ñéôä èéøôúá ïåøçà óéòñ øçá\n"
 
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr "  %-10s  øåáòå äæ Info õáå÷ ìù íéñ÷ãðéàá úæåøçî ùôç\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
-msgstr "              íàåú àöîðù ïåùàø ñ÷ãðéà èéøô äòéáöî äéìà ä÷ñéôì\n"
-
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  äîù é\"ôò ä÷ñéôì øåáò\n"
+msgstr ""
+"\\%-10[index-search]  øåáòå äæ Info õáå÷ ìù íéñ÷ãðéàá úæåøçî ùôç\n"
+"                 íàåú àöîðù ïåùàø ñ÷ãðéà èéøô äòéáöî äéìà ä÷ñéôì\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
+"\\%-10[goto-node]  äîù é\"ôò ä÷ñéôì øåáò\n"
 "              .(FILENAME)NODENAME-á åîë ä÷ñéôä íùî ÷ìçë õáå÷ íù ïééöì ïúéð\n"
 
-#: info/infodoc.c:133
-#, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  äæ Info õáå÷á êìéàå ïàëî úæåøçî ùôç\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
+#: info/infodoc.c:129
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
-msgstr "              .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
+msgstr ""
+"\\%-10[search]  äæ Info õå÷á êìéàå ïàëî úæåøçî ùôç\n"
+"                    .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
 
-#: info/infodoc.c:135
-#, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  äæ Info õáå÷á äøåçàå ïàëî úæåøçî ùôç\n"
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  äæ Info õå÷á êìéàå ïàëî úæåøçî ùôç\n"
+"                    .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "                               :àéä úéçëåð ùåôéç úîéùø\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -737,7 +795,7 @@ msgstr ""
 "                                 :Info úåðåìçá úåéøùôà úåãå÷ô\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -745,7 +803,7 @@ msgstr ""
 "                                :úåãå÷ôä úøåùá úåéøùôà úåãå÷ô\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -754,7 +812,7 @@ msgstr ""
 "                :ãáìá %s úåòöîàá ìéòôäì ïúéð úåàáä úåãå÷ôä úà\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -762,82 +820,73 @@ msgstr ""
 "                        :ììë äìòôäì úåðúéð ïðéà úåàáä úåãå÷ôä\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr "--- `\\[kill-node]' åà `\\[history-node]' ù÷ä äàéöéì ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "äøæò êñî âöä"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "Info úëøòîá ùåîéùì êéøãî âöä"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "íéåñî ù÷î øåáò ãåòéú âöä"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Describe key: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr ".øãâåî åðéà \"ESC %s\""
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr ".øãâåî åðéà \"%s\""
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s is defined to %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "úîéåñî äãå÷ô úìòôäì ãéì÷äì äî âöä"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Where is command: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "åäùìë ù÷îì äøåù÷ äðéà `%s' äãå÷ôä"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr ".`%s' úìòôäì äãéçéä êøãä àåä `%s'"
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr ".%s äãå÷ôä úà ìéòôé %s"
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr ".úîéé÷ äðéà `%s' íùá äéö÷ðåô"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"   Copyright (C) %s Free Software Foundation, Inc.\n"
-"åæ äðëåú õéôäì íëúåëæ .úåéøçà áúëá äååìî äðéà åæ úéðëåú\n"
-"         .GNU General Public License ïåéùøä éàðúì íàúäá\n"
-"           .COPYING õáå÷á åðééò ,åìà íéðéðòá èåøéô øúéì\n"
+"                           :úåøçà úåà÷ñéôá äøéçá\n"
+"                           ---------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -947,85 +996,85 @@ msgstr ""
 "                  .àöå úéðëúä úñøéâ ìò òãéî âöä   --version\n"
 "\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "ïé÷ú infokey õáå÷ úåéäì éãëá éãî ïè÷ -- `%s' õáå÷î íìòúî"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "ïé÷ú infokey õáå÷ úåéäì éãëá éãî ìåãâ -- `%s' õáå÷î íìòúî"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "àø÷ð õáå÷ä ìë àì - `%s' infokey õáå÷ úàéø÷á äì÷ú"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 "åðåëãò êøåöì infokey õøä -- (éåâù íñ÷ øôñî) ïé÷ú åðéà `%s' infokey õáå÷"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr "åðåëãò êøåöì infokey õøä -- ïëãåòî åðéà `%s' infokey õáå÷"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 "åðåëãò êøåöì infokey õøä -- (éåâù ÷ìç êøåà) ïé÷ú åðéà `%s' infokey õáå÷"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr "åðåëãò êøåöì infokey õøä -- (éåâù ÷ìç ãå÷) ïé÷ú åðéà `%s' infokey õáå÷"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "äðìòôú àì úåãçà íéù÷î úåøãâä -- infokey õáå÷á íééåâù íéðåúð"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr "ó÷åúá àì úåãçà íéðúùî úåøãâä -- infokey õáå÷á íééåâù íéðåúð"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "äúåà øàúå Info úãå÷ô ìù íù àø÷"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Describe command: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "äúåà òöáå úåãå÷ôä úøåùî äãå÷ô ìù íù àø÷"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr ".äæ áöîá `echo-area' úãå÷ô òöáì ïúéð àì"
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, fuzzy, c-format
 msgid "Undefined command: %s"
 msgstr "`%s' úøëåî-éúìá äàøåä"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "âöåîä ïåìçä äáåâ úà äðù"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Set screen height to (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1034,12 +1083,12 @@ msgstr ""
 "                  :íéììåë äæ õáå÷ì åãáåòù øå÷î éöá÷\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr ".%s õáå÷ ãáòì ïúéð àì\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1051,7 +1100,7 @@ msgstr ""
 "  (õáå÷)ä÷ñéô                    úåøåù 'ñî  ìãåâ        áà-õáå÷\n"
 "  -----------                    ---------  ----        -------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1059,24 +1108,29 @@ msgstr ""
 "                .äðåøçàì úø÷éá ïäá úåà÷ñéôä úîéùøî ïëåäù èéøôú ïìäì\n"
 "            .øçà ïåìçá `\\[history-node]' ìòôä åà èéøôúäî ä÷ñéô øçá\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "äðåøçàì úø÷éá ïäá úåà÷ñéôä ìë ìù èéøôú íò ïåìç âöä"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "úåðåìçä ãçàá íãå÷ úâöä äúåà ä÷ñéô øçá"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Select visited node: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "!íìòð (%s) øåùé÷ä ìù ãòéä"
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1085,343 +1139,326 @@ msgstr ""
 ".âöåîä èéøôúäî äøéçáì \\[menu-item] ,àøæò úìá÷ì \\[get-help-window] ù÷ä .%s "
 "àñøéâ Info úéðëúì íéàáä íéëåøá"
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "äàáä äøåùì ïîñ ææä"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "úîãå÷ä äøåùì ïîñ ææä"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "äøåùä óåñì ïîñ ææä"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "äææ ñîï ìúçéìú äùåøä"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "Next äãù"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "...äàáä ä÷ñéôì øáåò"
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "...èéøôúäî ïåùàø óéòñ øçåá"
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "...äàáä ä÷ñéôá øçåá"
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr ".äàáä ä÷ñéôä øçåá æàå ,úåà÷ñéôä õòá úå/äîø %d äìåò"
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr ".äæ êîñîá úåà÷ñéô øúåé ïéà"
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr ".åæ ä÷ñéôá `Prev' øåùé÷ ïéà"
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr ".äæ ïåìçá úîãå÷ ä÷ñéôì øáåò"
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr ".åæ ä÷ñéô øåáò `Up'-å `Prev' ììåë åðéà äæ êîñî"
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr ".äæ ïåìçá íàä ú÷ñôì øáåò"
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr ".úîãå÷ ä÷ñéô ìù èéøôúá ïåøçà óéòñì øáåò"
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr ".úåà÷ñéôä äðáîá øúåé ÷åîò åà äîéã÷ òåð"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr ".úåà÷ñéôä äðáîá äìòî éôìë åà äøåçà òåð"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr ".äæ ïåìçá äîéã÷ ìåìâ"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr "ïåìç ìãåâ ìù ç\"îøá êøò äðùå äæ ïåìçá äîéã÷ ìåìâ"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr "úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äîéã÷ ìåìâ"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "ïåìç ìãåâ ìù ç\"îøá êøò äðùå úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äîéã÷ ìåìâ"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "äæ ïåìçá äøåçà ìåìâ"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr "ïåìç ìãåâ ìù ç\"îøá êøò äðùå äæ ïåìçá äøåçà ìåìâ"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr "úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äøåçà ìåìâ"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
 "ïåìç ìãåâ ìù ç\"îøá êøò äðùå úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äøåçà ìåìâ"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "åæ ä÷ñéô úìéçúì ïîñ ææä"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "åæ ä÷ñéô óåñì ïîñ ææä"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "äèî éôìë úåøåù N ìåìâ"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "äìòî éôìë úåøåù N ìåìâ"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "äèî éôìë äâåöú éöç ìåìâ"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "äìòî éôìë äâåöú éöç ìåìâ"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "àáä ïåìçá øçá"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "íãå÷ä ïåìçá øçá"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "íééðùì éçëåðä ïåìçä ÷ìç"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "éçëåðä ïåìçä úà øñä"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "òåá÷ ïåìç øéñäì ïúéð àì"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "éçëåðä ãáìî úåðåìçä ìë úà øñä"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "àáä ïåìçá ìåìâ"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "àáä ïåìçá äøåçà ìåìâ"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "äæ ïåìç (ïè÷ä åà) ìãâä"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "íéâöåîä úåðåìçä ìë ïéá äâåöúä çèù ÷ìç"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "éçëåðä ïåìçá åùìâù úåøåù úâöä áöî äðù"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "äàáä ä÷ñéôá øåáò"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "úîãå÷ä ä÷ñéôì øåáò"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "ìòîù ä÷ñéôì øåáò"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "äæ êîñîá äðåøçàä ä÷ñéôì øåáò"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "äæ ïåìçá úåà÷ñéô øúåé ïéà"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "äæ êîñîá äðåùàøä ä÷ñéôì øåáò"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "åæä ä÷ñéôä èéøôúî ïåøçàä óéòñá øçá"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "èéøôúäî äæ óéòñá øçá"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr ".íéôéòñ %d ïéà äæ èéøôúá"
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menu item (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Menu item: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Follow xref (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "Follow xref: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "äîéàúîä ä÷ñéôì øåáòå èéøôúî óéòñ íù àø÷"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "äîéàúîä ä÷ñéôì øåáòå øåùé÷ åà äøòä ìù íù àø÷"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "åæ ä÷ñéôá èéøôúä úìéçúì ïîñ ææä"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "äæ èéøôúî íéôéòñ ìù øùôàä ìëë áø øôñî âöä"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "äéìà øåáòå ä÷ñéô ìù íù àø÷"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "Goto node: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr ".íéèéøôú `%s' ïéà ä÷ñéôá"
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr ".`%s' óéòñ ïéà `%s' ä÷ñéô ìù èéøôúá"
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr ".`%s' óéòñá äéìà øù÷î `%s'-á èéøôúä øùà ä÷ñéô éúàöî àì"
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "íäéøçà áå÷òå dir-î äìéçúîä èéøôú éôéòñ úøãéñ àø÷"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "Follow menus: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "úéðëúä õéøäì ãöéë úøàúîä ä÷ñéôä úà àöî"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Find Invocation node of [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "åúåà âöäå manpage-ì äééðôä àø÷"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "Get Manpage: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "äæ êîñîá (`Top') úéùàøä ä÷ñéôì øåáò"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "`(dir)' ä÷ñéôì øåáò"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Kill node (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "`%s' ä÷ñéô ÷ìñì úåøùôà ïéà"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "äãéçé ä÷ñéô ÷ìñì úåøùôà ïéà"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "äâöåäù äðåøçàä ä÷ñéôì øåæç"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "åæ ä÷ñéô ÷ìñ"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "åúåà âöäå õáå÷ ìù íù àø÷"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Find file: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr ".àöîð àì `%s' õáå÷"
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr ".`%s' èìô õáå÷ úøéöéá äì÷ú"
@@ -1429,170 +1466,191 @@ msgstr ".`%s' èìô õáå÷ úøéöéá äì÷ú"
 # Note that this needs to make sense when displayed to the _right_ of
 # the translated "Writing node foo..." and  "Printing node foo...",
 # no matter whether the following word is masculine or feminine!
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "á äçìöä"
 
 # No ellipsis because that would look awkward when the translation of
 # "Done." is appended.
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "`%s' ä÷ñéô èìô"
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "INFO_PRINT_COMMAND êøã åæ ä÷ñéô ïëåú ñôãä"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr ".`%s'-ì ÷éôà úçéúôá äì÷ú"
 
 # No ellipsis because that would look awkward when the translation of
 # "Done." is appended.
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "%s ä÷ñéô úñôãä"
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "äøåù úìéçú ãò ÷çî"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "... %s õáå÷-úú ÷øåñ"
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr "úåéùéøá úåáùçúä êåú äúåà ùôçå úæåøçî àø÷"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "äúåà ùôçå úæåøçî àø÷"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "äøåçà äúåà ùôçå úæåøçî àø÷"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "%s%sfor string [%s]: "
 
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr " case-sensitively "
+
 # The following 4 are untranslated because they are used with the
 # format string above in a prompt, and we don't translate prompts.
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "Search backward"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "Search"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " case-sensitively "
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr ".äàöîð àì úæåøçîä"
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "ïååéë åúåàá ïåøçà ùåôéç ìò øåæç"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "ïåøçà ùåôéçî úæåøçî ïéà"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "êåôä ïååéëá ïåøçà ùåôéç ìò øåæç"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "äúåà ä/ãéì÷î ä/úàù éãë êåú úæåøçî ùôç"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "I-search backward: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "I-search backward: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "I-search: "
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "I-search: "
 
 # Untranslated because is used with the I-search: prompt.
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "Failing "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "íãå÷ä øåùé÷ì ïîñ ææä"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "àáä øåùé÷ì ïîñ ææä"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "úéçëåðä äøåùá òéôåîä èéøôúî óéòñ åà øåùé÷ øçà áå÷ò"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "úéçëåð äìåòô ìèá"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "ìèåá"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "äæ ïåìçá úîéåñî äøåùì ïîñ ææä"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "äâåöú ùãç"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Info úéðëåúî àö"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr "äæ ù÷î ìù úåðè÷ úåéúåà úñøéâì äøåù÷ä äãå÷ô ìòôä"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr ".(%s) úøëåî-éúìá äãå÷ô"
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" äéåâù äãå÷ô"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, fuzzy, c-format
 msgid "`%s' is invalid"
 msgstr "\"%s\" äéåâù äãå÷ô"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "éçëåð éøîåð èðîåâøàì åæ äøôñ óñåä"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "4-á íéé÷ êøò ìåôë åà ,éøîåð èðîåâøà ìù äãì÷ä ìçúä"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "åæ äãå÷ôá ùîúùî \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "!éåðô ïåøëæ øúåé ïéà :readline\n"
@@ -1626,521 +1684,671 @@ msgstr "ùåôéç úæåøçîì íéàúäù ñ÷ãðéà éèéøô ìù ÷ìçä ùâãåé ,\"On\" áöîá íà"
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "ä÷ñéô óåñá äìéìâä úåâäðúä ìò èìåù"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "ïåìçä úåìåáâî àöåé ïîñäùë äâåöú ìåìâì úåøåù øôñî"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "úåéáéñ 8 éìòá ISO éåú âéöîå èìå÷ Info ,\"On\" áöîá íà"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "ä÷ñéô óåñá äìéìâä úåâäðúä ìò èìåù"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "íéðúùî ìù ãé÷ôú øàú"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Describe variable: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Info äðúùî ìù êøò äðù"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Set variable: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "Set %s to value (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "Set %s to value (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** úðëãåòî äðéà Tags úìáè ***-- "
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), lines ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d lines --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d lines --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Subfile: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n"
+msgid "%s: warning: "
+msgstr "%s: warning: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n"
+msgid " for %s"
+msgstr " for %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `%c%s' ïééôàî\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr ".íéðééôàî ìù äàìî äîéùø úìá÷ì `%s --help' äñð\n"
+
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "%s [íéðééôàî]... TEXINFO-õáå÷... :ùåîéùä ïôåà\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"                       ,bug-texinfo@gnu.org-ì äì÷ú éçååéã çåìùì àð\n"
+"               .help-texinfo@gnu.org-ì ïåéãì íéàùåðå úåéììë úåìàùå\n"
+"         .http://www.gnu.org/software/texinfo/ :Texinfo ìù úéáä óã"
+
+#: install-info/install-info.c:597
+#, fuzzy, c-format
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"* Menu:\n"
+
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n"
+msgid "%s: empty file"
+msgstr "÷éø åðéä %s õáå÷"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "íàåú END-INFO-DIR-ENTRY àìì START-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "íàåú START-INFO-DIR-ENTRY àìì END-INFO-DIR-ENTRY"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s úéðëú øåáò `%c%s' ääåæî-éúìá ïééôàî\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: é÷åç-éúìá ïééôàî -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr ".ãáìá úçà íòô %s-ì Info õáå÷ ïééöì ïúéð\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s úéðëú øåáò éåâù ïééôàî -- %c\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: èðîåâøà áééçî ïééôàî -- %c\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `-W %s' ïééôàî\n"
+msgid "excess command line argument `%s'"
+msgstr "`%s' øúåéî èðîåâøà"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ".äøæò úìá÷ì --help äñð ;èì÷ õáå÷ ïåéö ïéà"
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr ".äøæò úìá÷ì --help äñð ;dir õáå÷ ïåéö ïéà"
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2278
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `-W %s' ïééôàî\n"
+msgid "no info dir entry in `%s'"
+msgstr "`%s'-á éùàø èéøôú éôéòñ ïéà"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "÷çîð àì íåìë ;`%s' øåáò èéøôú éôéòñ åàöîð àì"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "%c%s-ì éåâù èðîåâøà"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "øàåðé"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "øàåøáô"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "õøî"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "ìéøôà"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "éàî"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "éðåé"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "éìåé"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "èñåâåà"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "øáîèôñ"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "øáåè÷åà"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "øáîáåð"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "øáîöã"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "@var êåúá %c øéáñ-éúìá åú"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "è÷ôà ìë @sc-ì ïéà ïëì ,úåìåãâ úåéúåàá åìåë @sc ìù èðîåâøà"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "%c àöîð êà ,`{' ì\"ö"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "verb êåúá õáå÷ óåñ"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "%c àöîð êà ,`}' ì\"ö"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "ïùåéî åðéä %c%s"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "`%s' àì ,éáåéç øôñî àåäù èðîåâøà ùøåã @sp"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "%c%s-ì éåâù èðîåâøà"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "àåäù åîë"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "ïéà"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "%c%s-ì éåâù èðîåâøà"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr ""
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "@def ìù èðîåâøàá `}' øñç"
-
-# It would be hilarious to translate those...
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Function"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Macro"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Special Form"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Variable"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "User Option"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Instance Variable"
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "%c%s-ì éåâù èðîåâøà"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Method"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "of"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "on"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "@def ìù èðîåâøàá `}' øñç"
 
 #: makeinfo/defun.c:711
 #, fuzzy, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "`%s' êåúá ÷øå êà ùåîéùá øúåî `%sx'"
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s úéðëúá %s-å %s øåáò äàéâù ìò çååéã getwd/getcwd\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr ""
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr ""
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr ""
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "See "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "`{...}' êåúá úåéäì áééçù ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%s'"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "`}'-á úîééúñî äðéà `%s' íééìåù úøòä"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "ä÷ñéôì õåçî íééìåù úøòä"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "íééìåù úåøòä êåúá íééìåù úåøòäá äëéîú ïéà"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "íééìåù úåøòä"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "úøúåë àìì"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, fuzzy, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "`%s' :éåâù (node) ä÷ñéô íù"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "`%s' ñ÷ãðéà èéøôá `:' ììâá ìùëéé Info"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "øãâåî øáë `%s' ñ÷ãðéà"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "øëåî-éúìá ñ÷ãðéà åðéä @synindex-á `%s' åà `%s'"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex-á `%s' øëåî-éúìá ñ÷ãðéà"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "ä÷ñéô ìëì õåçî øãâåî `%s' ñ÷ãðéà èéøô"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(ä÷ñéô ìëì õåçî)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "See "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr ""
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "insertion_type_pname-á éåâù type"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "@enumerate-á úéðñçî úùéìâ"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "%c-á ùãçî ìéçúî ,åìöåð úåéúåàä ìë"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s úàøåäá %citem øåáò áåöéò úèéù :èðîåâøà ùøãð"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr ""
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "`%s' àöîð íìåà ,`%s' ì\"ö `@end' éøçà"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "íàåú `%cend %s' øñç"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "äøôñ åà úåà ùøåã %s"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "verbatim êåúá õáå÷ óåñ"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "?@ifinfo íå÷îá @ifnottex-á úô÷åî úåéäì äúéä äëéøö @top ú÷ñéô éë ïëúééä"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @detailmenu"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "âåæ-ïá åì ïéàù `%c%s'"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "åéøçà àåáéù åäùî êéøö `%c%s'"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, fuzzy, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "`%s'-ì èðîåâøàë íéàúî åðéà `%s'-ù íåùî `%s'-á éúùîúùä"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "`%s' êåúá @itemx-ì úåòîùî ïéà"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "äñðëä ÷åìá ìëì õåçî %c%s àöîð"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "ISO 639 é\"ò íéøëåîä ïåùìä éðîéñî ãçà åðéà %s"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "`%s' øëåî-éúìá ãåãé÷ íù"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "êîúð åðéà `%s' ãåãé÷ ,íéøòèöî"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "`%s' éåâù ããå÷î åú"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "`j' åà `i' úåéäì áééç øùà ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%c'"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "èðîåâøàë `j' åà `i' ãéçé åú ìá÷î %c%s"
@@ -2155,7 +2363,7 @@ msgstr "íãï÷ øãâåä øáë `%s' åø÷àî"
 msgid "here is the previous definition of `%s'"
 msgstr "äðåùàøì øãâåä `%s' ïàë"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, fuzzy, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "øèîøô íù åà \\ íå÷îá ,åø÷àî úáçøäá \\ úåá÷òá `%s'"
@@ -2165,47 +2373,51 @@ msgstr "øèîøô íù åà \\ íå÷îá ,åø÷àî úáçøäá \\ úåá÷òá `%s'"
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "éãî íéáø íéèðîåâøà úììåë `%s' åø÷àîì %d äøåùá äúìéçúù äàéø÷"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "àöîð àì %cend macro"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "ãéçé èðîåâøà ìòá åø÷àî êåúá ÷ø éùåîéù @quote-arg"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s úà íàåú åðéà @%s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr ".íééãé éúîøä  !úàéâù éãî øúåé\n"
 
 # Not translated because Emacs recognizes warningsby this template.
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: warning: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "åîå÷îá åðéàù %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ".`%s --help' äñð øúé èåøôì\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "%s [íéðééôàî]... TEXINFO-õáå÷... :ùåîéùä ïôåà\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2213,17 +2425,17 @@ msgstr ""
 " ìãçî úøéøáë ,íéøçà íéðåù íéèîøåôì Texinfo øå÷î úôùá ãåòéú íâøú\n"
 ".GNU Info  úéðëú åà Emacs úøæòá äàéø÷ì íéîéàúîä Info éöá÷ øöééî \n"
 
-#: makeinfo/makeinfo.c:350
-#, c-format
+#: makeinfo/makeinfo.c:354
+#, fuzzy, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
@@ -2237,34 +2449,38 @@ msgstr ""
 "                    .úéðëúä úìåòô ìò èåøô âöä  -v, --verbose\n"
 "               .àöå äðëúä úñøéâ éáâì òãéî âöä      --version\n"
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 "                                                         :èìôä èîøåô úøéçá\n"
 "           .Info íå÷îá DocBook èîøåôá èìô ïëä      --docbook\n"
 "              .Info íå÷îá HTML èîøåôá èìô ïëä      --html\n"
 "               .Info íå÷îá XML èîøåôá èìô ïëä      --xml\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
+#, fuzzy
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 "                                                       :íééììë èìô éðééôàî\n"
 "       ,FILE õáå÷ì åø÷àî úáçøä øçàì øå÷î áåúë  -E, --macro-expand FILE\n"
@@ -2277,18 +2493,21 @@ msgstr ""
 "               .èìô õáå÷á úåà÷ñéôå íé÷øô øøôñ      --number-sections\n"
 "     .(HTML èìô íà äé÷éú) FILE õáå÷ì èìô áåúë  -o, --output=FILE\n"
 
-#: makeinfo/makeinfo.c:386
-#, c-format
+#: makeinfo/makeinfo.c:391
+#, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2308,24 +2527,27 @@ msgstr ""
 "      .øå÷îá äúéäù éôë äææä ìò øåîù ,`asis'\n"
 "     .(%d ç\"îøá) NUM ìãåâá íéöá÷-úúì Info ÷ìç      --split-size=NUM\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 #, fuzzy
 msgid ""
 "Input file options:\n"
@@ -2342,7 +2564,7 @@ msgstr ""
 "       .@include ìù ùåôéç úîéùø ùàøá DIR óñåä  -P DIR\n"
 "      .@clear úãå÷ôá åîë ,VAR äðúùî úøãâä ìèá  -U VAR\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
@@ -2372,7 +2594,7 @@ msgstr ""
 "                 .@ifplaintext-á èñëè ãáòú ìà       --no-ifplaintext\n"
 "                .@tex-å @iftex-á èñëè ãáòú ìà       --no-iftex\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -2386,20 +2608,21 @@ msgstr ""
 "        .íéìòôåî íðéà øúéä ìëå ìòôåî --ifinfo  ,èñëè åà Info àåä èìôä íà\n"
 "           .íéìòôåî íðéà øúéä ìëå ìòôåî --ifplaintext  ,èñëè àåä èìôä íà\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 #, fuzzy
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "                                                                 :úåàîâåã\n"
 "@setfilename é\"ò ïåúðä õáå÷ì Info èìô  makeinfo foo.texi\n"
@@ -2412,158 +2635,153 @@ msgstr ""
 "             úåà÷ñéô øåøôñ íò Info èìô  makeinfo --number-sections foo.texi\n"
 "   äéäéù ìëë ìåãâ ,ãéçé õáå÷á Info èìô  makeinfo --no-split foo.texi\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, fuzzy, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr ".õáå÷ íù øñç %s úéðëúì\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "`%s' éåôö äéä ïàë"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%s' àöîð àì `%s' õáå÷á"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr "%s: .íùì ïååëî èìôù íåùî åèîùåé éð÷ú èìô õåøòì åø÷àî úåáçøä\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ".%s èîøåôá `%s'-ì `%s' õáå÷ ãáòî\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "This is %s, produced by makeinfo version %s from %s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' åø÷àî úåáçøä õáå÷\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' èìô õáå÷\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "`%s' úøëåî-éúìá äàøåä"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "`{...}'-ì äôéö %c%s"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "âåæ-ïá åì ïéàù }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "NO_NAME!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s-ì øñç éðîé øâåñ"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "(HTML øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "`%s' àöîð àì `%s' õáå÷á"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "(èñëè øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "@image úàøåäá øñç õáå÷ íù"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{No value for `%s'}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "íù ùøåã %c%s"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "íàåú @end %s éðôì øîâð èì÷ õáå÷"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "áçøåé àì ;åáéçøäì éãëî êåøà `%.40s...'"
@@ -2572,162 +2790,129 @@ msgstr "áçøåé àì ;åáéçøäì éãëî êåøà `%.40s...'"
 msgid "Missing } in @multitable template"
 msgstr "} øñç @multitable ìù úéðáúá"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "@multiline éøçà `%s' øúåéî èñëèî éúîìòúä"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "(%d ãò øúåî) multitable ìù @item-á úåãåîò éãî øúåé"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, fuzzy, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "multitable-á %d 'ñî äãåîò úøéçáá äì÷ú"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "multitable-ì õåçî @tab-î éúîìòúä"
 
 # The following two look like debugging output, and aren't compiled.
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multicolumn output from last row:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* column #%d: output = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "`%s' ä÷ñéô úøãâä øáë %d äøåùá"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "...%s ä÷ñéô ãáòî úòë\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, fuzzy, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "`%s' ä÷ñéôá (%c%s ïåâë) ÷åñéô úàøåäá êøåö ùé"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "ä÷ñéô íù àìì `%c%s' äàøåä"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "õáå÷ íù åúåàì úåîâøåúî `%s' øåùé÷ úéåúå `%s' ä÷ñéô"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "åìòôé àì åæ úéåú ìà íéøåùé÷ ;òöåáú àì åæ @anchor úàøåä"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "`--no-split' ïééôàîá ùîúùä åà úéåúä íù äðù"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "`%s' ÷ìåçî HTML õáå÷ íåéñá äéåôö-éúìá úæåøçî"
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "Next:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Previous:"
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "Up:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "õáå÷ íù åúåàì úåîâøåúî `%s-å `%s' øåùé÷ úåéåú"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr "åìòôé àì åæ úéåú ìà íéøåùé÷ ;òöåáú àì @anchor úàøåä"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "èéøôú"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "øåùé÷"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, fuzzy, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "äøæç äòéáöî äðéà `%s' ä÷ñéô ìù Next äãùá ä÷ñéôä"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "éåâù Prev äãù úìòá àéä (%s) åæ ä÷ñéô"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "Prev äãù"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "äøæç äòéáöî äðéà `%s' ä÷ñéô ìù Prev äãùá ä÷ñéôä"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "éåâù Next äãù úìòá àéä (%s) åæ ä÷ñéô"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "Up äãù"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "äøæçá òéáöîù èéøôú óéòñ ïéà ìáà ,`%s' ìò òéáöî `%s' ä÷ñéô ìù Up äãù"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "`%s' ä÷ñéôì íéøåùé÷ %d éúøôñ"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
@@ -2742,257 +2927,104 @@ msgstr "Appendix %c "
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "!\"%s\" (search_sectioning) úéîéðô äðëåú úì÷ú"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "!\"%s\" (search_sectioning) úéîéðô äðëåú úì÷ú"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s-á ùîúùäì óéãò ;úðùåéî äðéä %c%s äàøåä"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "íãå÷ äøãâåä øáë %ctop íò ä÷ñéô"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "%ctop ú÷ñéô ìù íå÷îä åäæ"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "éîöòá @node éúôñåä ,%cnode éðôì %ctop-á äùîúùä %s ä÷ñéô"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Table of Contents"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Short Contents"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: warning: "
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "of"
 
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " for %s"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "on"
 
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr ".íéðééôàî ìù äàìî äîéùø úìá÷ì `%s --help' äñð\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "÷éø úåéäì ìåëé åðéà øåùé÷ ìù ïåùàø èðîåâøà"
 
-#: util/install-info.c:434
+#: makeinfo/xref.c:252
 #, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"          %s [OPTION]... [INFO-FILE [DIR-FILE]] :ùåîéùä ïôåà\n"
-"\n"
-"                                                                :íéðééôàî\n"
-"  ;INFO-FILE øåáò íéîéé÷ èéøôú éôéòñ DIR-FILE-î ÷çî   --delete\n"
-"                      .íéùãç èéøôú éôéòñ óéñåú ìà\n"
-"                   .éùàø Info èéøôú ìù õáå÷ íù ïééö   --dir-file=NAME\n"
-"            .DIR-FILE èðîåâøàá ùåîéùì êøò-äååù äæ\n"
-"                  .Info ìù èéøôú óéòñë TEXT-á ùîúùä   --entry=TEXT\n"
-"    Info èéøôú óéòñ úøåù ìù äøåöá úåéäì êéøö TEXT\n"
-"     .íéçååøá úåìéçúîä úåøåù äîë úôñåúì úåøùôà íò\n"
-"     íéôéòñä ìë ,úçà íòôî øúåé --entry-á ùîúùú íà\n"
-"                                     .åôñåúé åììä\n"
-"    êåúî åáùåçé èéøôú éôéòñ ,--entry-á ùåîéù ïéàá\n"
-"                         .åîöò Info õáå÷ ìù ïëåúä\n"
-"                       .úéðëúäî àöå àæ äøæò êñî âöä   --help\n"
-"                  .éùàøä èéøôúá äð÷úäì õáå÷ íù ïééö   --info-file=FILE\n"
-"           .INFO-FILE èðîåâøàá ùåîéùì êøò-äååù äæ\n"
-"                   .\"--dir-file=DIR/dir\"-ì êøò-äååù   --info-dir=DIR\n"
-"                         .\"--entry=TEXT\"-ì êøò-äååù   --item=TEXT\n"
-"        .èéøôú ìù óéòñ äùòîì àåä Info êéøãîá óéòñ\n"
-"                              .äøäæà úåàãåä âéöú ìà   --quiet\n"
-"                             .\"--delete\"-ì êøò-äååù   --remove\n"
-"  .éùàøä èéøôúä ìù SEC ÷ìçá äæ õáå÷ êåúî íéôéòñ í÷î   --section=SEC\n"
-" èéøôúä éôéòñ ,úçà íòôî øúåé --section-á ùîúùú íà\n"
-"        .úðééöù éùàøä èéøôúä é÷ìçî ãçà ìëì åôñåúé\n"
-"        òá÷éé èéøôúá ÷ìçä ,--section-á ùåîéù ïéàá\n"
-"                    .åîöò Info õáå÷ ìù ïëåúä êåúî\n"
-"                      .àöå úéðëúä úñøéâ ìò òãéî âöä   --version\n"
-"\n"
-
-#: util/install-info.c:488
-#, fuzzy, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"* Menu:\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "÷éø åðéä %s õáå÷"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "íàåú END-INFO-DIR-ENTRY àìì START-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "íàåú START-INFO-DIR-ENTRY àìì END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
 msgstr ""
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr ".ãáìá úçà íòô %s-ì Info õáå÷ ïééöì ïúéð\n"
-
-#: util/install-info.c:1284
-#, c-format
-msgid "excess command line argument `%s'"
-msgstr "`%s' øúåéî èðîåâøà"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
-msgstr ".äøæò úìá÷ì --help äñð ;èì÷ õáå÷ ïåéö ïéà"
-
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr ".äøæò úìá÷ì --help äñð ;dir õáå÷ ïåéö ïéà"
+#: makeinfo/xref.c:390
+#, fuzzy, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
 
-#: util/install-info.c:1313
-#, c-format
-msgid "no info dir entry in `%s'"
-msgstr "`%s'-á éùàø èéøôú éôéòñ ïéà"
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr ".íéøåùé÷ ïéà åæ ä÷ñéôá"
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "`%s' óéòñ éùàøä èéøôúá íéé÷ øáë `%s' õáå÷ì"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "÷éø úåéäì ìåëé åðéà @inforef ìù ïåùàø èðîåâøà"
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "÷çîð àì íåìë ;`%s' øåáò èéøôú éôéòñ åàöîð àì"
-
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "úéðëúäî àöå äæ äøæò êñî âöä"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "ãåáéòä êìäîá íéøöåðä íééðîæ íéöá÷ ÷çîú ìà"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "(ç\"îøá) ãåáéòä êìäîá íéøöåðä íééðîæ íéöá÷ ÷çî"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "FILE õáå÷ì èìô äðôä"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "àöå úéðëúä úñøéâ ìò òãéî âöä"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "%s [OPTION]... FILE... :ùåîéùä ïôåà\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ".TeX é\"ò áúëðù FILE õáå÷ ìëì ïééåîî ñ÷ãðéà ïëä\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ".`foo.%c%c' íùá íéàø÷ð `foo.texi' êîñî øåáò FILE éöá÷ ììë êøãá\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3001,27 +3033,398 @@ msgstr ""
 "\n"
 "                                                :íéðééôàî\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "texinfo ìù ñ÷ãðéà õáå÷ åðéà `%s'"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "%s ìù úùãåçî äçéúôá äì÷ú"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "texinfo ìù ñ÷ãðéà õáå÷ åðéà `%s'"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "ãåîò øôñî ïéà %s-á"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "éðùî íù ìòá èéøô úåá÷òá àá %s èéøô"
 
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10[search]  äæ Info õå÷á êìéàå ïàëî úæåøçî ùôç\n"
+#~ "                    .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
+
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10[goto-node]  äîù é\"ôò ä÷ñéôì øåáò\n"
+#~ "              .(FILENAME)NODENAME-á åîë ä÷ñéôä íùî ÷ìçë õáå÷ íù ïééöì "
+#~ "ïúéð\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "\\%-10[next-node]  úéçëåð ä÷ñéô éøçà äàáä ä÷ñéôì øåáò\n"
+
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr ""
+#~ "\\%-10[dir-node]  `\\[goto-node] (DIR)'-ì êøò-äååù ;DIR ä÷ñéôì øåáò\n"
+
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr "\\%-10[top-node]  `\\[goto-node] Top'-ì êøò-äååù ;Top ä÷ñéôì øåáò\n"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-forward-page-only]  Scroll forward within this node.\n"
+#~ msgstr "\\%-10[scroll-forward]  äîéã÷ úçà äøåù ïîñ ææä\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[scroll-backward-page-only]  Scroll backward within this node.\n"
+#~ msgstr "\\%-10[scroll-backward]  äøåçà ãçà óã ìåìâ\n"
+
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10[search-backward]  äæ Info õå÷á äøåçàå ïàëî úæåøçî ùôç\n"
+#~ "                              .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr "--- `\\[kill-node]' åà `\\[history-node]' ù÷ä äàéöéì ---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr "\\%-10[move-to-prev-xref]  úéçëåð ä÷ñéôá íãå÷ä øåùé÷ì ïîñ ææä\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "            %s [íéðééôàî]... [...èéøôúî íéôéòñ] :ùåîéù ïôåà\n"
+#~ "\n"
+#~ "                        .Info èîøåôá íéëåøòä ãåòéú éöá÷á ïééò\n"
+#~ "\n"
+#~ "                                                                :"
+#~ "íéðééôàî\n"
+#~ "     .ùîúùîì êéøãî ìë ìù íéñ÷ãðéàä ìëá SUBJECT ùôç      --"
+#~ "apropos=SUBJECT\n"
+#~ "                 .INFOPATH-á äîéùøì DIR äé÷éú óñåä  -d, --directory=DIR\n"
+#~ "          .FILENAME õáå÷á íéù÷îä úåöéçì ìë úà íåùø      --"
+#~ "dribble=FILENAME\n"
+#~ "               .FILENAME õáå÷á øùà ùîúùî êéøãî âöä  -f, --file=FILENAME\n"
+#~ "                      .úéðëúäî àöå äæ äøæò êñî âöä  -h, --help\n"
+#~ ".äéìà ìéáåî ñ÷ãðéàäù ä÷ñéô âöäå ñ÷ãðéàá úæåøçî ùôç      --index-"
+#~ "search=STRING\n"
+#~ "          .ïåùàø Info õáå÷ êåúî NODENAME ä÷ñéô âöä  -n, --node=NODENAME\n"
+#~ "           .FILENAME õáå÷ êåúì åøçáðù úåà÷ñéô áåúë  -o, --"
+#~ "output=FILENAME\n"
+#~ "              .man éôãî ANSI ìù äø÷áä éååú ÷ìñú ìà  -R, --raw-escapes\n"
+#~ "                 .FILENAME õáå÷î íéù÷î úåöéçì øæçù      --"
+#~ "restore=FILENAME\n"
+#~ "         .äãå÷ôä úøåù ìù íéðééôàî úèøôîä ä÷ñéô âöä  -O, --show-options, --"
+#~ "usage\n"
+#~ "%s   .èìôì ïìåë áåúëå éáéñøå÷ø øãñá úåà÷ñéô ïéá øåáò      --subnodes\n"
+#~ "            .Less åà vi-ì äîåãá úåãå÷ôì íéù÷î øåù÷      --vi-keys\n"
+#~ "                    .àöå úéðëåúä úñøéâ ìò òãéî âöä      --version\n"
+#~ "\n"
+#~ ";ìéçúäì ùé åðîîù èéøôúî óéòñ ïééöî ,íéé÷ àåä íà ,ïééôàî åðéàù ïåùàø "
+#~ "èðîåâøà\n"
+#~ "                  .INFOPATH úîéùø êøåàì `dir' éöá÷ ìëá äæ óéòñ ùôçú "
+#~ "úéðëåúä\n"
+#~ "     .`dir' éöá÷ ìëî áëøåîä èéøôú âéöú info ,ïééôàî åðéàù èðîåâøà óà ïéà "
+#~ "íà\n"
+#~ "                èéøôúäî ìçä ,èéøôú éôéòñ úåîùë åùøåôé ïåùàøì øáòî "
+#~ "íéèðîåâøà\n"
+#~ "                                                     .äâöåäù äðåùàøä "
+#~ "ä÷ñéôá\n"
+#~ "\n"
+#~ "                                                                   :"
+#~ "úåàîâåã\n"
+#~ "                          dir õáå÷î áà-èéøôú âöä  info\n"
+#~ "       emacs èéøô òéáöî äéìà ä÷ñéôì êì áà-èéøôúî  info emacs\n"
+#~ "buffers èéøôì êùîä íùîå emacs óéòñì êì áà-èéøôúî  info emacs buffers\n"
+#~ "   emacs ìù äãå÷ôä úøåù éðééôàî úøàúîä ä÷ñéô âöä  info --show-options "
+#~ "emacs\n"
+#~ "    dir èéøôú êøã øåáòì éìáî ./foo.info õáå÷ âöä  info -f ./foo.info\n"
+#~ "\n"
+#~ "                           ,bug-texinfo@gnu.org-ì äì÷ú éçååéã çåìùì àð\n"
+#~ "                   .help-texinfo@gnu.org-ì ïåéãì íéàùåðå úåéììë úåìàùå\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr "              .úøçà ä÷ñéôì øáòîì úîøåâ èéøôúî äøéçá\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "              .(FILENAME)NODENAME-á åîë ä÷ñéôä íùî ÷ìçë õáå÷ íù ïééöì "
+#~ "ïúéð\n"
+
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr "  %-10s  äæ Info õáå÷á äøåçàå ïàëî úæåøçî ùôç\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "              .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "...äàáä ä÷ñéôì øáåò"
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "...èéøôúäî ïåùàø óéòñ øçåá"
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "...äàáä ä÷ñéôá øçåá"
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr ".äàáä ä÷ñéôä øçåá æàå ,úåà÷ñéôä õòá úå/äîø %d äìåò"
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr ".äæ ïåìçá úîãå÷ ä÷ñéôì øáåò"
+
+#~ msgid "Moving Up in this window."
+#~ msgstr ".äæ ïåìçá íàä ú÷ñôì øáåò"
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr ".úîãå÷ ä÷ñéô ìù èéøôúá ïåøçà óéòñì øáåò"
+
+#~ msgid " "
+#~ msgstr " "
+
+# It would be hilarious to translate those...
+#~ msgid "Function"
+#~ msgstr "Function"
+
+#~ msgid "Macro"
+#~ msgstr "Macro"
+
+#~ msgid "Special Form"
+#~ msgstr "Special Form"
+
+#~ msgid "Variable"
+#~ msgstr "Variable"
+
+#~ msgid "User Option"
+#~ msgstr "User Option"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Instance Variable"
+
+#~ msgid "Method"
+#~ msgstr "Method"
+
+#~ msgid "Untitled"
+#~ msgstr "úøúåë àìì"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "This is %s, produced by makeinfo version %s from %s.\n"
+
+#~ msgid "Next:"
+#~ msgstr "Next:"
+
+#~ msgid "Previous:"
+#~ msgstr "Previous:"
+
+#~ msgid "Up:"
+#~ msgstr "Up:"
+
+#~ msgid "Menu"
+#~ msgstr "èéøôú"
+
+#~ msgid "Cross"
+#~ msgstr "øåùé÷"
+
+#~ msgid "Prev"
+#~ msgstr "Prev äãù"
+
+#~ msgid "Up"
+#~ msgstr "Up äãù"
+
+#~ msgid "see "
+#~ msgstr "see "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "          %s [OPTION]... [INFO-FILE [DIR-FILE]] :ùåîéùä ïôåà\n"
+#~ "\n"
+#~ "                                                                :"
+#~ "íéðééôàî\n"
+#~ "  ;INFO-FILE øåáò íéîéé÷ èéøôú éôéòñ DIR-FILE-î ÷çî   --delete\n"
+#~ "                      .íéùãç èéøôú éôéòñ óéñåú ìà\n"
+#~ "                   .éùàø Info èéøôú ìù õáå÷ íù ïééö   --dir-file=NAME\n"
+#~ "            .DIR-FILE èðîåâøàá ùåîéùì êøò-äååù äæ\n"
+#~ "                  .Info ìù èéøôú óéòñë TEXT-á ùîúùä   --entry=TEXT\n"
+#~ "    Info èéøôú óéòñ úøåù ìù äøåöá úåéäì êéøö TEXT\n"
+#~ "     .íéçååøá úåìéçúîä úåøåù äîë úôñåúì úåøùôà íò\n"
+#~ "     íéôéòñä ìë ,úçà íòôî øúåé --entry-á ùîúùú íà\n"
+#~ "                                     .åôñåúé åììä\n"
+#~ "    êåúî åáùåçé èéøôú éôéòñ ,--entry-á ùåîéù ïéàá\n"
+#~ "                         .åîöò Info õáå÷ ìù ïëåúä\n"
+#~ "                       .úéðëúäî àöå àæ äøæò êñî âöä   --help\n"
+#~ "                  .éùàøä èéøôúá äð÷úäì õáå÷ íù ïééö   --info-file=FILE\n"
+#~ "           .INFO-FILE èðîåâøàá ùåîéùì êøò-äååù äæ\n"
+#~ "                   .\"--dir-file=DIR/dir\"-ì êøò-äååù   --info-dir=DIR\n"
+#~ "                         .\"--entry=TEXT\"-ì êøò-äååù   --item=TEXT\n"
+#~ "        .èéøôú ìù óéòñ äùòîì àåä Info êéøãîá óéòñ\n"
+#~ "                              .äøäæà úåàãåä âéöú ìà   --quiet\n"
+#~ "                             .\"--delete\"-ì êøò-äååù   --remove\n"
+#~ "  .éùàøä èéøôúä ìù SEC ÷ìçá äæ õáå÷ êåúî íéôéòñ í÷î   --section=SEC\n"
+#~ " èéøôúä éôéòñ ,úçà íòôî øúåé --section-á ùîúùú íà\n"
+#~ "        .úðééöù éùàøä èéøôúä é÷ìçî ãçà ìëì åôñåúé\n"
+#~ "        òá÷éé èéøôúá ÷ìçä ,--section-á ùåîéù ïéàá\n"
+#~ "                    .åîöò Info õáå÷ ìù ïëåúä êåúî\n"
+#~ "                      .àöå úéðëúä úñøéâ ìò òãéî âöä   --version\n"
+#~ "\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "`%s' óéòñ éùàøä èéøôúá íéé÷ øáë `%s' õáå÷ì"
+
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr "\\%-10[menu-digit]  úéçëåðä ä÷ñéôä èéøôúá éòéùú ãò ïåùàø óéòñ øçá\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "`%s' ä÷ñéôì íéøåùé÷ %d éúøôñ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "   Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "åæ äðëåú õéôäì íëúåëæ .úåéøçà áúëá äååìî äðéà åæ úéðëåú\n"
+#~ "         .GNU General Public License ïåéùøä éàðúì íàúäá\n"
+#~ "           .COPYING õáå÷á åðééò ,åìà íéðéðòá èåøéô øúéì\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "ãéçé èðîåâøà ìòá åø÷àî êåúá ÷ø éùåîéù @quote-arg"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Table of Contents"
+
+#~ msgid "Short Contents"
+#~ msgstr "Short Contents"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "ãåáéòä êìäîá íéøöåðä íééðîæ íéöá÷ ÷çîú ìà"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "(ç\"îøá) ãåáéòä êìäîá íéøöåðä íééðîæ íéöá÷ ÷çî"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr "              íàåú àöîðù ïåùàø ñ÷ãðéà èéøô äòéáöî äéìà ä÷ñéôì\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "   Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "åæ äðëåú õéôäì íëúåëæ .úåéøçà áúëá äååìî äðéà åæ úéðëåú\n"
+#~ "         .GNU General Public License ïåéùøä éàðúì íàúäá\n"
+#~ "           .COPYING õáå÷á åðééò ,åìà íéðéðòá èåøéô øúéì\n"
+
 #~ msgid "%s: Specify the Info directory only once.\n"
 #~ msgstr ".ãáìá úçà íòô %s-ì Info úéé÷éú ïééöì ïúéð\n"
 
@@ -3037,27 +3440,12 @@ msgstr "éðùî íù ìòá èéøô úåá÷òá àá %s èéøô"
 #~ msgid "File exists, but is not a directory"
 #~ msgstr "äöéçî åððéàù íéé÷ õáå÷ àöîð"
 
-#~ msgid "First argument to cross-reference may not be empty"
-#~ msgstr "÷éø úåéäì ìåëé åðéà øåùé÷ ìù ïåùàø èðîåâøà"
-
-#~ msgid "see "
-#~ msgstr "see "
-
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
-
-#~ msgid "First argument to @inforef may not be empty"
-#~ msgstr "÷éø úåéäì ìåëé åðéà @inforef ìù ïåùàø èðîåâøà"
-
 #~ msgid "Node:"
 #~ msgstr "Node:"
 
 #~ msgid "%s: TOC should be here, but it was not found"
 #~ msgstr "àöîð àì êà ,%s õáå÷á úåéäì äéä øåîà íéðééðò ïëåú"
 
-#~ msgid "virtual memory exhausted"
-#~ msgstr "éìàèøéåä ïåøëæä øîâð"
-
 #~ msgid "No `%s.png' or `.jpg', and no extension supplied"
 #~ msgstr "úøçà úîåéñ äðéåö àìå åàöîð àì .jpg-å `%s.png'"
 
@@ -3066,9 +3454,3 @@ msgstr "éðùî íù ìòá èéøô úåá÷òá àá %s èéøô"
 
 #~ msgid "`%s' has no Up field"
 #~ msgstr "Up äãù ïéà `%s'-ì"
-
-#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-#~ msgstr "\\%-10[scroll-forward]  äîéã÷ úçà äøåù ïîñ ææä\n"
-
-#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-#~ msgstr "\\%-10[scroll-backward]  äøåçà ãçà óã ìåìâ\n"
diff --git a/Build/source/utils/texinfo/po/hr.gmo b/Build/source/utils/texinfo/po/hr.gmo
index 35e246213b3..3cc963b84cd 100644
--- a/Build/source/utils/texinfo/po/hr.gmo
+++ b/Build/source/utils/texinfo/po/hr.gmo
diff --git a/Build/source/utils/texinfo/po/hr.po b/Build/source/utils/texinfo/po/hr.po
index abde350e683..54daa9e99c5 100644
--- a/Build/source/utils/texinfo/po/hr.po
+++ b/Build/source/utils/texinfo/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.2\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
 "PO-Revision-Date: 2002-04-26 13:49-MET+DST (UTC+2)\n"
 "Last-Translator: Mirsad Todorovac <mtodorov_69@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -15,132 +15,198 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opcija `%s' nije jednoznaèna\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opcija `--%s' ne dopu¹ta argument\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opcija `%c%s' ne dopu¹ta argument\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opcija `%s' tra¾i neophodan argument\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: nepoznata opcija `--%s'\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: nepoznata opcija `%c%s'\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: nedozvoljena opcija -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: pogre¹na opcija -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opcija zahtijeva argument -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opcija `-W %s' nije jednoznaèna\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opcija `-W %s' ne dopu¹ta argument\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr ""
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "Pomakni se znak unaprijed"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "Pomakni se znak unazad"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "Pomakni se na poèetak tekuæe linije"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "Pomakni se na kraj tekuæe linije"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "Pomakni se rijeè unaprijed"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "Pomakni se rijeè unazad"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Obri¹i znak ispod kursora"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "Obri¹i znak iza kursora"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Poni¹ti ili prekini operaciju"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Prihvaæanje (ili tra¾enje kompletiranja) linije"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Umetni slijedeæi znak doslovno"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Umetni tekuæi znak"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Umetni znak TAB"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Zamijeni mjesta znakovima pod kurzorom"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Povrati zadnji obrisani sadr¾aj"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "Spremnik za obrisani sadr¾aj je prazan"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Povrati prije obrisani sadr¾aj"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "Obri¹i tekst do kraja retka"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "Obri¹i tekst do poèetka retka"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "Obri¹i rijeè iza kurzora"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "Obri¹i rijeè ispred kurzora"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Ne mogu kompletirati"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Nije dovr¹eno"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "Izlistaj moguæe varijante kompletiranja"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "Jedino moguæe kompletiranje"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "Jedno kompletiranje:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d kompletiranja:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "Umetni kompletiranje"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "Izgraðujem varijante kompletiranja..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "'Skrolaj' prozor za varijante kompletiranja"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "Ne mogu prikazati fusnote"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr "Prika¾i fusnote povezane s ovim èvorom u drugom prozoru"
 
@@ -148,75 +214,75 @@ msgstr "Prika¾i fusnote povezane s ovim èvorom u drugom prozoru"
 msgid "---------- Footnotes ----------"
 msgstr "----------- Fusnote -----------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "Potra¾i niz u indeksu ove datoteke"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "Tra¾im stavke indeksa..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "Nije pronaðen indeks."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Stavka indeksa: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Idi na slijedeæu podudarajuæu stavki indeksa zadnje `\\[index-search]' "
 "naredbe"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "Nema prethodnog zadanog niza za pretra¾ivanje indeksa."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Nema stavaka indeksa."
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, fuzzy, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "Nema stavaka %sindeksa koje sadr¾e \"%s\"."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "jo¹ "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "NE MOGU VIDJETI OVO"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, fuzzy, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "Prona¹ao \"%s\" u %s. (`\\[next-index-match]' poku¹ava naæi slijedeæi.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, fuzzy, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "Skeniram indekse od \"%s\"..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, fuzzy, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "Niti jedna raspolo¾iva info datoteka ne sadr¾i \"%s\" u svom indeksu."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr "Propu¾i kroz sve poznate indekse u potrazi za nizom i slo¾i meni"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Indeks apropos: "
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -225,115 +291,100 @@ msgstr ""
 "\n"
 "* Meni: Èvorovi èiji indeksi sadr¾e \"%s\":\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Poku¹ajte --help za vi¹e informacija.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
-#, fuzzy, c-format
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
-msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"S ovim programom NE DOLAZE GARANCIJE.  Mo¾ete redistribuirati ovaj software\n"
-"pod uvjetima GNU General Public License.\n"
-"Za vi¹e informacija o ovim stvarima, pogledajte datoteke imena COPYING.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "nijedna stavka indeksa nije naðena za `%s'\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-"  -b, --speech-friendly        budi vi¹e prijateljski prema sintetizatorima "
-"govora.\n"
-
-#: info/info.c:597
-#, fuzzy, c-format
+#: info/info.c:598
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+#, fuzzy
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+"  -b, --speech-friendly        budi vi¹e prijateljski prema sintetizatorima "
+"govora.\n"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Kori¹tenje: %s [OPCIJA]... [STAVKA-MENIJA...]\n"
-"\n"
-"Èitanje dokumentacije u Info formatu.\n"
-"\n"
-"Opcije:\n"
-"     --apropos=SUBJEKT        potra¾i SUBJEKT u svim indeksima svih "
-"priruènika.\n"
-" -d, --directory=DIR          dodaj DIR u INFOPATH.\n"
-"     --dribble=IMEDAT         zapamti korisnikovo tipkanje u IMEDAT.\n"
-" -f, --file=IMEDATOTEKE       zadaje ime Info datoteke koju se posjeæuje.\n"
-" -h, --help                   ispi¹i ovu pomoæ i zavr¹i s radom.\n"
-"     --index-search=NIZ       idi na èvor na koji pokazuje stavka indeksa "
-"NIZ.\n"
-" -n, --node=IMEÈVORA          zadaje èvorove u prvoj posjeæenoj info "
-"datoteci.\n"
-" -o, --output=IMEDATOTEKE     ispi¹i izabrane èvorove u IMEDATOTEKE.\n"
-" -R, --raw-escapes            ne uklanjaj ANSI escape sekvence iz man "
-"stranica.\n"
-"     --restore=IMEDATOTEKE    èitaj inicijalne tipke iz IMEDATOTEKE.\n"
-" -O, --show-options, --usage  idi na èvor sa opcijama komandne linije.\n"
-"%s     --subnodes               rekurzivno ispi¹i stavke menija.\n"
-"     --vi-keys                koristi tipke kao ¹to su u vi-u i less-u.\n"
-"     --version                ispi¹i informaciju o verziji i zavr¹i s "
-"radom.\n"
-"\n"
-"Prvi argument koji nije opcija, ako je prisutan, je stavka menija od koje\n"
-"se poèinje; nju se tra¾i u svim `dir' datotekama kroz INFOPATH.\n"
-"Ako nije prisutan, info spaja (merge) sve `dir' datoteke i prikazuje\n"
-"rezultat. Eventualni preostali argumenti se tretiraju kao imena stavki\n"
-"menija relativno od inicijalno posjeæenog èvora.\n"
-"\n"
-"Primjeri:\n"
-"  info                       prika¾i vr¹ni dir meni\n"
-"  info emacs                 zapoèni od emacs èvora iz vr¹nog dir-a\n"
-"  info emacs buffers         zapoèni u buffers èvoru unutar emacs "
-"priruènika\n"
-"  info --show-options emacs  zapoèni u èvoru s emacsovim komandnim opcijama\n"
-"  info -f ./foo.info         prika¾i datoteku ./foo.info, zaobilazeæi dir\n"
-
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -346,415 +397,413 @@ msgstr ""
 "Texinfo matièna stranica: http://www.gnu.org/software/texinfo/\n"
 "Pitanja i kritike glede translacije slati na adresu lokalizacija@linux.hr."
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Ne mogu naæi èvor `%s'."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Ne mogu naæi èvor `(%s)%s'."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "Ne mogu naæi prozor!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "Toèka se ne nalazi unutar èvora ovog prozora!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "Ne mogu dokinuti zadnji prozor."
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "Nema menija u ovom èvoru."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "Nema fusnota u ovom èvoru."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "Nema unakrsnih referenci u ovom èvoru."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Nema `%s' pokazivaèa za ovaj èvor."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Nepoznata Info naredba `%c'; poku¹ajte `?' za pomoæ."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Terminal tipa `%s' nema dovoljno sposobnosti da izvodi Info."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "Veæ se nalazite na zadnjoj stranici ovog èvora."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "Veæ se nalazite na prvoj stranici ovog èvora."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "Samo jedan prozor."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "Nastali prozor bi bio premalen."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Nema dovoljno mjesta za prozor za pomoæ, molimo dokinite jedan prozor."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
-"Osnovne naredbe u Info prozorima\n"
-"********************************\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "\\%-10[quit-help]  Napusti ovu pomoæ.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Potpuno zavr¹i s radom (Quit).\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Pozovi Info priruènik.\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"Izabir drugih èvorova:\n"
-"----------------------\n"
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "  %-10s  'Skrolaj' unazad 1 redak.\n"
+
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "  %-10s  'Skrolaj' naprijed 1 redak.\n"
+
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  'Skrolaj' stranicu unazad.\n"
+
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  'Skrolaj stranicu naprijed.\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  Idi na slijedeæi (`next') èvor u odnosu na ovaj.\n"
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Idi na poèetak ovog èvora.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr ""
-"\\%-10[prev-node]  Idi na prethodni (`previous') èvor u odnosu na ovaj.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Idi navi¹e (`up') od ovog èvora.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Idi na kraj ovog èvora.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
-"\\%-10[menu-item]  Izaberi stavku menija zadanu imenom.\n"
-"              Izabiranje stavke menija selektira drugi èvor.\n"
+"\\%-10[move-to-next-xref]  Preskoèi do slijedeæeg hipertekst linka unutar "
+"ovog èvora.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
+#, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
-msgstr "\\%-10[xref-item]  Slijedi unakrsnu referencu.  Èita ime reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr ""
+"\\%-10[select-reference-this-line]  Slijedi hipertekst link ispod kursora.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr ""
 "\\%-10[history-node]  Pomakni se do posljednjeg vidljivog èvora u ovom "
 "prozoru.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
 msgstr ""
-"\\%-10[move-to-next-xref]  Preskoèi do slijedeæeg hipertekst linka unutar "
-"ovog èvora.\n"
+"\\%-10[prev-node]  Idi na prethodni (`previous') èvor u odnosu na ovaj.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr ""
-"\\%-10[move-to-prev-xref]  Preskoèi do slijedeæeg hipertekst linka unutar "
-"ovog èvora.\n"
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[next-node]  Idi na slijedeæi (`next') èvor u odnosu na ovaj.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
 msgstr ""
-"\\%-10[select-reference-this-line]  Slijedi hipertekst link ispod kursora.\n"
+"\\%-10[prev-node]  Idi na prethodni (`previous') èvor u odnosu na ovaj.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
-"\\%-10[dir-node]  Pomakni se na `directory' èvor.  Ekvivalentno `\\[goto-"
-"node] (DIR)'.\n"
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Idi na slijedeæi (`next') èvor u odnosu na ovaj.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr ""
-"\\%-10[top-node]  Idi na Top (vr¹ni) èvor.  Ekvivalentno `\\[goto-node] "
-"Top'.\n"
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Idi navi¹e (`up') od ovog èvora.\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"Pomicanje unutar èvora:\n"
-"-----------------------\n"
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[end-of-node]  Idi na kraj ovog èvora.\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[end-of-node]  Idi na kraj ovog èvora.\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Idi na poèetak ovog èvora.\n"
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "  %-10s  Odaberi prvu ... devetu stavku u èvorovom meniju.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Idi na kraj ovog èvora.\n"
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Odaberi zadnju stavku u meniju èvora.\n"
 
 #: info/infodoc.c:72
 #, fuzzy
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "  %-10s  'Skrolaj' naprijed 1 redak.\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  Odaberi stavku menija specificirane imenom.\n"
 
 #: info/infodoc.c:73
 #, fuzzy
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "  %-10s  'Skrolaj' unazad 1 redak.\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "\\%-10[xref-item]  Slijedi unakrsnu referencu.  Èita ime reference.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  'Skrolaj stranicu naprijed.\n"
-
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  'Skrolaj' stranicu unazad.\n"
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  Idi na èvor zadan imenom.\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr ""
-"Druge naredbe:\n"
-"--------------\n"
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  Tra¾i prema naprijed zadani niz,\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
 msgstr ""
-"\\%-10[menu-digit]  Odaberi prvu ... devetu stavku u èvorovom meniju.\n"
+"\\%-10[prev-node]  Idi na prethodni (`previous') èvor u odnosu na ovaj.\n"
 
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "\\%-10[last-menu-item]  Odaberi zadnju stavku u meniju èvora.\n"
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "  %-10s  Tra¾i zadani niz u indeks stavkama ove Info\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
+#, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 "\\%-10[index-search]  Tra¾i zadani niz u indeksnim stavkama ove Info "
 "datoteke\n"
 "              i selektiraj èvor referenciran prvom naðenom stavkom.\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  Pomakni se na èvor zadan imenom.\n"
-"              Mo¾ete takoðer ukljuèiti ime datoteke, kao u (DATOTEKA)"
-"IME_ÈVORA.\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  Tra¾i unaprijed za zadanim nizom\n"
-"              i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "Poni¹ti trenutnu operaciju"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  Tra¾i unazad zadani niz\n"
-"              i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
+"Osnovne naredbe u Info prozorima\n"
+"********************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Napusti ovu pomoæ.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Potpuno zavr¹i s radom (Quit).\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Pozovi Info priruènik.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Idi na slijedeæi (`next') èvor u odnosu na ovaj.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Idi na prethodni (`previous') èvor u odnosu na ovaj.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Idi navi¹e (`up') od ovog èvora.\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Odaberi stavku menija specificirane imenom.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
-msgstr "              Odabiranje stavke menija selektira drugi èvor.\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"\\%-10[menu-item]  Izaberi stavku menija zadanu imenom.\n"
+"              Izabiranje stavke menija selektira drugi èvor.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Slijedi unakrsnu referencu.  Èita ime reference.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Pomakni se do posljednjeg vidljivog èvora u ovom prozoru.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Preskoèi do slijedeæeg hipertekst linka unutar ovog èvora.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Slijedi hipertekst link ispod kursora.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Pomakni se na `directory' èvor.  Ekvivalentno `g (DIR)'.\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Idi na Top (vr¹ni) èvor.  Ekvivalentno s `g Top'.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Pomicanje unutar èvora:\n"
+"-----------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  'Skrolaj' stranicu naprijed.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  'Skrolaj' stranicu unazad.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Idi na poèetak ovog èvora.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Idi na kraj ovog èvora.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  'Skrolaj' naprijed 1 redak.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  'Skrolaj' unazad 1 redak.\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Druge naredbe:\n"
+"--------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  Odaberi prvu ... devetu stavku u èvorovom meniju.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Odaberi zadnju stavku u èvorovom meniju.\n"
 
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr "  %-10s  Tra¾i zadani niz u indeks stavkama ove Info\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
-"              datoteke, i selektiraj èvor referenciran prvom naðenom "
-"stavkom.\n"
-
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Idi na èvor zadan imenom.\n"
+"\\%-10[index-search]  Tra¾i zadani niz u indeksnim stavkama ove Info "
+"datoteke\n"
+"              i selektiraj èvor referenciran prvom naðenom stavkom.\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
+"\\%-10[goto-node]  Pomakni se na èvor zadan imenom.\n"
 "              Mo¾ete takoðer ukljuèiti ime datoteke, kao u (DATOTEKA)"
 "IME_ÈVORA.\n"
 
-#: info/infodoc.c:133
-#, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Tra¾i prema naprijed zadani niz,\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
+#: info/infodoc.c:129
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
+"\\%-10[search]  Tra¾i unaprijed za zadanim nizom\n"
 "              i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
 
-#: info/infodoc.c:135
-#, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Tra¾i unazad zadani niz,\n"
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  Tra¾i unaprijed za zadanim nizom\n"
+"              i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "Trenutni put pretra¾ivanja je:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -762,7 +811,7 @@ msgstr ""
 "Naredbe raspolo¾ive u Info prozorima:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -770,7 +819,7 @@ msgstr ""
 "Naredbe raspolo¾ive u echo podruèju:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -779,7 +828,7 @@ msgstr ""
 "Slijedeæe naredbe mogu biti pozvane pomoæu %s:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -787,82 +836,73 @@ msgstr ""
 "Slijedeæe naredbe ne mogu uopæe biti pozvane:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr "--- Upotrijebi `\\[history-node]' ili `\\[kill-node]' za izlaz ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "Ispi¹i poruku za pomoæ"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "Posjeti Info èvor `(info)Help'"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "Ispi¹i dokumentaciju za TIPKU"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Opi¹i tipku: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s nije definiran."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s nije definiran."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s je definiran kao %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Poka¾i ¹to otipkati da se izvr¹i data naredba"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Gdje je naredba: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' nije niti na jednoj tipki"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s mo¾e biti pozvan samo putem %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s mo¾e biti pozvan putem %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Ne postoji funkcija `%s'"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"S ovim programom NE DOLAZE GARANCIJE.  Mo¾ete redistribuirati ovaj software\n"
-"pod uvjetima GNU General Public License.\n"
-"Za vi¹e informacija o ovim stvarima, pogledajte datoteke imena COPYING.\n"
+"Izabir drugih èvorova:\n"
+"----------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -975,22 +1015,22 @@ msgstr ""
 "  --help              ispi¹i ovu pomoæ i zavr¹i s radom.\n"
 "  --version           ispi¹i ovu informaciju o verziji i zavr¹i s radom.\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Ignoriram neispravnu infokey datoteku `%s' - premalena"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Ignoriram neispravnu infokey datoteku `%s' - prevelika"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "Pogre¹ka pri èitanju infokey datoteke `%s' - prekratki read"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -998,13 +1038,13 @@ msgstr ""
 "Neispravna infokey datoteka `%s' (pogre¹ni magic number) -- pokreni infokey "
 "da se obnovi"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 "Va¹a infokey datoteka `%s' je istekla -- pokrenite infokey da se obnovi"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -1012,7 +1052,7 @@ msgstr ""
 "Neispravna infokey datoteka `%s' (bad section length) -- pokrenite infokey "
 "da se obnovi"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -1020,46 +1060,46 @@ msgstr ""
 "Neispravna infokey datoteka `%s' (bad section code) -- pokrenite infokey da "
 "se obnovi"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 "Pogre¹ni podaci u infokey datoteci -- neka povezivanja tipki zanemarena"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr "Pogre¹ni podaci u infokey datoteci -- neke var postavke ignorirane"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "Proèitaj ime Info naredbe i opi¹i je"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Opi¹i naredbu: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "Proèitaj ime naredbe u echo podruèju i izvr¹i je"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Ne mogu izvr¹iti komandu za echo podruèje ovdje."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, fuzzy, c-format
 msgid "Undefined command: %s"
 msgstr "Nepoznata naredba (%s)."
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "Postavi visinu prikazanog prozora"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Postavi velièinu screena na (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1068,12 +1108,12 @@ msgstr ""
 "   Izvorne datoteke prepuzane da se ukljuèi ova datoteka:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Neuspjelo rukovanje datotekom %s.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1085,7 +1125,7 @@ msgstr ""
 "  (Datoteka)Èvor                    Redaka  Vel.   Sadr¾i datoteku\n"
 "  --------------                    ------  ----   ---------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1093,24 +1133,29 @@ msgstr ""
 "Ovdje je popis èvorova koje ste nedavno posjetili.\n"
 "Odaberite jedan s menija, ili koristite `\\[history-node]' u drugom prozoru\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "Naèini prozor sadr¾avajuæi meni svih dosad posjeæenih èvorova"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Izaberi èvor koji je prethodno bio posjeæen u vidljivi prozor"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Izaberi posjeæeni èvor: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Referenca je nestala! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1119,109 +1164,80 @@ msgstr ""
 "Dobrodo¹li u Info verzija %s. Otipkajte \\[get-help-window] za pomoæ, "
 "\\[menu-item] za stavku menija."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "Pomakni se dolje to slijedeæeg retka"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "Pomakni se gore do prethodnog retka"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "Pomakni se do kraja retka"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "Pomakni se na poèetak retka"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "Next"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Slijedim Next (slijedeæi) èvor..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Izabirem prvu stavku menija..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Selektiram Next (slijedeæi) èvor..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "Pomièem se gore (Up) %d put(a), onda Next."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "Nema vi¹e èvorova u ovom dokumentu."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "Nema `Prev' (prethodni) za ovaj èvor."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Idemo na Prev (prethodni) u ovom prozoru."
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "Nema `Prev' ni `Up' za ovaj èvor unutar dokumenta."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Idem gore (Up) u ovom prozoru."
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Idem na zadnju stavku `Prev'-ovog menija."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "Idi naprijed ili nani¾e kruz strukturu èvorova"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "Idi unatrag ili gore kroz strukturu èvorova"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "'Skrolaj' prema gore u ovom prozoru"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 "'Skrolaj' prema dolje u ovom prozoru i postavi inicijalnu velièinu prozora"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr "'Skrolaj' prema dolje u ovom prozoru ostajuæi unutar èvora"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "'Skrolaj' prema dolje u ovom prozoru ostajuæi unutar èvora i postavi "
 "inicijalnu velièinu prozora"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "'Skrolaj' prema gore u ovom prozoru"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
 "'Skrolaj' prema gore u ovom prozoru i postavi inicijalnu velièinu prozora"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr "'Skrolaj' prema gore u ovom prozoru ostajuæi unutar èvora"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1229,399 +1245,432 @@ msgstr ""
 "'Skrolaj' prema gore u ovom prozoru ostajuæi unutar èvora i postavi "
 "inicijalnu velièinu prozora"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "Pomakni se na poèetak trenutnog èvora"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "Pomakni se na kraj trenutnog èvora"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "'Skrolaj' dolje za redaka"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "'Skrolaj' gore za redaka"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "'Skrolaj' dolje za polovinu velièine ekrana"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "'Skrolaj' gore za polovinu velièine ekrana"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "Selektiraj slijedeæi prozor"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "Selektiraj prethodni prozor"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "Raspolovi trenutni prozor"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "Obri¹i trenutni prozor"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "Ne mogu obrisati permanentni prozor"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "Obri¹i sve ostale prozore"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "'Skrolaj' drugi prozor"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "'Skrolaj' drugi prozor unazad"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "Poveæaj (ili smanji) ovaj prozor"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "Podijeli vidljivu povr¹inu ekrana izmeðu vidljivih prozora"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Promijeni stanje prelamanja linija u trenutnom prozoru"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "Prika¾i Next (slijedeæi) èvor"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "Prika¾i Prev (prethodni) èvor"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "Prika¾i Up (gornji) èvor"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "Prika¾i posljednji èvor u ovoj datoteci"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "Ovaj prozor nema dodatnih èvorova"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "Prika¾i prvi èvor u ovoj datoteci"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "Prika¾i zadnji èvor u ovoj datoteci"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "Selektiraj ovu stavku menija"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Nema %d stavaka u ovom meniju."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Stavka menija (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Stavka menija: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Slijedi xref (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "Slijedi xref: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "Èitaj stavku menija i selektiraj njen èvor"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Èitaj fusnotu ili referencu i selektiraj njezin èvor"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "Idi na poèetak menija ovog èvora"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "Posjeti ¹to je vi¹e moguæe stavki odjednom"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "Èitaj ime èvora i selektiraj ga"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "Idi na èvor: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Nema menija u èvoru `%s'."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Nema stavke menija `%s' u èvoru `%s'."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Ne mogu naæi èvor referenciran od `%s' u `%s'."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Èitaj listu menija poèev¹i od dir i slijedi ih"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "Slijedi menije: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Pronaði èvor koji opisuje pozivanje programa"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Naði èvor pozivanja (Invocation) od [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "Proèitaj referentnu man stranicu i selektiraj je"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "Dobavi man stranicu: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "Selektiraj èvor `Top' u ovoj datoteci"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "Selektiraj èvor `(dir)'"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Poni¹ti èvor (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Ne mogu poni¹titi èvor `%s'"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "Ne mogu poni¹titi zadnji èvor"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "Selektiraj najzadnji odabrani èvor"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "Poni¹ti ovaj èvor"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "Proèitaj ime datoteke i selektiraj ga"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Naði datoteku: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Ne mogu naæi `%s'."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Gotovo."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "Ispisujem èvor %s..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr ""
 "Propusti sadr¾aj ovog èvora kroz cjevovod (pipe) prema INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Ne mogu otvoriti cjevovod (pipe) prema `%s'."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "Ispisujem èvor %s..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "Obri¹i tekst do poèetka retka"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Tra¾im poddatoteku %s ..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr "Èitaj niz znakova i kreni u potragu za njim (case-sensitive)"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "Èitaj niz znakova i potra¾i ga"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "Èitaj niz znakova i potra¾i ga unatrag"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "%s%sza niz znakova [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr " (case-sensitive) "
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "Tra¾i unazad"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "Tra¾i"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " (case-sensitive) "
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "Pretra¾ivanje neuspjelo."
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "Ponovi zadnje pretra¾ivanje u istom pravcu"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "Nema prethodnog tra¾enog niza"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "Ponovi zadnje pretra¾ivanje u suprotnom pravcu"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "Tra¾i niz interaktivno kako ga tipkate"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "I-pretraga unazad: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "I-pretraga unazad: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "I-pretraga: "
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "I-pretraga: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "Neuspjela "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "Idi na prethodnu referencu"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "Idi na slijedeæu referencu"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "Selektiraj referencu ili stavku menija koja se pojavljuje u retku"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "Poni¹ti trenutnu operaciju"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Zavr¹i (Quit)"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "Pomakni kurzor na specificirani redak prozora"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "Osvje¾i prikaz"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Zavr¹i kori¹tenje Info-a"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr "Izvr¹i naredbu povezanu s malim slovom varijantom ove tipke"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Nepoznata naredba (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" je neispravno"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, fuzzy, c-format
 msgid "`%s' is invalid"
 msgstr "\"%s\" je neispravno"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "Dodaj ovu znamenku trenutnom numerièkom argumentu"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Zapoèni (ili pomno¾i s 4) trenutni numerièki argument"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "Interno kori¹ten od \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Premalo virtualne memorije!\n"
@@ -1658,272 +1707,402 @@ msgstr "Kada je \"On\", dio znakovnog niza koji se podudara je osvijetljen"
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "Kontrolira ¹to se dogaða kad se skrolanje tra¾i na kraju èvora"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "Broj redaka koliko treba skrolati kad se kurzor pomakne izvan prozora"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "Kada je \"On\", Info prihvaæa i prikazuje ISO Latin znakove"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "Kontrolira ¹to se dogaða kad se skrolanje tra¾i na kraju èvora"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "Obja¹njava kori¹tenje varijable"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Opi¹i varijablu: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Postavi vrijednost info varijable"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Postavi varijablu: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "Postavi %s na vrijednost (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "Postavi %s na vrijednost (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Tagovima istekao rok trajanja ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), redaka ----,"
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d redaka --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d redaka --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Poddatoteka: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opcija `%s' nije jednoznaèna\n"
+msgid "%s: warning: "
+msgstr ""
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opcija `--%s' ne dopu¹ta argument\n"
+msgid " for %s"
+msgstr ""
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opcija `%c%s' ne dopu¹ta argument\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr ""
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:508
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opcija `%s' tra¾i neophodan argument\n"
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr ""
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Izvje¹taje o bugovima molimo slati emailom na bug-texinfo@gnu.org\n"
+"(na engleskom), generalna pitanja i diskusije na help-texinfo@gnu.org.\n"
+"Texinfo matièna stranica: http://www.gnu.org/software/texinfo/\n"
+"Pitanja i kritike glede translacije slati na adresu lokalizacija@linux.hr."
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nepoznata opcija `--%s'\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nepoznata opcija `%c%s'\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr ""
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: nedozvoljena opcija -- %c\n"
+msgid "%s: empty file"
+msgstr ""
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr ""
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr ""
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: pogre¹na opcija -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opcija zahtijeva argument -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opcija `-W %s' nije jednoznaèna\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opcija `-W %s' ne dopu¹ta argument\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: install-info/install-info.c:2129
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr ""
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ""
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr ""
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr ""
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr ""
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr ""
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr ""
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr ""
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr ""
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr ""
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr ""
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr ""
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr ""
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr ""
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr ""
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr ""
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
 msgstr ""
 
-#: makeinfo/defun.c:424
-msgid "Method"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
 msgstr ""
 
 #: makeinfo/defun.c:711
@@ -1931,247 +2110,254 @@ msgstr ""
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr ""
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr ""
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr ""
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr ""
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr ""
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr ""
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr ""
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr ""
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr ""
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr ""
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr ""
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr ""
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr ""
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr ""
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr ""
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr ""
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr ""
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr ""
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr ""
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr ""
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr ""
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr ""
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr ""
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr ""
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr ""
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr ""
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr ""
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr ""
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr ""
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr ""
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr ""
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr ""
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr ""
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "%s: nepoznata opcija `%c%s'\n"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr ""
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr ""
@@ -2186,7 +2372,7 @@ msgstr ""
 msgid "here is the previous definition of `%s'"
 msgstr ""
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
@@ -2196,104 +2382,114 @@ msgstr ""
 msgid "Macro `%s' called on line %d with too many args"
 msgstr ""
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr ""
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
 msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
+
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr ""
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr ""
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:350
+#: makeinfo/makeinfo.c:354
 #, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:386
+#: makeinfo/makeinfo.c:391
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2301,24 +2497,27 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2328,7 +2527,7 @@ msgid ""
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2348,7 +2547,7 @@ msgid ""
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2357,171 +2556,167 @@ msgid ""
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr ""
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, c-format
 msgid "%c%s expected braces"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "Nema menija u èvoru `%s'."
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
@@ -2530,161 +2725,128 @@ msgstr ""
 msgid "Missing } in @multitable template"
 msgstr ""
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr ""
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr ""
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr ""
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr ""
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr ""
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr ""
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr ""
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr ""
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr ""
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr ""
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr ""
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr ""
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr ""
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr ""
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr ""
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr ""
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr ""
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr ""
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr ""
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr ""
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr ""
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr ""
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr ""
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "ne mogu kreirati izlaznu datoteku `%s'"
@@ -2699,250 +2861,376 @@ msgstr ""
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr ""
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr ""
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr ""
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr ""
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr ""
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr ""
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr ""
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr ""
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr ""
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr ""
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr ""
-
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr ""
-
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
-msgstr ""
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr ""
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr ""
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr ""
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+#: makeinfo/xml.c:2150
+msgid "of"
 msgstr ""
 
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
+#: makeinfo/xml.c:2155
+msgid "on"
 msgstr ""
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
 msgstr ""
 
-#: util/install-info.c:1284
+#: makeinfo/xref.c:252
 #, c-format
-msgid "excess command line argument `%s'"
-msgstr ""
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
 msgstr ""
 
-#: util/install-info.c:1313
+#: makeinfo/xref.c:390
 #, c-format
-msgid "no info dir entry in `%s'"
+msgid "`.' or `,' must follow @%s, not `%c'"
 msgstr ""
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr ""
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "Nema unakrsnih referenci u ovom èvoru."
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr ""
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr ""
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr ""
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr ""
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr ""
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
+#: util/texindex.c:743
 #, c-format
-msgid "%s: not a texinfo index file"
+msgid "failure reopening %s"
 msgstr ""
 
-#: util/texindex.c:968
+#: util/texindex.c:758 util/texindex.c:786
 #, c-format
-msgid "failure reopening %s"
+msgid "%s: not a texinfo index file"
 msgstr ""
 
-#: util/texindex.c:1218
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr ""
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr ""
 
-#~ msgid "\"\" is invalid"
-#~ msgstr "\"\" je neispravno"
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10[search]  Tra¾i unaprijed za zadanim nizom\n"
+#~ "              i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
 
-#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10[goto-node]  Pomakni se na èvor zadan imenom.\n"
+#~ "              Mo¾ete takoðer ukljuèiti ime datoteke, kao u (DATOTEKA)"
+#~ "IME_ÈVORA.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr ""
+#~ "\\%-10[next-node]  Idi na slijedeæi (`next') èvor u odnosu na ovaj.\n"
+
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr ""
+#~ "\\%-10[dir-node]  Pomakni se na `directory' èvor.  Ekvivalentno `\\[goto-"
+#~ "node] (DIR)'.\n"
+
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr ""
+#~ "\\%-10[top-node]  Idi na Top (vr¹ni) èvor.  Ekvivalentno `\\[goto-node] "
+#~ "Top'.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-forward-page-only]  Scroll forward within this node.\n"
 #~ msgstr "\\%-10[scroll-forward]  'Skrolaj' naprijed 1 redak.\n"
 
-#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[scroll-backward-page-only]  Scroll backward within this node.\n"
 #~ msgstr "\\%-10[scroll-backward]  'Skrolaj' unazad 1 redak.\n"
 
 #~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10[search-backward]  Tra¾i unazad zadani niz\n"
+#~ "              i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr ""
+#~ "--- Upotrijebi `\\[history-node]' ili `\\[kill-node]' za izlaz ---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr ""
+#~ "\\%-10[move-to-prev-xref]  Preskoèi do slijedeæeg hipertekst linka unutar "
+#~ "ovog èvora.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "Kori¹tenje: %s [OPCIJA]... [STAVKA-MENIJA...]\n"
+#~ "\n"
+#~ "Èitanje dokumentacije u Info formatu.\n"
+#~ "\n"
+#~ "Opcije:\n"
+#~ "     --apropos=SUBJEKT        potra¾i SUBJEKT u svim indeksima svih "
+#~ "priruènika.\n"
+#~ " -d, --directory=DIR          dodaj DIR u INFOPATH.\n"
+#~ "     --dribble=IMEDAT         zapamti korisnikovo tipkanje u IMEDAT.\n"
+#~ " -f, --file=IMEDATOTEKE       zadaje ime Info datoteke koju se "
+#~ "posjeæuje.\n"
+#~ " -h, --help                   ispi¹i ovu pomoæ i zavr¹i s radom.\n"
+#~ "     --index-search=NIZ       idi na èvor na koji pokazuje stavka indeksa "
+#~ "NIZ.\n"
+#~ " -n, --node=IMEÈVORA          zadaje èvorove u prvoj posjeæenoj info "
+#~ "datoteci.\n"
+#~ " -o, --output=IMEDATOTEKE     ispi¹i izabrane èvorove u IMEDATOTEKE.\n"
+#~ " -R, --raw-escapes            ne uklanjaj ANSI escape sekvence iz man "
+#~ "stranica.\n"
+#~ "     --restore=IMEDATOTEKE    èitaj inicijalne tipke iz IMEDATOTEKE.\n"
+#~ " -O, --show-options, --usage  idi na èvor sa opcijama komandne linije.\n"
+#~ "%s     --subnodes               rekurzivno ispi¹i stavke menija.\n"
+#~ "     --vi-keys                koristi tipke kao ¹to su u vi-u i less-u.\n"
+#~ "     --version                ispi¹i informaciju o verziji i zavr¹i s "
+#~ "radom.\n"
+#~ "\n"
+#~ "Prvi argument koji nije opcija, ako je prisutan, je stavka menija od "
+#~ "koje\n"
+#~ "se poèinje; nju se tra¾i u svim `dir' datotekama kroz INFOPATH.\n"
+#~ "Ako nije prisutan, info spaja (merge) sve `dir' datoteke i prikazuje\n"
+#~ "rezultat. Eventualni preostali argumenti se tretiraju kao imena stavki\n"
+#~ "menija relativno od inicijalno posjeæenog èvora.\n"
+#~ "\n"
+#~ "Primjeri:\n"
+#~ "  info                       prika¾i vr¹ni dir meni\n"
+#~ "  info emacs                 zapoèni od emacs èvora iz vr¹nog dir-a\n"
+#~ "  info emacs buffers         zapoèni u buffers èvoru unutar emacs "
+#~ "priruènika\n"
+#~ "  info --show-options emacs  zapoèni u èvoru s emacsovim komandnim "
+#~ "opcijama\n"
+#~ "  info -f ./foo.info         prika¾i datoteku ./foo.info, zaobilazeæi "
+#~ "dir\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr "              Odabiranje stavke menija selektira drugi èvor.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "              Mo¾ete takoðer ukljuèiti ime datoteke, kao u (DATOTEKA)"
+#~ "IME_ÈVORA.\n"
+
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr "  %-10s  Tra¾i unazad zadani niz,\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "              i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "Slijedim Next (slijedeæi) èvor..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "Izabirem prvu stavku menija..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "Selektiram Next (slijedeæi) èvor..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "Pomièem se gore (Up) %d put(a), onda Next."
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "Idemo na Prev (prethodni) u ovom prozoru."
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "Idem gore (Up) u ovom prozoru."
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "Idem na zadnju stavku `Prev'-ovog menija."
+
+#~ msgid " "
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Variable"
+#~ msgstr "Postavi varijablu: "
+
+#, fuzzy
+#~ msgid "User Option"
+#~ msgstr "Umetni kompletiranje"
+
+#, fuzzy
+#~ msgid "Instance Variable"
+#~ msgstr "Opi¹i varijablu: "
+
+#, fuzzy
+#~ msgid "Next:"
+#~ msgstr "Next"
+
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr ""
+#~ "\\%-10[menu-digit]  Odaberi prvu ... devetu stavku u èvorovom meniju.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "S ovim programom NE DOLAZE GARANCIJE.  Mo¾ete redistribuirati ovaj "
+#~ "software\n"
+#~ "pod uvjetima GNU General Public License.\n"
+#~ "Za vi¹e informacija o ovim stvarima, pogledajte datoteke imena COPYING.\n"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr ""
+#~ "              datoteke, i selektiraj èvor referenciran prvom naðenom "
+#~ "stavkom.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "S ovim programom NE DOLAZE GARANCIJE.  Mo¾ete redistribuirati ovaj "
+#~ "software\n"
+#~ "pod uvjetima GNU General Public License.\n"
+#~ "Za vi¹e informacija o ovim stvarima, pogledajte datoteke imena COPYING.\n"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "\"\" je neispravno"
+
+#~ msgid ""
 #~ "Basic Commands in Info Windows\n"
 #~ "******************************\n"
 #~ "\n"
diff --git a/Build/source/utils/texinfo/po/hu.gmo b/Build/source/utils/texinfo/po/hu.gmo
new file mode 100644
index 00000000000..971217ec508
--- /dev/null
+++ b/Build/source/utils/texinfo/po/hu.gmo
diff --git a/Build/source/utils/texinfo/po/hu.po b/Build/source/utils/texinfo/po/hu.po
new file mode 100644
index 00000000000..c04e1039499
--- /dev/null
+++ b/Build/source/utils/texinfo/po/hu.po
@@ -0,0 +1,3296 @@
+# translation of info.po to hungarian
+# Hungarian messages for GNU Texinfo
+# Copyright © 2004, 2006 Free Software Foundation, Inc.
+#
+# Máté LAB�DI <labadimate@freemail.hu>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: info\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2006-02-18 16:00+0100\n"
+"Last-Translator: Mate LABADI <labadimate@freemail.hu>\n"
+"Language-Team: hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11\n"
+
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: „%s“ opció félreérthető\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: Opció „--%s“ nem fogad argumentumot\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: Opció „%c%s“ nem fogad argumentumot\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: Option „%s“ argumentumot vár\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ismeretlen opció „--%s“\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ismeretlen opció „%c%s“\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: érvénytelen opció -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: érvénytelen opció -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: Az opció egy argumentumot vár -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: Option „-W %s“ nem érthető\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: A  „-W %s“ opció nem vár argumentumot\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr ""
+
+#: info/echo-area.c:283 info/session.c:735
+msgid "Move forward a character"
+msgstr "1 karakterrel előre"
+
+#: info/echo-area.c:295 info/session.c:767
+msgid "Move backward a character"
+msgstr "1 karakterrel hátra"
+
+#: info/echo-area.c:307
+msgid "Move to the start of this line"
+msgstr "Ugrás a sor elejére"
+
+#: info/echo-area.c:312
+msgid "Move to the end of this line"
+msgstr "Ugrás a sor végére"
+
+#: info/echo-area.c:320 info/session.c:808
+msgid "Move forward a word"
+msgstr "1 szóval előre"
+
+#: info/echo-area.c:360 info/session.c:881
+msgid "Move backward a word"
+msgstr "1 szóval hátra"
+
+#: info/echo-area.c:400
+msgid "Delete the character under the cursor"
+msgstr "A kurzor alatti karakter törlése"
+
+#: info/echo-area.c:430
+msgid "Delete the character behind the cursor"
+msgstr "A kurzor előtti karakter törlése"
+
+#: info/echo-area.c:451
+msgid "Cancel or quit operation"
+msgstr "Művelet törlése vagy kilépés"
+
+#: info/echo-area.c:466
+msgid "Accept (or force completion of) this line"
+msgstr "E sor elfogadása (vagy kiegészítése)"
+
+#: info/echo-area.c:471
+msgid "Insert next character verbatim"
+msgstr "A következő karakter beszúrása"
+
+#: info/echo-area.c:479
+msgid "Insert this character"
+msgstr "E karakter beszúrása"
+
+#: info/echo-area.c:497
+msgid "Insert a TAB character"
+msgstr "Egy TAB karakter beszúrása"
+
+#: info/echo-area.c:504
+msgid "Transpose characters at point"
+msgstr "Itteni karakterek felcserélése "
+
+#: info/echo-area.c:555
+msgid "Yank back the contents of the last kill"
+msgstr "Utolsó törlés tartalmának visszaállítása"
+
+# IMO muss "kill" auch im Folgenden wörtlich üs werden -ke-
+#: info/echo-area.c:562
+msgid "Kill ring is empty"
+msgstr "A törlésnapló üres"
+
+#: info/echo-area.c:575
+msgid "Yank back a previous kill"
+msgstr "Egy korábbi törlés visszaállítása"
+
+#: info/echo-area.c:608
+msgid "Kill to the end of the line"
+msgstr "Törlés a sor végéig"
+
+#: info/echo-area.c:621
+msgid "Kill to the beginning of the line"
+msgstr "Törlés a sor elejéig"
+
+#: info/echo-area.c:633
+msgid "Kill the word following the cursor"
+msgstr "A kurzort követő szó törlése"
+
+#: info/echo-area.c:652
+msgid "Kill the word preceding the cursor"
+msgstr "A kurzort megelőző  szó törlése"
+
+#: info/echo-area.c:867 info/echo-area.c:923
+msgid "No completions"
+msgstr "Nincs kiegészítés"
+
+#: info/echo-area.c:869
+msgid "Not complete"
+msgstr "Nem teljes"
+
+#: info/echo-area.c:910
+msgid "List possible completions"
+msgstr "Lehetséges kiegészítések listája"
+
+#: info/echo-area.c:927
+msgid "Sole completion"
+msgstr "Egyszerű kiegészítés"
+
+#: info/echo-area.c:936
+msgid "One completion:\n"
+msgstr "1 kiegészítés:\n"
+
+#: info/echo-area.c:937
+#, c-format
+msgid "%d completions:\n"
+msgstr "%d kiegészítés:\n"
+
+#: info/echo-area.c:1084
+msgid "Insert completion"
+msgstr "Kiegészítés beszúrása"
+
+#: info/echo-area.c:1219
+msgid "Building completions..."
+msgstr "Kiegészítések felépítése ..."
+
+#: info/echo-area.c:1339
+msgid "Scroll the completions window"
+msgstr "A kiegészítések ablak görgetése "
+
+#: info/footnotes.c:212
+msgid "Footnotes could not be displayed"
+msgstr "A lábjegyzetek nem jeleníthetők meg"
+
+#: info/footnotes.c:238
+msgid "Show the footnotes associated with this node in another window"
+msgstr "E ponthoz tartozó lábjegyzetek megjelenítése egy másik ablakban"
+
+#: info/footnotes.h:26
+msgid "---------- Footnotes ----------"
+msgstr "---------- Lábjegyzetek ----------"
+
+#: info/indices.c:171
+msgid "Look up a string in the index for this file"
+msgstr "Szöveg keresése a fájl tárgymutatójában"
+
+#: info/indices.c:198
+msgid "Finding index entries..."
+msgstr "Tárgymutatóbejegyzések keresése..."
+
+#: info/indices.c:206
+msgid "No indices found."
+msgstr "Nincs tárgymutató."
+
+#: info/indices.c:216
+msgid "Index entry: "
+msgstr "Tárgymutatóbejegyzés: "
+
+#: info/indices.c:324
+msgid ""
+"Go to the next matching index item from the last `\\[index-search]' command"
+msgstr ""
+"Ugrás az előbbi „\\[index-search]“ paranccsal talált tárgymutató bejegyzéshez"
+
+#: info/indices.c:334
+msgid "No previous index search string."
+msgstr "Nincs korábbi keresési feltétel"
+
+#: info/indices.c:341
+msgid "No index entries."
+msgstr "Nincs tárgymutató."
+
+#: info/indices.c:374
+#, c-format
+msgid "No %sindex entries containing `%s'."
+msgstr "Nincs %stárgymutató-bejegyzés, ami „%s!H-t tartalmazná."
+
+#: info/indices.c:375
+msgid "more "
+msgstr "tovább"
+
+#: info/indices.c:385
+msgid "CAN'T SEE THIS"
+msgstr "EZ NEM L�THATÓ"
+
+#: info/indices.c:421
+#, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr ""
+"„%s“ szerepel ebben: %s . (következő keresés „\\[next-index-match]“ alapján.)"
+
+#: info/indices.c:549
+#, c-format
+msgid "Scanning indices of `%s'..."
+msgstr "„%s“ tárgymutatóinak átnézése..."
+
+#: info/indices.c:604
+#, c-format
+msgid "No available info files have `%s' in their indices."
+msgstr "Nincs elérhető fájl, amely tárgymutatója tartalmazná  „%s“-t."
+
+#: info/indices.c:630
+msgid "Grovel all known info file's indices for a string and build a menu"
+msgstr ""
+"Adott sztring keresése minden ismert info fájl tárgymutatójában és menü "
+"építése"
+
+#: info/indices.c:634
+msgid "Index apropos: "
+msgstr "Tárgymutató apropók:"
+
+#: info/indices.c:662
+#, c-format
+msgid ""
+"\n"
+"* Menu: Nodes whose indices contain `%s':\n"
+msgstr ""
+"\n"
+"* Menü: Oldalak, amelyek tárgymutatói tartalmazzák „%s“-t:\n"
+
+#: info/info.c:273 info/infokey.c:899
+#, c-format
+msgid "Try --help for more information.\n"
+msgstr "A --help több információt ad.\n"
+
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+
+#: info/info.c:504
+#, c-format
+msgid "no index entries found for `%s'\n"
+msgstr "Nincs tárgymutató ehhez: %s\n"
+
+#: info/info.c:598
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [MENU-ITEM...]\n"
+"\n"
+"Read documentation in Info format.\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
+"Options:\n"
+"  -k, --apropos=STRING         look up STRING in all indices of all "
+"manuals.\n"
+"  -d, --directory=DIR          add DIR to INFOPATH.\n"
+"      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
+"  -h, --help                   display this help and exit.\n"
+"      --index-search=STRING    go to node pointed by index entry STRING.\n"
+"  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
+"      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
+"      --vi-keys                use vi-like and less-like key bindings.\n"
+"      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
+"\n"
+"The first non-option argument, if present, is the menu entry to start from;\n"
+"it is searched for in all `dir' files along INFOPATH.\n"
+"If it is not present, info merges all `dir' files and shows the result.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
+"\n"
+"Examples:\n"
+"  info                       show top-level dir menu\n"
+"  info emacs                 start at emacs node from top-level dir\n"
+"  info emacs buffers         start at buffers node within emacs manual\n"
+"  info --show-options emacs  start at node with emacs' command line options\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
+msgstr ""
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
+msgid ""
+"\n"
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Hibajegyek a bug-texinfo@gnu.org,\n"
+"általános kérdések és ötletek a help-texinfo@gnu.org\n"
+"címre küldhetők.\n"
+"Texinfo honlap: http://www.gnu.org/software/texinfo/"
+
+#: info/info.c:684
+#, c-format
+msgid "Cannot find node `%s'."
+msgstr "A(z) „%s“ oldal nem található."
+
+#: info/info.c:685
+#, c-format
+msgid "Cannot find node `(%s)%s'."
+msgstr "A(z) „(%s)%s“ oldal nem található."
+
+#: info/info.c:686
+msgid "Cannot find a window!"
+msgstr "Nem található ablak!"
+
+# ATNEZNI LM
+#: info/info.c:687
+msgid "Point doesn't appear within this window's node!"
+msgstr "A pont nem jelenik meg az ablakon látható oldalon!"
+
+#: info/info.c:688
+msgid "Cannot delete the last window."
+msgstr "Az utolsó ablak nem törölhető!"
+
+# node = csomópont? LM
+# vagy csak pont? sas
+#: info/info.c:689
+msgid "No menu in this node."
+msgstr "Nincs menü ezen az oldalon."
+
+# node = csomópont? LM
+# vagy csak pont? sas
+#: info/info.c:690
+msgid "No footnotes in this node."
+msgstr "Nincs lábjegyezet ezen az oldalon."
+
+# node = csomópont? LM
+# vagy csak pont? sas
+#: info/info.c:691
+msgid "No cross references in this node."
+msgstr "Ez az oldal nem tartalmaz kereszthivatkozást."
+
+#: info/info.c:692
+#, c-format
+msgid "No `%s' pointer for this node."
+msgstr "Nincs „%s“ utalás ezen az oldalon."
+
+#: info/info.c:693
+#, c-format
+msgid "Unknown Info command `%c'; try `?' for help."
+msgstr "Ismeretlen Info parancs: „%c“. A „?“ súg."
+
+# smart = okos vagy smart = modern vagy smart = fejlett ? LM
+# sztem fejlett: sas
+#: info/info.c:694
+#, c-format
+msgid "Terminal type `%s' is not smart enough to run Info."
+msgstr "A „%s“ termináltípus nem elég fejlett az Info futtatásához."
+
+# tegez/magáz? LM
+# talán egy kicsit jobb a magázás itt, de ahogy tetszik, de 1séges legyen - sas
+#: info/info.c:695
+msgid "You are already at the last page of this node."
+msgstr "Ön már az oldal utolsó lapját látja."
+
+# tegez/magáz? LM
+# talán egy kicsit jobb a magázás itt, de ahogy tetszik, de 1séges legyen - sas
+#: info/info.c:696
+msgid "You are already at the first page of this node."
+msgstr "Ön már az oldal legelső lapját látja."
+
+#: info/info.c:697
+msgid "Only one window."
+msgstr "Csak egy ablak."
+
+# resulting window = eredményablak
+# vagy
+# resulting window = létrejövő/keletkező ablak
+# LM
+#: info/info.c:698
+msgid "Resulting window would be too small."
+msgstr "Az eredményablak túl kicsi lenne."
+
+# tegez/magáz LM
+# ha lehet, legjobb elkerülni, például be kell zárni egy ablakot, amúgy itt: talán egy kicsit jobb a magázás, de ahogy tetszik, de 1séges legyen - sas
+#: info/info.c:699
+msgid "Not enough room for a help window, please delete a window."
+msgstr "Nincs elég hely súgóablakhoz, kérem zárjon be egy ablakot!."
+
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
+msgstr ""
+
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
+msgstr "\\%-10[quit-help]  Kilépés e súgóból. \n"
+
+# valahogy hangsúlyozni, hogy quit ALTOGETHER? LM
+# úgy érzem nem, de vajh mire utal ez? Arra, hogy: is? - sas
+#: info/infodoc.c:48
+msgid "\\%-10[quit]  Quit Info altogether.\n"
+msgstr "\\%-10[quit]  Kilépés az Info-ból.\n"
+
+# tutorial = bevezető ? LM
+# lehet - sas
+#: info/infodoc.c:49
+msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
+msgstr "\\%-10[get-info-help-node]  Az Info bevezető indítása\n"
+
+# hátra / felfele ? LM
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-line]  Görgetés 1 sorral hátra.\n"
+
+# előre / lefele ? LM
+# előre - sas
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  Görgetés 1 sorral előre.\n"
+
+# hátra / felfele ? LM
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Görgetés egy oldalt hátra.\n"
+
+# előre / lefele ? LM
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Görgetés egy oldalt előre.\n"
+
+#: info/infodoc.c:55
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Ugrás az oldal elejéhez.\n"
+
+#: info/infodoc.c:56
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Ugrás az oldal végéhez.\n"
+
+# Hypertext ? LM
+#: info/infodoc.c:58
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr ""
+"\\%-10[move-to-next-xref]  Ugrás az oldalon található következő hypertext "
+"bejegyzésre.\n"
+
+#: info/infodoc.c:59
+#, fuzzy
+msgid ""
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr ""
+"\\%-10[select-reference-this-line]  A kurzor alatti hypertext link "
+"követése.\n"
+
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
+msgstr ""
+"\\%-10[history-node]  Ugrás az ebben az ablakban utoljára látott oldalra.\n"
+
+# ATNEZNI LM
+#: info/infodoc.c:62
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[prev-node]  Ugrás az előző oldalra.\n"
+
+# ATNEZNI LM
+#: info/infodoc.c:63
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[next-node]  Ugrás a következő oldalra.\n"
+
+# ATNEZNI LM
+#: info/infodoc.c:64
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Ugrás az előző oldalra.\n"
+
+# ATNEZNI LM
+#: info/infodoc.c:65
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Ugrás a következő oldalra.\n"
+
+# ATNEZNI LM
+#: info/infodoc.c:66
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Ugrás a szülőoldalra.\n"
+
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[end-of-node]  Ugrás az oldal végéhez.\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[end-of-node]  Ugrás az oldal végéhez.\n"
+
+#: info/infodoc.c:70
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr ""
+"  %-10s  Az oldalon található menü első ... kilencedik elemének "
+"kiválasztása.\n"
+
+#: info/infodoc.c:71
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr ""
+"\\%-10[last-menu-item]  Az oldalhoz tartozó menü utolsó elemének "
+"kiválasztása.\n"
+
+#: info/infodoc.c:72
+#, fuzzy
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  Menüelem kiválasztása névvel.\n"
+
+#: info/infodoc.c:73
+#, fuzzy
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr ""
+"\\%-10[xref-item]  Kereszthivatkozás követése. A hivatkozás nevének "
+"beolvasása.\n"
+
+#: info/infodoc.c:74
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  Ugrás egy névvel megadott oldalra\n"
+
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  Adott szöveg keresése visszafele\n"
+
+# ATNEZNI LM
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[prev-node]  Ugrás az előző oldalra.\n"
+
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "  %-10s  Adott szöveg keresése visszafele\n"
+
+#: info/infodoc.c:79
+#, fuzzy
+msgid ""
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
+msgstr ""
+"\\%-10[index-search]  Megadott szöveg keresése a mostani Info fájlban\n"
+"              és az első találat által mutatott oldal kiválasztása.\n"
+
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "Jelen művelet törlése"
+
+#: info/infodoc.c:89
+msgid ""
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr ""
+"Alapparancsok az Info ablakban\n"
+"******************************\n"
+
+#: info/infodoc.c:92
+#, c-format
+msgid "  %-10s  Quit this help.\n"
+msgstr "  %-10s  Kilépés a súgóból.\n"
+
+# az altogether le legyen forditva ?
+#: info/infodoc.c:93
+#, c-format
+msgid "  %-10s  Quit Info altogether.\n"
+msgstr "  %-10s  Kilépés az Info-ból.\n"
+
+# tutorial = bemutató?
+#: info/infodoc.c:94
+#, c-format
+msgid "  %-10s  Invoke the Info tutorial.\n"
+msgstr "  %-10s  Az Info bemutató indítása.\n"
+
+#: info/infodoc.c:98
+#, c-format
+msgid "  %-10s  Move to the `next' node of this node.\n"
+msgstr "  %-10s  Ugrás a következő oldalra.\n"
+
+#: info/infodoc.c:99
+#, c-format
+msgid "  %-10s  Move to the `previous' node of this node.\n"
+msgstr "  %-10s  Ugrás az előző oldalra.\n"
+
+#: info/infodoc.c:100
+#, c-format
+msgid "  %-10s  Move `up' from this node.\n"
+msgstr "  %-10s  Ugrás a szülőoldalra.\n"
+
+# ATNEZNI LM
+# Egy másik oldalt meghívó menüelem kiválasztása? - sas
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"              A menüelem kiválasztása miatt egy másik oldal lesz meghívva.\n"
+
+#: info/infodoc.c:103
+#, c-format
+msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
+msgstr ""
+"  %-10s  Kereszthivatkozás követése. A hivatkozás nevének beolvasása.\n"
+
+#: info/infodoc.c:104
+#, c-format
+msgid "  %-10s  Move to the last node seen in this window.\n"
+msgstr "  %-10s  Ugrás az ablakban látható utolsó oldalra.\n"
+
+# hypertext link = ? LM
+# link = lánc, hivatkozás - sas
+#: info/infodoc.c:105
+#, c-format
+msgid "  %-10s  Skip to next hypertext link within this node.\n"
+msgstr "  %-10s  Ugrás az oldalon található következő hypertext linkre.\n"
+
+#: info/infodoc.c:106
+#, c-format
+msgid "  %-10s  Follow the hypertext link under cursor.\n"
+msgstr "  %-10s  A kurzor alatti hypertext link követése.\n"
+
+#: info/infodoc.c:107
+#, c-format
+msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
+msgstr "  %-10s  Ugrás a „directory“-oldalra. Egyenértékű ezzel: „g (DIR)“.\n"
+
+# top node = legfelső szintű oldal ? LM
+# szint nem kell - sas
+#: info/infodoc.c:108
+#, c-format
+msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
+msgstr "  %-10s  Ugrás a legfelső oldalra. Egyenértékű ezzel: „g Top“.\n"
+
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Navigáció egy oldalon belül:\n"
+"----------------------------\n"
+
+# előre / felfele / lefele ? LM
+# előre - sas
+#: info/infodoc.c:112
+#, c-format
+msgid "  %-10s  Scroll forward a page.\n"
+msgstr "  %-10s  Görgetés egy oldalt előre.\n"
+
+# hátra / vissza / felfele / lefele ? LM
+# hátra - sas
+#: info/infodoc.c:113
+#, c-format
+msgid "  %-10s  Scroll backward a page.\n"
+msgstr "  %-10s  Görgetés egy oldalt hátra.\n"
+
+#: info/infodoc.c:114
+#, c-format
+msgid "  %-10s  Go to the beginning of this node.\n"
+msgstr "  %-10s  Ugrás az oldal elejére.\n"
+
+#: info/infodoc.c:115
+#, c-format
+msgid "  %-10s  Go to the end of this node.\n"
+msgstr "  %-10s  Ugrás az oldal végére.\n"
+
+# előre / felfele / lefele ? LM
+# előre - sas
+#: info/infodoc.c:116
+#, c-format
+msgid "  %-10s  Scroll forward 1 line.\n"
+msgstr "  %-10s  Görgetés 1 sorral előre.\n"
+
+# hátra / vissza / felfele / lefele ? LM
+# hátra - sas
+#: info/infodoc.c:117
+#, c-format
+msgid "  %-10s  Scroll backward 1 line.\n"
+msgstr "  %-10s  Görgetés 1 sorral hátra.\n"
+
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Egyéb parancsok:\n"
+"----------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
+msgstr ""
+"  %-10s  Az oldalon található menü első ... kilencedik elemének "
+"kiválasztása.\n"
+
+#: info/infodoc.c:122
+#, c-format
+msgid "  %-10s  Pick last item in node's menu.\n"
+msgstr "  %-10s  Az oldal utolsó menüelemének kiválasztása.\n"
+
+#: info/infodoc.c:125
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search for a specified string in the index entries of this Info\n"
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"\\%-10[index-search]  Megadott szöveg keresése a mostani Info fájlban\n"
+"              és az első találat által mutatott oldal kiválasztása.\n"
+
+#: info/infodoc.c:127
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Move to node specified by name.\n"
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"\\%-10[goto-node]  Ugrás egy névvel megadott oldalra.\n"
+"              A névben akár egy fájl is szerepelhet, például (F�JL)"
+"OLDALNEVE.\n"
+
+#: info/infodoc.c:129
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search forward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[index-search]  Megadott szöveg keresése a mostani Info fájlban\n"
+"              és az első találat által mutatott oldal kiválasztása.\n"
+
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[index-search]  Megadott szöveg keresése a mostani Info fájlban\n"
+"              és az első találat által mutatott oldal kiválasztása.\n"
+
+#: info/infodoc.c:312
+msgid "The current search path is:\n"
+msgstr "Az aktuális keresési útvonal::\n"
+
+#: info/infodoc.c:316
+msgid ""
+"Commands available in Info windows:\n"
+"\n"
+msgstr ""
+"Az Info ablakban elérhető parancsok:\n"
+"\n"
+
+#: info/infodoc.c:320
+msgid ""
+"Commands available in the echo area:\n"
+"\n"
+msgstr ""
+
+#: info/infodoc.c:343
+#, c-format
+msgid ""
+"The following commands can only be invoked via %s:\n"
+"\n"
+msgstr ""
+"A következő parancsok csak %s -n keresztül hívhatók meg:\n"
+"\n"
+
+#: info/infodoc.c:347
+msgid ""
+"The following commands cannot be invoked at all:\n"
+"\n"
+msgstr ""
+"A következő parancsokat egyáltalán nem lehet meghívni:\n"
+"\n"
+
+# súgó szöveg legyen vagy inkább segítő szöveg ? LM
+# súgó - sas
+#: info/infodoc.c:477
+msgid "Display help message"
+msgstr "Súgó szöveg megjelenítése"
+
+# node = oldal ? LM
+#: info/infodoc.c:495
+msgid "Visit Info node `(info)Help'"
+msgstr "Info oldal „(info)Help“ meglátogatása"
+
+# KEY ? LM
+# utána kell nézni, mire vonatkozik, talán dokumentáció kiírása a kulcsszóhoz - sas
+#: info/infodoc.c:633
+msgid "Print documentation for KEY"
+msgstr "Dokumentáció nyomtatása KEY-hez"
+
+# key = kulcs ?
+# key = billentyű / karakter ? LM
+#: info/infodoc.c:645
+#, c-format
+msgid "Describe key: %s"
+msgstr "Leíró billentyű: %s"
+
+#: info/infodoc.c:656
+#, c-format
+msgid "ESC %s is undefined."
+msgstr "ESC %s nincs definiálva."
+
+#: info/infodoc.c:672 info/infodoc.c:701
+#, c-format
+msgid "%s is undefined."
+msgstr "%s nincs definiálva."
+
+#: info/infodoc.c:722
+#, c-format
+msgid "%s is defined to %s."
+msgstr "%s %s-ként van definiálva."
+
+# esetleg egy jobb forditas ide ? LM
+#: info/infodoc.c:1145
+msgid "Show what to type to execute a given command"
+msgstr "Egy adott parancs futtatásához szükséges utasítás megjelenítése"
+
+#: info/infodoc.c:1149
+msgid "Where is command: "
+msgstr "Hol van a parancs: "
+
+# key = kulcs
+# key = billentyű ? LM
+# sztem itt billentyű - sas
+#: info/infodoc.c:1171
+#, c-format
+msgid "`%s' is not on any keys"
+msgstr "„%s“ egy billyentyűn sincs"
+
+#: info/infodoc.c:1178
+#, c-format
+msgid "%s can only be invoked via %s."
+msgstr "%s csak %s-n át hívható meg."
+
+#: info/infodoc.c:1182
+#, c-format
+msgid "%s can be invoked via %s."
+msgstr "%s meghívható %s-n keresztül."
+
+#: info/infodoc.c:1187
+#, c-format
+msgid "There is no function named `%s'"
+msgstr "Nincs „%s“ nevű függvény"
+
+# node = csomópont? LM
+# vagy csak pont? sas
+#: info/infodoc.c:96
+msgid ""
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr ""
+"További oldalak kiválasztása:\n"
+"-----------------------------\n"
+
+# argument = argumentum
+# argument = paraméter ? LM
+#: info/infokey.c:170
+msgid "incorrect number of arguments"
+msgstr "érvénytelen számú argumentum"
+
+#: info/infokey.c:201
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "a(z) „%s“ input fájl nem nyitható meg."
+
+#: info/infokey.c:215
+#, c-format
+msgid "cannot create output file `%s'"
+msgstr "a(z) „%s“ output fájl nem hozható létre."
+
+#: info/infokey.c:226
+#, c-format
+msgid "error writing to `%s'"
+msgstr "hiba „%s“ írásakor."
+
+#: info/infokey.c:232
+#, c-format
+msgid "error closing output file `%s'"
+msgstr "hiba a(z) „%s“ output fájl bezárásakor"
+
+# key sequence = billentyűkombináció ? LM
+# valsz inkább egymás után leütendő billentyűsorozoat - sas
+#: info/infokey.c:450
+msgid "key sequence too long"
+msgstr "a billentyűkombináció túl hosszú"
+
+# key sequence = billentyűkombináció ? LM
+# lehet, hogy inkább egymás után leütendő billentyűsorozoat - sas
+#: info/infokey.c:529
+msgid "missing key sequence"
+msgstr "hiányzó billentyűkombináció "
+
+#: info/infokey.c:610
+msgid "NUL character (\\000) not permitted"
+msgstr "A NUL karakter (\\000) tilos"
+
+#: info/infokey.c:641
+#, c-format
+msgid "NUL character (^%c) not permitted"
+msgstr "A NUL karakter (^%c) tilos"
+
+# action=művelet ? LM
+# általában az - sas
+#: info/infokey.c:665
+msgid "missing action name"
+msgstr "hiányzó műveletnév"
+
+# section=szakasz?
+# A mondat eleje nagybetu vagy kisbetu? LM
+# túl hosszú szakad - ez a biztos - sas
+#: info/infokey.c:681 info/infokey.c:756
+msgid "section too long"
+msgstr "túl hosszú szakasz"
+
+# action=művelet ? LM
+# általában az - sas
+#: info/infokey.c:688
+#, c-format
+msgid "unknown action `%s'"
+msgstr "ismeretlen művelet: „%s“."
+
+#: info/infokey.c:698
+msgid "action name too long"
+msgstr "túl hosszú műveletnév"
+
+# action=muvelet? LM
+# általában az - sas
+#: info/infokey.c:712
+#, c-format
+msgid "extra characters following action `%s'"
+msgstr "`%s' művelet utáni extra karakterek"
+
+#: info/infokey.c:723
+msgid "missing variable name"
+msgstr "hiányzó változónév"
+
+#: info/infokey.c:733
+msgid "missing `=' immediately after variable name"
+msgstr "hiányzó „=“ jel közvetlen egy változónév után"
+
+#: info/infokey.c:741
+msgid "variable name too long"
+msgstr "túl hosszú változónév"
+
+# long = hosszú vagy
+# long = nagy ? LM
+# nagy - kiváló fordítási stílus! - sas
+#: info/infokey.c:765
+msgid "value too long"
+msgstr "túl nagy érték"
+
+#: info/infokey.c:890
+#, c-format
+msgid "\"%s\", line %u: "
+msgstr "„%s“, %u. sor: "
+
+#: info/infokey.c:906
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INPUT-FILE]\n"
+"\n"
+"Compile infokey source file to infokey file.  Reads INPUT-FILE (default\n"
+"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n"
+"\n"
+"Options:\n"
+"  --output FILE        output to FILE instead of $HOME/.info\n"
+"  --help               display this help and exit.\n"
+"  --version            display version information and exit.\n"
+msgstr ""
+
+#: info/infomap.c:955
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too small"
+msgstr ""
+
+#: info/infomap.c:958
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too big"
+msgstr ""
+
+#: info/infomap.c:971
+#, c-format
+msgid "Error reading infokey file `%s' - short read"
+msgstr ""
+
+#: info/infomap.c:990
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
+msgstr ""
+
+#: info/infomap.c:999
+#, c-format
+msgid "Your infokey file `%s' is out of date -- run infokey to update it"
+msgstr ""
+
+#: info/infomap.c:1015
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section length) -- run infokey to update it"
+msgstr ""
+
+#: info/infomap.c:1036
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section code) -- run infokey to update it"
+msgstr ""
+
+#: info/infomap.c:1171
+msgid "Bad data in infokey file -- some key bindings ignored"
+msgstr ""
+
+#: info/infomap.c:1221
+msgid "Bad data in infokey file -- some var settings ignored"
+msgstr ""
+
+#: info/m-x.c:68
+msgid "Read the name of an Info command and describe it"
+msgstr ""
+
+#: info/m-x.c:72
+msgid "Describe command: "
+msgstr "Parancs leírása: "
+
+# FORDITANI
+#: info/m-x.c:95
+msgid "Read a command name in the echo area and execute it"
+msgstr ""
+
+# FORDITANI
+#: info/m-x.c:139
+msgid "Cannot execute an `echo-area' command here."
+msgstr ""
+
+#: info/m-x.c:153
+#, c-format
+msgid "Undefined command: %s"
+msgstr "Definiálatlan parancs: %s"
+
+#: info/m-x.c:159
+msgid "Set the height of the displayed window"
+msgstr "A megjelnített ablak magasságának beállítása"
+
+#: info/m-x.c:172
+#, c-format
+msgid "Set screen height to (%d): "
+msgstr "A képernyő magasságának beállítása (%d): "
+
+# FORDITANI
+#: info/makedoc.c:166 info/makedoc.c:174
+#, c-format
+msgid ""
+"   Source files groveled to make this file include:\n"
+"\n"
+msgstr ""
+
+#: info/makedoc.c:556
+#, c-format
+msgid "Couldn't manipulate the file %s.\n"
+msgstr "A(z) „%s“ fájl nem módosítható.\n"
+
+# node = oldal ? LM
+# containing file ? LM
+# szerintem itt arról a fájlról van szó, amely tartalmazza ezt. (mondjuk: gazdafájl?) - sas
+#: info/nodemenu.c:30
+msgid ""
+"\n"
+"* Menu:\n"
+"  (File)Node                        Lines   Size   Containing File\n"
+"  ----------                        -----   ----   ---------------"
+msgstr ""
+"\n"
+"* Menü:\n"
+"  (Fájl)Oldal                     Sorok  Méret  Fájlt tartalmaz\n"
+"  -----------                     -----  -----  ---------------"
+
+# FORDITANI
+#: info/nodemenu.c:201
+msgid ""
+"Here is the menu of nodes you have recently visited.\n"
+"Select one from this menu, or use `\\[history-node]' in another window.\n"
+msgstr ""
+
+# FORDITANI
+#: info/nodemenu.c:223
+msgid "Make a window containing a menu of all of the currently visited nodes"
+msgstr ""
+
+# FORDITANI
+#: info/nodemenu.c:303
+msgid "Select a node which has been previously visited in a visible window"
+msgstr ""
+
+#: info/nodemenu.c:316
+msgid "Select visited node: "
+msgstr "Meglátogatott oldal kiválasztása: "
+
+#: info/nodemenu.c:336 info/session.c:2443
+#, c-format
+msgid "The reference disappeared! (%s)."
+msgstr "A hivatkozás eltünt! (%s)."
+
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
+#, c-format
+msgid ""
+"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
+"for menu item."
+msgstr ""
+"Üdvözöljük az Info %s verziójában. Segítség kéréséhez a(z) „\\[get-help-"
+"window]“-t, a menühöz ugráshoz a(z) „\\[menu-item]“-t kell begépelni"
+
+#: info/session.c:625
+msgid "Move down to the next line"
+msgstr "Ugrás a következő sorra"
+
+#: info/session.c:661
+msgid "Move up to the previous line"
+msgstr "Ugrás az előző sorra"
+
+#: info/session.c:696
+msgid "Move to the end of the line"
+msgstr "Ugrás a sor végére"
+
+#: info/session.c:716
+msgid "Move to the start of the line"
+msgstr "Ugrás a sor elejére"
+
+#: info/session.c:1007
+msgid "Next"
+msgstr "Következő"
+
+# node=oldal ? LM
+#: info/session.c:1023 info/session.c:1148
+msgid "No more nodes within this document."
+msgstr "Nincs több oldal e dokumentumban."
+
+#: info/session.c:1174
+msgid "No `Prev' for this node."
+msgstr "Nincs „Előző“ oldala e pontnak."
+
+# ATNEZNI LM
+#: info/session.c:1194
+msgid "No `Prev' or `Up' for this node within this document."
+msgstr "Nincs Előző vagy Fel lehetőség e ponthoz e dokumentumban."
+
+#: info/session.c:1256
+msgid "Move forwards or down through node structure"
+msgstr "Mozgás előre vagy le az oldal szerkeztében"
+
+#: info/session.c:1272
+msgid "Move backwards or up through node structure"
+msgstr "Mozgás hátra vagy fel az oldal szerkezetében"
+
+#: info/session.c:1373
+msgid "Scroll forward in this window"
+msgstr "Görgetés előre az ablakban"
+
+#: info/session.c:1381
+msgid "Scroll forward in this window and set default window size"
+msgstr "Görgetés előre az ablakban és beállítása alapértelmezett méretre"
+
+# aktuális ? LM
+# Nem. [semmi], e, jelen, stb. - sas
+#: info/session.c:1389
+msgid "Scroll forward in this window staying within node"
+msgstr "Görgetés előre az ablakban ezen oldalon maradva"
+
+#: info/session.c:1397
+msgid ""
+"Scroll forward in this window staying within node and set default window size"
+msgstr ""
+"Görgetés előre az ablakban ezen oldalon maradva, és az alap ablakméret "
+"beállítása"
+
+#: info/session.c:1405
+msgid "Scroll backward in this window"
+msgstr "Görgetés hátra az ablakban"
+
+#: info/session.c:1413
+msgid "Scroll backward in this window and set default window size"
+msgstr "Görgetés hátra az ablakban és beállítása alapértelmezett méretre"
+
+# aktuális ? LM
+# Nem. [semmi], e, jelen, stb. - sas
+#: info/session.c:1422
+msgid "Scroll backward in this window staying within node"
+msgstr "Görgetés hátra az ablakban ezen oldalon maradva"
+
+#: info/session.c:1430
+msgid ""
+"Scroll backward in this window staying within node and set default window "
+"size"
+msgstr ""
+"Görgetés hátra az ablakban ezen oldalon maradva, és az alap ablakméret "
+"beállítása"
+
+#: info/session.c:1438
+msgid "Move to the start of this node"
+msgstr "Ugrás az oldal elejére"
+
+#: info/session.c:1445
+msgid "Move to the end of this node"
+msgstr "Ugrás az oldal végére"
+
+#: info/session.c:1452
+msgid "Scroll down by lines"
+msgstr "Görgetés soronként le"
+
+#: info/session.c:1469
+msgid "Scroll up by lines"
+msgstr "Görgetés soronként fel"
+
+#: info/session.c:1487
+msgid "Scroll down by half screen size"
+msgstr "Görgetés egy fél képernyőnyit le"
+
+#: info/session.c:1513
+msgid "Scroll up by half screen size"
+msgstr "Görgetés egy fél képernyőnyit fel"
+
+#: info/session.c:1542
+msgid "Select the next window"
+msgstr "Következő ablak kiválasztása"
+
+#: info/session.c:1581
+msgid "Select the previous window"
+msgstr "Előző ablak kiválasztása"
+
+#: info/session.c:1632
+msgid "Split the current window"
+msgstr "Jelen ablak felosztása"
+
+#: info/session.c:1713
+msgid "Delete the current window"
+msgstr "Jelen ablak törlése"
+
+#: info/session.c:1721
+msgid "Cannot delete a permanent window"
+msgstr "Egy állandó ablakot nem lehet törölni"
+
+#: info/session.c:1753
+msgid "Delete all other windows"
+msgstr "Többi ablak bezárása"
+
+#: info/session.c:1799
+msgid "Scroll the other window"
+msgstr "Másik ablak görgetése"
+
+#: info/session.c:1820
+msgid "Scroll the other window backward"
+msgstr "A másik ablak görgetése hátra"
+
+# aktuális ? LM
+# Nem. [semmi], e, jelen, stb. - sas
+#: info/session.c:1826
+msgid "Grow (or shrink) this window"
+msgstr "Jelen ablak növelése (csökkentése)"
+
+#: info/session.c:1837
+msgid "Divide the available screen space among the visible windows"
+msgstr "Elérhető képernyőhely felosztása a látható ablakok közt"
+
+# FORDITANI
+#: info/session.c:1844
+msgid "Toggle the state of line wrapping in the current window"
+msgstr ""
+
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
+msgid "Select the Next node"
+msgstr "Következő oldal kiválasztása"
+
+#: info/session.c:2035
+msgid "Select the Prev node"
+msgstr "Előző oldal kiválasztása"
+
+#: info/session.c:2043
+msgid "Select the Up node"
+msgstr "Szülő oldal kiválasztása"
+
+#: info/session.c:2050
+msgid "Select the last node in this file"
+msgstr "A fájl utolsó oldala kiválasztása"
+
+#: info/session.c:2077 info/session.c:2110
+msgid "This window has no additional nodes"
+msgstr "Jelen ablaknak nincsenek további oldalai"
+
+#: info/session.c:2083
+msgid "Select the first node in this file"
+msgstr "A fájl első oldala kiválasztása"
+
+#: info/session.c:2117
+msgid "Select the last item in this node's menu"
+msgstr "Az oldal menüjében található utolsó elem kiválasztása"
+
+#: info/session.c:2123
+msgid "Select this menu item"
+msgstr "A menüelem kiválasztása"
+
+#: info/session.c:2156
+#, c-format
+msgid "There aren't %d items in this menu."
+msgstr "Nincs %d elem e menüben."
+
+#: info/session.c:2350 info/session.c:2351
+#, c-format
+msgid "Menu item (%s): "
+msgstr "Menüelem (%s): "
+
+#: info/session.c:2354
+msgid "Menu item: "
+msgstr "Menüelem: "
+
+# miért nem Krhiv? :))) - sas
+#: info/session.c:2361 info/session.c:2362
+#, c-format
+msgid "Follow xref (%s): "
+msgstr "Kereszthiv (%s) követése: "
+
+# miért nem Krhiv? :))) - sas
+#: info/session.c:2365
+msgid "Follow xref: "
+msgstr "Kereszthiv követése: "
+
+#: info/session.c:2494
+msgid "Read a menu item and select its node"
+msgstr "Egy menüelem elolvasása és oldalának kiválasztása"
+
+#: info/session.c:2502
+msgid "Read a footnote or cross reference and select its node"
+msgstr ""
+"Egy lábjegyzet vagy kereszthivatkozás elolvasása és oldalának kiválasztása"
+
+#: info/session.c:2508
+msgid "Move to the start of this node's menu"
+msgstr "Ugrás az oldalhoz tartozó menü elejére"
+
+#: info/session.c:2532
+msgid "Visit as many menu items at once as possible"
+msgstr "A lehető legtöbb menüelem meglátogatása egyszerre"
+
+#: info/session.c:2560
+msgid "Read a node name and select it"
+msgstr "Egy oldalnév elolvasása és kiválasztása"
+
+#: info/session.c:2615 info/session.c:2620
+msgid "Goto node: "
+msgstr "Ugrás az oldalra: "
+
+#: info/session.c:2684
+#, c-format
+msgid "No menu in node `%s'."
+msgstr "Nincs menü a(z) „%s“ oldalon."
+
+#: info/session.c:2730
+#, c-format
+msgid "No menu item `%s' in node `%s'."
+msgstr "Nincs „%s“ menüelem a(z) „%s“ oldalon."
+
+# található / találom ? LM
+# lelem, találom, nincs - sas
+#: info/session.c:2760
+#, c-format
+msgid "Unable to find node referenced by `%s' in `%s'."
+msgstr "Nincs a(z) „%s“ által hivatkozott oldal ebben: „%s“."
+
+# FORDITANI
+#: info/session.c:2810
+msgid "Read a list of menus starting from dir and follow them"
+msgstr ""
+
+#: info/session.c:2812
+msgid "Follow menus: "
+msgstr "Menük követése: "
+
+# FORDITANI
+#: info/session.c:3005
+msgid "Find the node describing program invocation"
+msgstr ""
+
+# FORDITANI
+#: info/session.c:3007
+#, c-format
+msgid "Find Invocation node of [%s]: "
+msgstr ""
+
+#: info/session.c:3045
+msgid "Read a manpage reference and select it"
+msgstr "Egy kéziköny oldal hivatkozás olvasása és kiválasztása"
+
+# Kézikönyv ? LM
+# Manpage = kézikönyv oldal. Adott esetben egyszerűen manlapként vagy manoldalként is hivatkozhatunk rájuk, mivel kissé elavultak. A GNU rendszer alapértelemzett dokumentációformátuma az Info. Ezért is olyan fontos a fordítás, amit készítesz :-) (és amibe ey icipicit besegítek ...) - sas
+#: info/session.c:3049
+msgid "Get Manpage: "
+msgstr "Kézikönyv oldal: "
+
+#: info/session.c:3079
+msgid "Select the node `Top' in this file"
+msgstr "Legfelső oldal kiválasztása e fájban"
+
+#: info/session.c:3085
+msgid "Select the node `(dir)'"
+msgstr "A „(dir)“ oldal kiválasztása"
+
+#: info/session.c:3102 info/session.c:3104
+#, c-format
+msgid "Kill node (%s): "
+msgstr "Oldal törlése (%s): "
+
+#: info/session.c:3156
+#, c-format
+msgid "Cannot kill node `%s'"
+msgstr "A(z) „%s“ oldal nem törölhető"
+
+#: info/session.c:3166
+msgid "Cannot kill the last node"
+msgstr "Az utolsó oldal nem törölhető"
+
+#: info/session.c:3252
+msgid "Select the most recently selected node"
+msgstr "A legutóbb választott oldal kiválasztása"
+
+#: info/session.c:3258
+msgid "Kill this node"
+msgstr "Ezen oldal törlése"
+
+#: info/session.c:3266
+msgid "Read the name of a file and select it"
+msgstr "Fájlnév beolvasása és kiválasztása"
+
+#: info/session.c:3270
+msgid "Find file: "
+msgstr "Fájl keresése: "
+
+# található / találom
+# a mondatszerkezet miatt itt jó a nem található - sas
+#: info/session.c:3287
+#, c-format
+msgid "Cannot find `%s'."
+msgstr "„%s“ nem található."
+
+#: info/session.c:3330 info/session.c:3448
+#, c-format
+msgid "Could not create output file `%s'."
+msgstr "A kimeneti fájl („%s“) nem hozható létre."
+
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
+msgid "Done."
+msgstr "Kész."
+
+# írás / mentés ? LM
+# írás - sas
+#: info/session.c:3399
+#, c-format
+msgid "Writing node %s..."
+msgstr "„%s“ oldal írása..."
+
+# pipe/cső ? LM
+# elolvasva, nekem a cső tetszik - sas
+#: info/session.c:3475
+msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+msgstr "Ezen oldal tartalmának csőbe irányítása INFO_PRINT_COMMAND -al"
+
+# pipe / cső ? LM
+# semmiképen nem pipe - sas
+#: info/session.c:3510
+#, c-format
+msgid "Cannot open pipe to `%s'."
+msgstr "Nem hozható létre cső ehhez:  „%s“."
+
+#: info/session.c:3516
+#, c-format
+msgid "Printing node %s..."
+msgstr "%s oldal nyomtatása..."
+
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "Törlés a sor elejéig"
+
+# alállomány ? LM
+# passz - sas
+#: info/session.c:3755
+#, c-format
+msgid "Searching subfile %s ..."
+msgstr "„%s“ alállomány keresése..."
+
+#: info/session.c:3812
+msgid "Read a string and search for it case-sensitively"
+msgstr "Szöveg beolvasása és keresése kis/nagybetű érzékenyen"
+
+#: info/session.c:3819
+msgid "Read a string and search for it"
+msgstr "Szöveg beolvasása és keresése "
+
+#: info/session.c:3827
+msgid "Read a string and search backward for it"
+msgstr "Szöveg beolvasása és keresése fel"
+
+# FORDITANI
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
+msgstr "%s%sa sztringhez [%s]: "
+
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+# érzékenyen / érzékenység
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr "kis/nagybetű érzékenyen"
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
+msgstr "Keresés felfelé"
+
+#: info/session.c:3870
+msgid "Search"
+msgstr "Keresés"
+
+#: info/session.c:3911
+msgid "Search failed."
+msgstr "A keresés sikertelen volt."
+
+#: info/session.c:3929
+msgid "Repeat last search in the same direction"
+msgstr "Utolsó keresés ismétlése azonos irányba"
+
+# keresési feltétel / keresési szöveg / keresett szöveg ? LM
+#: info/session.c:3932 info/session.c:3942
+msgid "No previous search string"
+msgstr "Nincs korábbi keresési feltétel"
+
+#: info/session.c:3939
+msgid "Repeat last search in the reverse direction"
+msgstr "Utolsó keresés ismétlése ellenirányban"
+
+# JAVITANI ?
+#: info/session.c:3958 info/session.c:3964
+msgid "Search interactively for a string as you type it"
+msgstr "Egy szöveg interaktív keresése gépeléskor"
+
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "I.-keresés fel: "
+
+#: info/session.c:4045
+msgid "I-search backward: "
+msgstr "I.-keresés fel: "
+
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "I.-keresés: "
+
+#: info/session.c:4048
+msgid "I-search: "
+msgstr "I.-keresés: "
+
+# checkit
+# FORDITANI
+#: info/session.c:4073 info/session.c:4075
+msgid "Failing "
+msgstr "Sikertelen"
+
+#: info/session.c:4560
+msgid "Move to the previous cross reference"
+msgstr "Ugrás az előző kereszthivatkozásra"
+
+#: info/session.c:4578
+msgid "Move to the next cross reference"
+msgstr "Ugrás a következő kereszthivatkozásra"
+
+#: info/session.c:4600
+msgid "Select reference or menu item appearing on this line"
+msgstr "A sorban megjelenő hivatkozás vagy menüelem kiválasztása"
+
+#: info/session.c:4623
+msgid "Cancel current operation"
+msgstr "Jelen művelet törlése"
+
+#: info/session.c:4630
+msgid "Quit"
+msgstr "Kilépés"
+
+#: info/session.c:4639
+msgid "Move the cursor to a specific line of the window"
+msgstr "A kurzor mogatása az ablak egy adott sorára "
+
+#: info/session.c:4671
+msgid "Redraw the display"
+msgstr "Képernyő frissítése"
+
+# rövidebb forma? Kilépés az Info-ból ? LM
+# általában NAON.! fontos a RÖV.SÉG, de itt kivételesen szerintem maradhat ez - sas
+#: info/session.c:4708
+msgid "Quit using Info"
+msgstr "Az Info használatának befejezése"
+
+#: info/session.c:4721
+msgid "Run command bound to this key's lowercase variant"
+msgstr "E karakter kisbetűs változatához rendelt parancs futtatása"
+
+#: info/session.c:4732
+#, c-format
+msgid "Unknown command (%s)."
+msgstr "Ismeretlen parancs (%s)."
+
+#: info/session.c:4735
+#, c-format
+msgid "\"%s\" is invalid"
+msgstr "\"%s\" érvénytelen"
+
+#: info/session.c:4736
+#, c-format
+msgid "`%s' is invalid"
+msgstr "„%s“ érvénytelen"
+
+#: info/session.c:4950
+msgid "Add this digit to the current numeric argument"
+msgstr "Add hozzá ezt a számjegyet az aktuális numerikus argumentumhoz"
+
+#: info/session.c:4959
+msgid "Start (or multiply by 4) the current numeric argument"
+msgstr "Start (vagy szorozd be 4-gyel) az aktuális numerikus argumentumot"
+
+#: info/session.c:4974
+msgid "Internally used by \\[universal-argument]"
+msgstr "Belső használatra a \\[universal-argument]-nek"
+
+#: info/tilde.c:336
+#, c-format
+msgid "readline: Out of virtual memory!\n"
+msgstr "readline: Nincs több virtuális memória!\n"
+
+# on = be ? LM
+#: info/variables.c:37
+msgid "When \"On\", footnotes appear and disappear automatically"
+msgstr "„Be“ állapotban a lábjegyzetek automatikusan jelennek meg és tűnnek el"
+
+#: info/variables.c:41
+msgid "When \"On\", creating or deleting a window resizes other windows"
+msgstr ""
+"„Be“ állapotban egy ablak létrehozása vagy törlése a többi is átméretezi"
+
+#: info/variables.c:45
+msgid "When \"On\", flash the screen instead of ringing the bell"
+msgstr "„Be“ állapotban a képernyő villog csengő helyett"
+
+#: info/variables.c:49
+msgid "When \"On\", errors cause the bell to ring"
+msgstr "„Be“ állapotban, hibánál csngetés"
+
+#: info/variables.c:53
+msgid "When \"On\", Info garbage collects files which had to be uncompressed"
+msgstr "„Be“ állapotban az Info összegyűjti a tömörítendő fájlokat"
+
+#: info/variables.c:56
+msgid "When \"On\", the portion of the matched search string is highlighted"
+msgstr "„Be“ állapotban a megtalált szövegrészlet ki lesz emelve"
+
+#: info/variables.c:60
+msgid "Controls what happens when scrolling is requested at the end of a node"
+msgstr "Vezérli, hogy mi történjen, ha a görgetés a lap alján történik"
+
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
+msgid "The number lines to scroll when the cursor moves out of the window"
+msgstr "A görgetendő sorok száma, ha akurzor az ablakon kívülre mozog"
+
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
+msgid "When \"On\", Info accepts and displays ISO Latin characters"
+msgstr "„Be“ állapotban az Info elfogadja és kiírja az ISO Latin karaktereket"
+
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "Vezérli, hogy mi történjen, ha a görgetés a lap alján történik"
+
+#: info/variables.c:88
+msgid "Explain the use of a variable"
+msgstr "A változó használatának elmagyarázása"
+
+#: info/variables.c:94
+msgid "Describe variable: "
+msgstr "Változó leírása: "
+
+#: info/variables.c:113
+msgid "Set the value of an Info variable"
+msgstr "Egy Info változó beállítása"
+
+#: info/variables.c:119
+msgid "Set variable: "
+msgstr "Változó beállítása:"
+
+#: info/variables.c:137
+#, c-format
+msgid "Set %s to value (%d): "
+msgstr "%s beállítása (%d): "
+
+#: info/variables.c:178
+#, c-format
+msgid "Set %s to value (%s): "
+msgstr "%s beállítása (%s): "
+
+#: info/window.c:1150
+msgid "--*** Tags out of Date ***"
+msgstr "--*** lejárt dátumú Tagek ***"
+
+#: info/window.c:1161
+msgid "-----Info: (), lines ----, "
+msgstr "-----Info: (), sor ----, "
+
+#: info/window.c:1168
+#, c-format
+msgid "-%s---Info: %s, %d lines --%s--"
+msgstr "-%s---Info: %s, %d sor --%s--"
+
+#: info/window.c:1172
+#, c-format
+msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+msgstr "-%s%s-Info: (%s)%s, %d sor --%s--"
+
+# subfile ? LM
+# Passz - sas
+#: info/window.c:1179
+#, c-format
+msgid " Subfile: %s"
+msgstr "Alfájl: %s"
+
+#: install-info/install-info.c:221
+#, c-format
+msgid "%s: warning: "
+msgstr "%s: figyelem: "
+
+#: install-info/install-info.c:270
+#, c-format
+msgid " for %s"
+msgstr " ehhez: %s"
+
+#: install-info/install-info.c:500
+#, c-format
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tAz opciók teljes listájához próbálja meg a „%s --help“ parancsot!\n"
+
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Használat: %s [OPCIÓK] ... TEXINFO-F�JL...\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Hibajegyek a bug-texinfo@gnu.org,\n"
+"általános kérdések és ötletek a help-texinfo@gnu.org\n"
+"címre küldhetők.\n"
+"Texinfo honlap: http://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
+#, c-format
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: install-info/install-info.c:622
+#, c-format
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s:nem lehet beolvasni (%s) és nem lehet létrehozni (%s)\n"
+
+#: install-info/install-info.c:715
+#, c-format
+msgid "%s: empty file"
+msgstr "%s: üres fájl"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY-nek nincs END-INFO-DIR-ENTRY párja"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY-nek nincsSTART-INFO-DIR-ENTRY párja"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
+#, c-format
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: már van dir fájl: %s\n"
+
+#: install-info/install-info.c:2026
+#, c-format
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Az Info fájlt csak egyszer kell megadni!\n"
+
+#: install-info/install-info.c:2059
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: install-info/install-info.c:2071
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: install-info/install-info.c:2129
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "felesleges parancssori argumentum: „%s“"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ""
+"Nem lett input fájl megadva; további információért próbálja meg a --help-t!"
+
+# dir ? LM
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+"Nem lett dir fájl megadva; további információért próbálja meg a --help-t!"
+
+# dir ? LM
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "nincs info dir bejegyzés „%s“-ben"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "„%s“-hez nem találtam bejegyzést; nincs mit törölni"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr "@%s argumentuma(i) figyelmen kívül lett(ek) hagyva"
+
+#: makeinfo/cmds.c:779
+msgid "January"
+msgstr "Január"
+
+#: makeinfo/cmds.c:779
+msgid "February"
+msgstr "Február"
+
+#: makeinfo/cmds.c:779
+msgid "March"
+msgstr "Március"
+
+#: makeinfo/cmds.c:779
+msgid "April"
+msgstr "�prilis"
+
+#: makeinfo/cmds.c:779
+msgid "May"
+msgstr "Május"
+
+#: makeinfo/cmds.c:780
+msgid "June"
+msgstr "Június"
+
+#: makeinfo/cmds.c:780
+msgid "July"
+msgstr "Július"
+
+#: makeinfo/cmds.c:780
+msgid "August"
+msgstr "Augusztus"
+
+#: makeinfo/cmds.c:780
+msgid "September"
+msgstr "Szeptember"
+
+#: makeinfo/cmds.c:780
+msgid "October"
+msgstr "Október"
+
+#: makeinfo/cmds.c:781
+msgid "November"
+msgstr "November"
+
+#: makeinfo/cmds.c:781
+msgid "December"
+msgstr "December"
+
+#: makeinfo/cmds.c:1131
+#, c-format
+msgid "unlikely character %c in @var"
+msgstr "nem kedvelt karakter %c a @var-ban"
+
+#: makeinfo/cmds.c:1174
+msgid "@sc argument all uppercase, thus no effect"
+msgstr "@sc argumentuma végig nagybetűs, így nincs hatása"
+
+#: makeinfo/cmds.c:1229
+#, c-format
+msgid "`{' expected, but saw `%c'"
+msgstr "„{“-t vártam, de „%c“-t láttam"
+
+#: makeinfo/cmds.c:1269
+msgid "end of file inside verb block"
+msgstr ""
+
+#: makeinfo/cmds.c:1277
+#, c-format
+msgid "`}' expected, but saw `%c'"
+msgstr "„}“-t vártam, de „%c“-t láttam"
+
+#: makeinfo/cmds.c:1308
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1504
+#, c-format
+msgid "%c%s is obsolete"
+msgstr "%c%s elavult"
+
+#: makeinfo/cmds.c:1612
+#, c-format
+msgid "@sp requires a positive numeric argument, not `%s'"
+msgstr "@sp egy pozitív szám argumentumot vár, nem „%s“-t"
+
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
+#, c-format
+msgid "Bad argument to %c%s"
+msgstr "Rossz argumentum ide: %c%s"
+
+# elég / ahogy van ? LM
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
+msgid "asis"
+msgstr ""
+
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
+msgid "none"
+msgstr "nincs"
+
+#: makeinfo/cmds.c:2049
+#, c-format
+msgid "Bad argument to @%s"
+msgstr "Rossz argumentum ide: @%s"
+
+#: makeinfo/cmds.c:2063
+msgid "insert"
+msgstr "beszúr"
+
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Rossz argumentum ide: %s: %s"
+
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr "@%s on vagy off-t vártam, „%s“ helyett"
+
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
+
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Hiányzó „}“ a(z) @def arg.-ban"
+
+#: makeinfo/defun.c:711
+#, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "Csak a(z) „@%s“ környezetben használható a(z) „@%s“"
+
+#: makeinfo/files.c:434
+#, c-format
+msgid "%s: getwd: %s, %s\n"
+msgstr "%s: getwd: %s, %s\n"
+
+#: makeinfo/files.c:637
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr "„%s“ mellőzve lett a kimeneti fájlnév előtt"
+
+#: makeinfo/files.c:645
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr "„%s“ mellőzve lett, mivel a stdout-ra írok"
+
+#: makeinfo/files.c:693
+msgid "Output buffer not empty."
+msgstr "A kimeneti puffer nem üres."
+
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Lásd "
+
+#: makeinfo/footnote.c:149
+#, c-format
+msgid "`%c%s' needs an argument `{...}', not just `%s'"
+msgstr "„%c%s“ argumentumot vár „{...}“, nem csak „%s“-t"
+
+#: makeinfo/footnote.c:164
+#, c-format
+msgid "No closing brace for footnote `%s'"
+msgstr "A(z) „%s“ lábjegyzet záró kapcsoszárójele hiányzik "
+
+#: makeinfo/footnote.c:197
+msgid "Footnote defined without parent node"
+msgstr "Szülő nélkül definiált lábjegyzet"
+
+#: makeinfo/footnote.c:209
+msgid "Footnotes inside footnotes are not allowed"
+msgstr "Lábjegyzetben nem lehet lábjegyzet"
+
+# HTML
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
+msgid "Footnotes"
+msgstr "Lábjegyzetek"
+
+#: makeinfo/html.c:86
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s: A CSS fájl nem nyitható meg: %s"
+
+#: makeinfo/html.c:175
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d: --css-file kommenttel végződik"
+
+#: makeinfo/html.c:421
+msgid "[unexpected] no html tag to pop"
+msgstr "[váratlan] nincs html tag, amit ki lehetne venni"
+
+#: makeinfo/html.c:764
+#, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[váratlan] érvénytelen oldalnév: „%s“"
+
+#: makeinfo/index.c:167
+#, c-format
+msgid "Unknown index `%s'"
+msgstr "Ismeretlen tárgymutató „%s“"
+
+#: makeinfo/index.c:232
+#, c-format
+msgid "Info cannot handle `:' in index entry `%s'"
+msgstr "Az Info nem tudja a „:“-t kezelni a „%s“ tárgymutatóbejegyzésben"
+
+#: makeinfo/index.c:410
+#, c-format
+msgid "Index `%s' already exists"
+msgstr "„%s“ tárgymutató már létezik"
+
+#: makeinfo/index.c:453
+#, c-format
+msgid "Unknown index `%s' and/or `%s' in @synindex"
+msgstr "Ismeretlen tárgymutató „%s“ és/vagy „%s“ itt: @synindex"
+
+#: makeinfo/index.c:676
+msgid "(line )"
+msgstr "(sor )"
+
+#: makeinfo/index.c:684
+#, c-format
+msgid "(line %*d)"
+msgstr "(%*d sor)"
+
+#: makeinfo/index.c:764
+#, c-format
+msgid "Unknown index `%s' in @printindex"
+msgstr "Ismeretlen tárgymutató „%s“ itt: @printindex"
+
+#: makeinfo/index.c:833
+#, c-format
+msgid "Entry for index `%s' outside of any node"
+msgstr "A(z) „%s“ tárgymutató bejegyzése az oldalakon kívülre esik"
+
+#: makeinfo/index.c:836 makeinfo/index.c:872
+msgid "(outside of any node)"
+msgstr "(az oldalakon kívül)"
+
+#: makeinfo/insertion.c:161
+msgid "@item not allowed in argument to @itemize"
+msgstr "@item nem szerepelhet az @itemize argumentumaként"
+
+# checkit
+# What does this mean? -ke-
+#: makeinfo/insertion.c:242
+msgid "Broken-Type in insertion_type_pname"
+msgstr ""
+
+#: makeinfo/insertion.c:338
+msgid "Enumeration stack overflow"
+msgstr ""
+
+#: makeinfo/insertion.c:370
+#, c-format
+msgid "lettering overflow, restarting at %c"
+msgstr ""
+
+# %citem ist ein Texinfo-Befehl
+#: makeinfo/insertion.c:639
+#, c-format
+msgid "%s requires an argument: the formatter for %citem"
+msgstr "%s egy argumentumot igényel: %citem formázását"
+
+# %cfloat ist ein Texinfo-Befehl
+#: makeinfo/insertion.c:727
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr "A %cfloat környezetet nem lehet beágyazni"
+
+#: makeinfo/insertion.c:981
+#, c-format
+msgid "`@end' expected `%s', but saw `%s'"
+msgstr "„@end“-t vártam „%s“, de „%s“-t találtam"
+
+#: makeinfo/insertion.c:1349
+#, c-format
+msgid "No matching `%cend %s'"
+msgstr "Nincs egyező „%cend %s“"
+
+#: makeinfo/insertion.c:1618
+#, c-format
+msgid "%s requires letter or digit"
+msgstr "%s betűt vagy számjegyet tartalmazhat"
+
+#: makeinfo/insertion.c:1718
+msgid "end of file inside verbatim block"
+msgstr "fájlvégét találtam egy nyitott blokkban"
+
+#: makeinfo/insertion.c:1942
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "A(z) @%s -nek nincs értelme a „@float“ környezeten kívül"
+
+#: makeinfo/insertion.c:1978
+msgid "@menu seen before first @node, creating `Top' node"
+msgstr ""
+"@menu-t találtam az első @node előtt. Létrehozom a „Szülő“ (Top) oldalt"
+
+#: makeinfo/insertion.c:1979
+msgid ""
+"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
+msgstr "esetleg a @top oldalt @ifnottex-be kellene tenni, @ifinfo helyett"
+
+#: makeinfo/insertion.c:1991
+msgid "@detailmenu seen before first node, creating `Top' node"
+msgstr ""
+"@detailmenu-t találtam az első @node előtt. Létrehozom a „Szülő“ (Top) oldalt"
+
+#: makeinfo/insertion.c:2047
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"A(z) @%s -nek nincs értelme a „@titlepage“ és a „@quotation“ környezeten "
+"kívül"
+
+#: makeinfo/insertion.c:2061
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "A(z) @%s -nek nincs értelme a „@titlepage“ környezeten kívül"
+
+#: makeinfo/insertion.c:2092
+#, c-format
+msgid "Unmatched `%c%s'"
+msgstr "Nem egyező „%c%s“"
+
+#: makeinfo/insertion.c:2097
+#, c-format
+msgid "`%c%s' needs something after it"
+msgstr "„%c%s“ után még írni kell valamit"
+
+#: makeinfo/insertion.c:2103
+#, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "„%s“ rossz argument ehhez:: „@%s“, „%s“-t használom"
+
+#: makeinfo/insertion.c:2200
+#, c-format
+msgid "@%s not meaningful inside `@%s' block"
+msgstr "@%s -nek nincs jelentése a(z) „@%s“ blokkon belül"
+
+#: makeinfo/insertion.c:2209
+#, c-format
+msgid "@itemx not meaningful inside `%s' block"
+msgstr "@itemx -nek nincs jelentése a(z) „%s“ blokkon belül"
+
+# checkit
+#: makeinfo/insertion.c:2383
+#, c-format
+msgid "%c%s found outside of an insertion block"
+msgstr "%c%s egy beszúrási blokkon kívül található "
+
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
+#, c-format
+msgid "%s is not a valid ISO 639 language code"
+msgstr "%s nem egy ISO 639 szabvány szerinti nyelvkód"
+
+#: makeinfo/lang.c:1399
+#, c-format
+msgid "unrecognized encoding name `%s'"
+msgstr "ismeretlen kódolási név: „%s“"
+
+#: makeinfo/lang.c:1407
+#, c-format
+msgid "sorry, encoding `%s' not supported"
+msgstr "bocsánat, de a(z) „%s“ kódolás nem támogatott"
+
+#: makeinfo/lang.c:1492
+#, c-format
+msgid "invalid encoded character `%s'"
+msgstr "érvénytelen kódolt karakter: „%s“"
+
+#: makeinfo/lang.c:1800
+#, c-format
+msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s „i“-t vagy „j“-t vár argumentumként, nem „%c“-t"
+
+#: makeinfo/lang.c:1804
+#, c-format
+msgid "%c%s expects a single character `i' or `j' as argument"
+msgstr "%c%s egy „i“ vagy „j“ karakter vár argumentumként"
+
+#: makeinfo/macro.c:128
+#, c-format
+msgid "macro `%s' previously defined"
+msgstr "a(z) „%s“ makró már korábban definiált lett"
+
+#: makeinfo/macro.c:132
+#, c-format
+msgid "here is the previous definition of `%s'"
+msgstr "„%s“ korábbi definíciója"
+
+#: makeinfo/macro.c:359
+#, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr ""
+
+#: makeinfo/macro.c:401
+#, c-format
+msgid "Macro `%s' called on line %d with too many args"
+msgstr "A(z) „%s“ makró túl sok argumentummal lett meghívva a %d sorban"
+
+#: makeinfo/macro.c:580
+#, c-format
+msgid "%cend macro not found"
+msgstr "%cend makró nem található"
+
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
+
+#: makeinfo/macro.c:649
+#, c-format
+msgid "mismatched @end %s with @%s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:188
+#, c-format
+msgid "Too many errors!  Gave up.\n"
+msgstr "Túl sok hiba! Feladom.\n"
+
+#: makeinfo/makeinfo.c:306
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: figyelem: "
+
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
+#, c-format
+msgid "Misplaced %c"
+msgstr "Rossz helyen levő %c"
+
+#: makeinfo/makeinfo.c:344
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "További információért próbálja meg a „%s --help“-t.\n"
+
+#: makeinfo/makeinfo.c:347
+#, c-format
+msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
+msgstr "Használat: %s [OPCIÓK] ... TEXINFO-F�JL...\n"
+
+#: makeinfo/makeinfo.c:350
+msgid ""
+"Translate Texinfo source documentation to various other formats, by default\n"
+"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:354
+#, c-format
+msgid ""
+"General options:\n"
+"      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
+"      --force                 preserve output even if errors.\n"
+"      --help                  display this help and exit.\n"
+"      --no-validate           suppress node cross-reference validation.\n"
+"      --no-warn               suppress warnings (but not errors).\n"
+"  -v, --verbose               explain what is being done.\n"
+"      --version               display version information and exit.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:369
+#, no-wrap
+msgid ""
+"Output format selection (default is to produce Info):\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
+msgstr ""
+"Kimeneti formátum választás (az alap az Info):\n"
+"      --docbook               DocBook XML kimenet INfo helyett.\n"
+"      --html                  HTML kimenet Info helyett\n"
+"      --xml                   Texinfo XML kimenet Info helyett\n"
+"      --plaintext             sima szöveg kimenet Info helyett\n"
+
+#: makeinfo/makeinfo.c:377
+msgid ""
+"General output options:\n"
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
+"menus\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:391
+#, c-format
+msgid ""
+"Options for Info and plain text:\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
+"      --fill-column=NUM       break Info lines at NUM characters (default %"
+"d).\n"
+"      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
+"                                `separate' to put them in their own node;\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
+"      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
+"d).\n"
+"                                If VAL is `none', do not indent; if VAL is\n"
+"                                `asis', preserve existing indentation.\n"
+"      --split-size=NUM        split Info files at size NUM (default %d).\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:418
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:425
+msgid ""
+"Input file options:\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:434
+msgid ""
+"Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
+"  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
+"  --ifinfo          process @ifinfo even if not generating Info.\n"
+"  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
+"  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
+"  --no-ifhtml       do not process @ifhtml and @html text.\n"
+"  --no-ifinfo       do not process @ifinfo text.\n"
+"  --no-ifplaintext  do not process @ifplaintext text.\n"
+"  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:453
+msgid ""
+"  The defaults for the @if... conditionals depend on the output format:\n"
+"  if generating HTML, --ifhtml is on and the others are off;\n"
+"  if generating Info, --ifinfo is on and the others are off;\n"
+"  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
+msgstr ""
+
+# Die "." am Zeilenende habe ich entfernt. -ke-
+#: makeinfo/makeinfo.c:461
+msgid ""
+"Examples:\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
+"menus\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:619
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+"%s: Figyelmen kívül hagyom a fel nem ismert TEXINFO_OUTPUT_FORMAT értéket („%"
+"s“).\n"
+
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
+#, c-format
+msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgstr "%s: a(z) %s argumentumának numerikusnak kell lennie, „%s“ helyett.\n"
+
+#: makeinfo/makeinfo.c:680
+#, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "%s: nem tudom a makrókiterjesztés „%s“ kimenetét megnyitni"
+
+#: makeinfo/makeinfo.c:685
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr ""
+"%s: a második makrókiterjesztés „%s“ kimenetét figyelmen kívül hagyom.\n"
+
+#: makeinfo/makeinfo.c:732
+#, c-format
+msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgstr ""
+"%s: a --paragraph-indent argumentumának numerikusnak,  „none“-nak vagy  "
+"„asis“-nek kell lennie, „%s“ helyett.\n"
+
+#: makeinfo/makeinfo.c:750
+#, c-format
+msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgstr ""
+"%s: a --footnote-style argumentumának „separate“-nek vagy  „end“-nek kell "
+"lennie, „%s“ helyett.\n"
+
+#: makeinfo/makeinfo.c:825
+#, c-format
+msgid "%s: missing file argument.\n"
+msgstr "%s: hiányzó fájl argumentum.\n"
+
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr "A többsoros %c%s parancs helytelenül van használva"
+
+#: makeinfo/makeinfo.c:1019
+#, c-format
+msgid "Expected `%s'"
+msgstr "„%s“-t várok"
+
+#: makeinfo/makeinfo.c:1496
+#, c-format
+msgid "Can't create directory `%s': %s"
+msgstr "A(z) „%s“ könyvtár nem hozható létre: %s"
+
+#: makeinfo/makeinfo.c:1542
+#, c-format
+msgid "No `%s' found in `%s'"
+msgstr "Nem található „%s“ ebben: „%s“"
+
+#: makeinfo/makeinfo.c:1622
+#, c-format
+msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
+msgstr ""
+"%s: A makrókiterjesztést átirányítom a stdout-ra, mivel az Info kimete oda "
+"megy.\n"
+
+#: makeinfo/makeinfo.c:1652
+#, c-format
+msgid "Making %s file `%s' from `%s'.\n"
+msgstr "%s fájl („%s“) készítése „%s“-ból.\n"
+
+#: makeinfo/makeinfo.c:1719
+#, c-format
+msgid ""
+"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: A fellépett hibák miatt eltávolítom a(z) „%s“ makró kimeneti állományt; "
+"a megtartásához használja  --force opciót.\n"
+
+#: makeinfo/makeinfo.c:1774
+#, c-format
+msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: A fellépett hibák miatt eltávolítom a(z) „%s“ kimeneti állományt; a "
+"megtartásához használja  --force opciót.\n"
+
+#: makeinfo/makeinfo.c:2068
+#, c-format
+msgid "Unknown command `%s'"
+msgstr "Ismeretlen parancs: „%s“"
+
+#: makeinfo/makeinfo.c:2090
+#, c-format
+msgid "Use braces to give a command as an argument to @%s"
+msgstr "Kapcsos zárójelekkel egy parancsot is megadhat @%s argumentumaként"
+
+#: makeinfo/makeinfo.c:2349
+#, c-format
+msgid "%c%s expected braces"
+msgstr "%c%s kapcsos zárójelpárt vár"
+
+#: makeinfo/makeinfo.c:2362
+msgid "Unmatched }"
+msgstr "Pár nélküli }"
+
+#: makeinfo/makeinfo.c:2410
+msgid "NO_NAME!"
+msgstr "NINCS_NÉV!"
+
+#: makeinfo/makeinfo.c:2431
+#, c-format
+msgid "%c%s missing close brace"
+msgstr "%c%s hiányzó kapcsos bezárójel"
+
+#: makeinfo/makeinfo.c:3434
+#, c-format
+msgid "@image file `%s' (for HTML) not readable: %s"
+msgstr "@image a(z) „%s“ fájl (HTML) nem olvasható: %s"
+
+#: makeinfo/makeinfo.c:3440
+#, c-format
+msgid "No such file `%s'"
+msgstr "Nincs ilyen fájl: „%s“"
+
+#: makeinfo/makeinfo.c:3576
+#, c-format
+msgid "@image file `%s' (for text) unreadable: %s"
+msgstr "@image a(z) „%s“ fájl (szöveges) nem olvasható: %s"
+
+#: makeinfo/makeinfo.c:3585
+msgid "@image missing filename argument"
+msgstr "@image hiányzó fájlnév argumentum"
+
+# flag ? LM
+#: makeinfo/makeinfo.c:3803
+#, c-format
+msgid "undefined flag: %s"
+msgstr "ismeretlen flag: %s"
+
+# checkit
+#: makeinfo/makeinfo.c:3804
+#, c-format
+msgid "{No value for `%s'}"
+msgstr "{„%s“-hoz nincs érték}"
+
+#: makeinfo/makeinfo.c:3856
+#, c-format
+msgid "%c%s requires a name"
+msgstr "%c%s egy nevet igényel"
+
+# AATNEZNI ? LM
+#: makeinfo/makeinfo.c:3962
+#, c-format
+msgid "Reached eof before matching @end %s"
+msgstr "Korábban találtam fájl vége jelet, mint @end-t %s "
+
+#: makeinfo/makeinfo.c:4211
+#, c-format
+msgid "`%.40s...' is too long for expansion; not expanded"
+msgstr ""
+
+#: makeinfo/multi.c:116
+msgid "Missing } in @multitable template"
+msgstr "Hiányzó } a @multitable sablonban"
+
+#: makeinfo/multi.c:260
+#, c-format
+msgid "ignoring stray text `%s' after @multitable"
+msgstr ""
+"figyelmen kívül hagyom a @multitable után álló felesleges „%s“ szöveget"
+
+#: makeinfo/multi.c:400
+#, c-format
+msgid "Too many columns in multitable item (max %d)"
+msgstr "Túl sok oszlop szerepel a multitable elemben (max %d)"
+
+#: makeinfo/multi.c:563
+#, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[váratlan] nem lehet a(z) %d. oszlopot a multitable-ben kiválasztani"
+
+#: makeinfo/multi.c:592
+msgid "ignoring @tab outside of multitable"
+msgstr "figyelmen kívül hagyom a multitable-n kívül eső @tab-ot"
+
+# ATNEZNI ? LM
+#: makeinfo/multi.c:640
+#, c-format
+msgid "** Multicolumn output from last row:\n"
+msgstr "** Multicolumn kimenet az utolsó sortól:\n"
+
+#: makeinfo/multi.c:643
+#, c-format
+msgid "* column #%d: output = %s\n"
+msgstr "* %d. oszlop: kimenet = %s\n"
+
+#: makeinfo/node.c:279
+#, c-format
+msgid "Node `%s' previously defined at line %d"
+msgstr "A(z) „%s“ oldal korábban már definiálva lett a(z) %d. sorban"
+
+#: makeinfo/node.c:647
+#, c-format
+msgid "Formatting node %s...\n"
+msgstr "A(z) %s oldal formázása...\n"
+
+#: makeinfo/node.c:714
+#, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr ""
+"A(z) „%s“ oldalon szerepelnie kell szekcionálás (sectioning) parancsnak (pl. "
+"%c%s)"
+
+#: makeinfo/node.c:878
+#, c-format
+msgid "No node name specified for `%c%s' command"
+msgstr "A(z) „%c%s“ parancshoz nem lett oldalnév rendelve"
+
+#: makeinfo/node.c:919 makeinfo/node.c:1160
+#, c-format
+msgid "Anchor `%s' and node `%s' map to the same file name"
+msgstr "A(z) „%s“ horgony és a(z) „%s“ oldal ugyanarra a fájlnévre mutatnak"
+
+#: makeinfo/node.c:922
+msgid "This @anchor command ignored; references to it will not work"
+msgstr ""
+"Ez az @anchor parancs figyelmen kívül lett hagyva; bármely rá való "
+"hivatkozás nem fog működni"
+
+#: makeinfo/node.c:924 makeinfo/node.c:1163
+msgid "Rename this anchor or use the `--no-split' option"
+msgstr "Nevezze át ezt a horgonyt vagy használja a „--no-split“ opciót"
+
+# split-HTML ? LM
+#: makeinfo/node.c:954
+#, c-format
+msgid "Unexpected string at end of split-HTML file `%s'"
+msgstr "Nem várt szöveg a(z) „%s“ split-HTML fájl végén"
+
+#: makeinfo/node.c:1157
+#, c-format
+msgid "Anchors `%s' and `%s' map to the same file name"
+msgstr "A(z) „%s“ és „%s“ horgonyok ugyanarra a fájlnévre mutatnak"
+
+#: makeinfo/node.c:1162
+msgid "@anchor command ignored; references to it will not work"
+msgstr ""
+"az @anchor parancs figyelmen kívül lett hagyva; bármely rá való hivatkozás "
+"nem fog működni"
+
+#: makeinfo/node.c:1359
+#, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr ""
+"%s egy nem létező oldalra („%s“) hivatkozik (esetleg hibás szekcionálás?)"
+
+# ATNEZNI ? LM
+#: makeinfo/node.c:1459
+#, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"A(z) „%s“ oldalnak a Következő (Next) mezője nem mutat sehova (esetleg hibás "
+"szekcionálás?)"
+
+#: makeinfo/node.c:1462
+#, c-format
+msgid "This node (%s) has the bad Prev"
+msgstr "Ennek az oldalnak (%s) hibás az Előző (Prev) mezője"
+
+# ATNEZNI ? LM
+#: makeinfo/node.c:1517
+#, c-format
+msgid "Prev field of node `%s' not pointed to"
+msgstr "A(z) „%s“ oldalnak az Előző (Prev) mezője nem mutat sehova"
+
+#: makeinfo/node.c:1521
+#, c-format
+msgid "This node (%s) has the bad Next"
+msgstr "Ennek az oldalnak (%s) hibás a Következő (Next) mezője"
+
+#: makeinfo/node.c:1533
+#, c-format
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr "„%s“-nek nincs Szülő (Up) mezője (esetleg hibás szekcionálás?)"
+
+#: makeinfo/node.c:1602
+#, c-format
+msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
+msgstr ""
+"A(z) „%s“ oldal nem tartalmaz menüelemet „%s“-hez, bár ez uóbbi a szülője"
+
+#: makeinfo/node.c:1634
+#, c-format
+msgid "unreferenced node `%s'"
+msgstr "nem hivatkozott oldal „%s“"
+
+#: makeinfo/node.c:1724
+#, c-format
+msgid "Removing %s\n"
+msgstr "Törlés: %s\n"
+
+#: makeinfo/node.c:1728
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Nem törölhető fájl: `%s': %s"
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr "Függelék: %c"
+
+#: makeinfo/sectioning.c:467
+#, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Belső hiba (search_sectioning) „%s“!"
+
+#: makeinfo/sectioning.c:563
+#, c-format
+msgid "Internal error (search_sectioning) \"%s\"!"
+msgstr "Belső hiba (search_sectioning) „%s“!"
+
+#: makeinfo/sectioning.c:624
+#, c-format
+msgid "%c%s is obsolete; use %c%s instead"
+msgstr "%c%s már elavult; használja %c%s-t helyette"
+
+#: makeinfo/sectioning.c:640
+#, c-format
+msgid "Node with %ctop as a section already exists"
+msgstr "Olyan oldal már létezik, amelynek szekciója %ctop"
+
+#: makeinfo/sectioning.c:648
+#, c-format
+msgid "Here is the %ctop node"
+msgstr "�me a %ctop oldal"
+
+#: makeinfo/sectioning.c:664
+#, c-format
+msgid "%ctop used before %cnode, defaulting to %s"
+msgstr ""
+"%ctop korábban szerepel, mint %cnode, az alapértelmezett %s-t használom"
+
+#: makeinfo/xml.c:1669
+#, c-format
+msgid "@image file `%s' unreadable: %s"
+msgstr "@image a(z) „%s“ fájl nem olvasható: %s"
+
+#: makeinfo/xml.c:2014
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+"ha a @headitem a @multitable utolsó elemeként szerepel, akkor a Docbook "
+"kimenet hibás lesz"
+
+# of ? LM
+# Na, ezt nem tudjuk. Vagy elírás és on-off (be-ki), vagy valamiből valamire alkalmazva: of, on: innen: ide: . MI EZ??? TESZTELNI KELL!
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr ""
+
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr ""
+
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr ""
+
+#: makeinfo/xref.c:252
+#, c-format
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr ""
+
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr ""
+
+#: makeinfo/xref.c:390
+#, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr ""
+
+# node = csomópont? LM
+# vagy csak pont? sas
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "Ez az oldal nem tartalmaz kereszthivatkozást."
+
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr ""
+
+#: util/texindex.c:223
+msgid "display this help and exit"
+msgstr "kiírja e súgót és kilép"
+
+#: util/texindex.c:225
+msgid "send output to FILE"
+msgstr "kimenet átirányítása FILE-ba"
+
+#: util/texindex.c:227
+msgid "display version information and exit"
+msgstr "kiírja a verzióinformációt és kilép"
+
+#: util/texindex.c:237
+#, c-format
+msgid "Usage: %s [OPTION]... FILE...\n"
+msgstr "Használat: %s [OPCIÓK]... F�JL...\n"
+
+#: util/texindex.c:238
+#, c-format
+msgid "Generate a sorted index for each TeX output FILE.\n"
+msgstr "Rendezett tárgymutató generálása minden TeX kimeneti fájlhoz.\n"
+
+#: util/texindex.c:241
+#, c-format
+msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
+msgstr "F�JL... általában „foo.%c%c“ alakú egy „foo.texi“ dokumentum esetén.\n"
+
+#: util/texindex.c:243
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Opciók:\n"
+
+#: util/texindex.c:743
+#, c-format
+msgid "failure reopening %s"
+msgstr "Hiba történt „%s“ újbóli megnyitásakor"
+
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: nem Texinfo tárgymutatófájl"
+
+#: util/texindex.c:993
+#, c-format
+msgid "No page number in %s"
+msgstr "Nem található oldalszám ebben: %s"
+
+#: util/texindex.c:1066
+#, c-format
+msgid "entry %s follows an entry with a secondary name"
+msgstr "a(z) %s bejegyzés egy másodlagos névvel rendelkező bejegyzést követ"
+
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10[goto-node]  Ugrás egy névvel megadott oldalra.\n"
+#~ "              A névben akár egy fájl is szerepelhet, például (F�JL)"
+#~ "OLDALNEVE.\n"
+
+# ATNEZNI LM
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "\\%-10[next-node]  Ugrás a következő oldalra.\n"
+
+# tegez/magaz ? LM
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr ""
+#~ "--- A kilépéshez használja a(z) „\\[history-node]“-t vagy a(z)  „\\[kill-"
+#~ "node]“-t ---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr ""
+#~ "\\%-10[move-to-next-xref]  Ugrás az oldalon található előző hypertext "
+#~ "bejegyzésre.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "              Az állománynevet is meg lehet adni: (F�JL)OLDALNEVE.\n"
+
+# követése / betöltése ?
+#~ msgid "Following Next node..."
+#~ msgstr "Következő oldal betöltése..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "1. menüelem kiválasztása..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "Következő oldal kiválasztása..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "Mozgás %d alkalommal felfele, majd a „Következő“ kiválasztása."
+
+# ATNEZNI LM
+#~ msgid "Moving Prev in this window."
+#~ msgstr "Ugrás az Előzőre ebben az ablakban."
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "Mozgás Fel ebben az ablakban."
+
+# oldal ? LM
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "Ugrás az Előző utolsó menüelemére."
+
+#~ msgid " "
+#~ msgstr " "
+
+# Funkció ? LM
+#~ msgid "Function"
+#~ msgstr "Függvény"
+
+#~ msgid "Macro"
+#~ msgstr "Makró"
+
+# checkit
+# Form ? LM
+#~ msgid "Special Form"
+#~ msgstr "Kivételes forma"
+
+#~ msgid "Variable"
+#~ msgstr "Változó"
+
+#~ msgid "User Option"
+#~ msgstr "Felhasználói opció"
+
+# Instance ? LM
+# Példány? - sas
+#~ msgid "Instance Variable"
+#~ msgstr "Példány változó"
+
+#~ msgid "Method"
+#~ msgstr "Metódus"
+
+#~ msgid "Untitled"
+#~ msgstr "Névtelen"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "Ez itt %s, ami a makeinfo %s verziójával (%s) lett generálva.\n"
+
+# HTML
+#~ msgid "Next:"
+#~ msgstr "Következő:"
+
+#~ msgid "Previous:"
+#~ msgstr "Előző:"
+
+# HTML
+#~ msgid "Up:"
+#~ msgstr "Fel:"
+
+#~ msgid "Menu"
+#~ msgstr "Menü"
+
+# ATNEZNI ? LM
+#~ msgid "Cross"
+#~ msgstr "Kereszt"
+
+#~ msgid "Prev"
+#~ msgstr "Előző"
+
+#~ msgid "Up"
+#~ msgstr "Fel"
+
+#, fuzzy
+#~ msgid "see "
+#~ msgstr "Lásd "
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "A(z) „%s“ menüelem már létezik a „%s“ fájlhoz"
+
+# tegez/magaz ? LM
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr ""
+#~ "\\%-10[menu-digit]  Válassza ki az oldalhoz tartozó menü első ... "
+#~ "kilencedik elemét.\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "a(z) „%s“ oldalra %d hivatkozás mutat"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "A @quote-arg csak az egyargumentumos makróknál használatos"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Tartalom"
+
+#~ msgid "Short Contents"
+#~ msgstr "Rövid tartalom"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "az ideiglenes állományok megtartása a feldolgozás után"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr ""
+#~ "a feldolgozás után ne legyenek az ideiglenes állományok megtartva "
+#~ "(alapértelmezett)"
diff --git a/Build/source/utils/texinfo/po/ja.gmo b/Build/source/utils/texinfo/po/ja.gmo
index ff3f98bcc5e..5e8dd901fbc 100644
--- a/Build/source/utils/texinfo/po/ja.gmo
+++ b/Build/source/utils/texinfo/po/ja.gmo
diff --git a/Build/source/utils/texinfo/po/ja.po b/Build/source/utils/texinfo/po/ja.po
index c94fc3ad937..772da707b53 100644
--- a/Build/source/utils/texinfo/po/ja.po
+++ b/Build/source/utils/texinfo/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo 4.0f\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
 "PO-Revision-Date: 2002-01-23 20:46+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -14,132 +14,198 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï¡¢°ú¿ô¤¬É¬ÍפǤ¹\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: `--%s' ¤Ïǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: `%c%s' ¤Ïǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹ -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤¬Û£Ëæ¤Ç¤¹\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, fuzzy, c-format
+msgid "memory exhausted"
+msgstr "²¾ÁÛ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿"
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "°ìʸ»úʬ¿Ê¤á¤ë"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "°ìʸ»úʬÌ᤹"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "¹ÔƬ¤Ë°ÜÆ°"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "¹ÔËö¤Ë°ÜÆ°"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "ñ¸ì°ì¤Äʬ¿Ê¤á¤ë"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "ñ¸ì°ì¤ÄʬÌ᤹"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "¥«¡¼¥½¥ë°ÌÃÖ¤Îʸ»ú¤òºï½ü"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "¥«¡¼¥½¥ë¤Î¸å¤í¤Îʸ»ú¤òºï½ü"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "¥­¥ã¥ó¥»¥ë¡¢Áàºî¤Î¼è¤ê»ß¤á"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "¤³¤Î¹Ô¤ò¼õ¤±Æþ¤ì¤ë(Ëô¤ÏÊä´°¤µ¤»¤ë)"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "¼¡¤Îʸ»ú¤ò¤½¤Î¤Þ¤ÞÁÞÆþ¤¹¤ë"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "¤³¤Îʸ»ú¤òÁÞÆþ¤¹¤ë"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "¥¿¥Öʸ»ú¤òÁÞÆþ¤¹¤ë"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "ʸ»ú¤Î¸ò´¹"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "¥­¥ë¥ê¥ó¥°¤ÎÆâÍƤòŽ¤ê¤Ä¤±¤ë"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "¥­¥ë¥ê¥ó¥°¤¬¶õ¤Ç¤¹"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "°ÊÁ°¤Î¥­¥ë¥ê¥ó¥°ÆâÍƤòÁÞÆþ¤¹¤ë"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "¹ÔËö¤Þ¤Ç¤òÀÚ¤ê¼è¤ë"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "¹ÔƬ¤Þ¤Ç¤òÀÚ¤ê¼è¤ë"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "ñ¸ì¤Î¥«¡¼¥½¥ë¤è¤ê¤â¸å¤òÀÚ¤ê¼è¤ë"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "ñ¸ì¤Î¥«¡¼¥½¥ë¤è¤êÁ°¤òÀÚ¤ê¼è¤ë"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Êä´°¸õÊ䤬¤¢¤ê¤Þ¤»¤ó"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Êä´°¤Ç¤­¤Þ¤»¤ó"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "Êä´°¥ê¥¹¥È"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "Êä´°¤ò¹Ê¤ê¹þ¤ß¤Þ¤·¤¿"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "1 ¤Ä¤ÎÊä´°:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d ¸Ä¤ÎÊä´°\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "Êä´°¤òÁÞÆþ"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "Êä´°¥ê¥¹¥È¤òºîÀ®Ãæ..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "Êä´°¥¦¥£¥ó¥É¥¦¤ò¥¹¥¯¥í¡¼¥ë"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "µÓÃí¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr "¾¤Î¥¦¥£¥ó¥É¥¦Æâ¤Ë¤³¤Î¥Î¡¼¥É¤È´ØÏ¢¤·¤¿µÓÃí¤òɽ¼¨"
 
@@ -147,73 +213,73 @@ msgstr "¾¤Î¥¦¥£¥ó¥É¥¦Æâ¤Ë¤³¤Î¥Î¡¼¥É¤È´ØÏ¢¤·¤¿µÓÃí¤òɽ¼¨"
 msgid "---------- Footnotes ----------"
 msgstr "------------ µÓÃí ------------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Î¸«½Ð¤·¤«¤éʸ»úÎó¤ò¸¡º÷¤¹¤ë"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "¸«½Ð¤·¹àÌܤò¸«¤Ä¤±¤Æ¤¤¤Þ¤¹"
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "¹àÌܤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "¸«½Ð¤·¹àÌÜ: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr "ľÁ°¤Î `\\[index-search]' ¥³¥Þ¥ó¥É¤È°ìÃפ·¤¿¸«½Ð¤·¥¢¥¤¥Æ¥à¤òé¤ë"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "Á°¤Î¸«½Ð¤·¸¡º÷ʸ»úÎ󤬤¢¤ê¤Þ¤»¤ó"
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "¸«½Ð¤·¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó"
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, fuzzy, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "\"%2$s\" ¤ò´Þ¤à%1$s¸«½Ð¤·¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "¤³¤ì°Ê¾å¤Î"
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "*¤³¤ì¤ò¸«¤é¤ì¤Þ¤»¤ó*"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, fuzzy, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "%1$s ¤«¤é \"%2$s\" ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿¡£(`\\[next-index-match]' ¤Ç¼¡¤òõ¤·¤Þ¤¹)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, fuzzy, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "\"%s\" ¤Î¸«½Ð¤·¤òÄ´¤Ù¤Æ¤¤¤Þ¤¹..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, fuzzy, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ë \"%s\" ¤ò»ý¤Ã¤Æ¤¤¤ë info ¥Õ¥¡¥¤¥ë¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr "Á´¤Æ¤Î info ¥Õ¥¡¥¤¥ëʸ»úÎ󤫤鸫½Ð¤·¤òÁöºº¤·¡¢¥á¥Ë¥å¡¼¤òºîÀ®"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "¸ì¶ç¤ò´Þ¤à¹àÌܤò¸¡º÷: "
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -222,118 +288,98 @@ msgstr ""
 "\n"
 "* ¥á¥Ë¥å¡¼: \"%s\" ¤ò´Þ¤à¸«½Ð¤·¹àÌÜ\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "¾Ü¤·¤¯¤Ï --help ¥ª¥×¥·¥ç¥ó¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
-#, fuzzy, c-format
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
-msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
-"\n"
-"ÌõÃí: Èó¾ï¤Ë½ÅÍפÊʸ¾Ï¤Î¤¿¤á¡¢¸¶Ê¸¤ò»Ä¤·¤Æ¤¤¤Þ¤¹¡£\n"
-"  -- »²¹ÍÌõ\n"
-"°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó¡£¤¢¤Ê¤¿¤Ï¡¢GNU General Public Licence ¤Îʸ¸À¤Î²¼¤Ç¡¢\n"
-"¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤òºÆÇÛÉۤǤ­¤Þ¤¹¡£¤³¤ì¤é¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤ÀâÌÀ¤Ï¡¢COPYING\n"
-"¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "`%s' ¤ËÂФ¹¤ë¹àÌܤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: info/info.c:590
-#, fuzzy
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr " --speech-friendly        ²»À¼¹çÀ®´ï¤ËÂФ¹¤ë¿ÆÏÂÀ­¤ò¹â¤á¤ë\n"
-
-#: info/info.c:597
-#, fuzzy, c-format
+#: info/info.c:598
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+#, fuzzy
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr " --speech-friendly        ²»À¼¹çÀ®´ï¤ËÂФ¹¤ë¿ÆÏÂÀ­¤ò¹â¤á¤ë\n"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥á¥Ë¥å¡¼¹àÌÜ...]\n"
-"\n"
-"Info ¥Õ¥©¡¼¥Þ¥Ã¥È¤Î¥É¥­¥å¥á¥ó¥È¤òÆɤࡣ\n"
-"\n"
-"¥ª¥×¥·¥ç¥ó:\n"
-" --apropos=SUBJECT        Á´¥Þ¥Ë¥å¥¢¥ë¤Î¹àÌܤ«¤é¼çÂê¤ò¸«¤Ä¤±¤ë\n"
-" --directory=DIR          DIR ¤ò INFOPATH ¤ËÄɲ乤ë\n"
-" --dribble=FILENAME       FILENAME ¤Ë¥æ¡¼¥¶¤Î¥­¡¼¥¹¥È¥í¡¼¥¯¤ò³Ð¤¨¤Æ¤ª¤¯\n"
-" --file=FILENAME          ˬÌäÀè¥Õ¥¡¥¤¥ë¤ò FIENAME ¤È»ØÄꤹ¤ë\n"
-" --help                   ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë\n"
-" --index-search=STRING    ¹àÌÜ¥¨¥ó¥È¥ê STRING ¤Ç»Ø¼¨¤µ¤ì¤¿¥Î¡¼¥É¤Ë¹Ô¤¯\n"
-" --node=NODENAME          ºÇ½é¤Ëˬ¤ì¤ë Info ¥Õ¥¡¥¤¥ë¤Î¥Î¡¼¥É»ØÄꤹ¤ë\n"
-" --output=FILENAME        ÁªÂò¤µ¤ì¤¿¥Î¡¼¥É¤ò FILENAME ¤Ë½ÐÎϤ¹¤ë\n"
-" --restore=FILENAME       ºÇ½é¤Î¥­¡¼¥¹¥È¥í¡¼¥¯¤ò FILENAME ¤«¤éÆɹþ¤à\n"
-" --show-options, --usage  ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¥Î¡¼¥É¤Ë¹Ô¤¯\n"
-" --subnodes               ½ÐÎÏ¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤òºÆµ¢Åª¤Ë½ÐÎϤ¹¤ë\n"
-"%s --subnodes             ¥á¥Ë¥å¡¼¹àÌܤòºÆµ¢Åª¤Ë½ÐÎϤ¹¤ë\n"
-" --vi-keys                vi ¤ä less ¤Î¤è¤¦¤Ê¥­¡¼¥Ð¥¤¥ó¥É¤ò»È¤¦\n"
-" --version                ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë\n"
-"\n"
-"ºÇ½é¤Ë¥ª¥×¥·¥ç¥ó°Ê³°¤Î°ú¿ô¤¬¤¢¤Ã¤¿¾ì¹ç¡¢¤½¤ì¤Ïµ¯ÅÀ¥á¥Ë¥å¡¼¥¨¥ó¥È¥ê¤È¤Ê¤ê¤Þ"
-"¤¹\n"
-" -- INFOPATH ¤Ë±è¤Ã¤¿Á´¤Æ¤Î `dir' ¥Õ¥¡¥¤¥ë¤«¤é¤¯¤Þ¤Ê¤¯Ãµ¤·¤Þ¤¹\n"
-"¤³¤ì¤¬»ØÄꤵ¤ì¤Ê¤¤¾ì¹ç¡¢¤¹¤Ù¤Æ¤Î `dir' ¥Õ¥¡¥¤¥ë¤ò·Ò¤®¹ç¤ï¤»¤Æɽ¼¨¤·¤Þ¤¹¡£\n"
-"»Ä¤ê¤Î°ú¿ô¤ÏºÇ½é¤ËˬÌ䤵¤ì¤ë¥Î¡¼¥É¤Ë´ØÏ¢¤¹¤ë¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤Î̾Á°¤È¤·¤Æ\n"
-"°·¤ï¤ì¤Þ¤¹¡£\n"
-"\n"
-"Îã:\n"
-"  info                       ºÇ¾å°Ì¤Î dir ¥á¥Ë¥å¡¼¤òɽ¼¨\n"
-"  info emacs                 ºÇ¾å°Ì dir ¤Î emacs ¥Î¡¼¥É¤«¤é³«»Ï\n"
-"  info emacs buffers         emacs ¥Þ¥Ë¥å¥¢¥ëÆâ¤Î buffers ¥Î¡¼¥É¤«¤é³«»Ï\n"
-"  info --show-options emacs  emacs ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¥Î¡¼¥É¤«¤é³«»Ï\n"
-"  info -f ./foo.info         ./foo.info ¤òɽ¼¨¤·¡¢dir ¤Ïõº÷¤·¤Ê¤¤\n"
-"\n"
-"Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org¡¢\n"
-"°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Þ¤Ç¡£\n"
 
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 #, fuzzy
 msgid ""
 "\n"
@@ -345,425 +391,407 @@ msgstr ""
 "Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org¡¢\n"
 "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Þ¤Ç¡£\n"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "`%s' ¥Î¡¼¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "`(%s)%s' ¥Î¡¼¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "¥¦¥£¥ó¥É¥¦¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¥Î¡¼¥ÉÆâ¤Ë¥Ý¥¤¥ó¥È¤¬¸½¤ì¤Þ¤»¤ó¡ª"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "ºÇ¸å¤Î¥¦¥£¥ó¥É¥¦¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó"
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤Ë¥á¥Ë¥å¡¼¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤ËµÓÃí¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤ËÁê¸ß»²¾È¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤Î `%s' ¥Ý¥¤¥ó¥¿¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "̤ÃΤΠInfo ¥³¥Þ¥ó¥É `%c' -- `?' ¤Ç¥Ø¥ë¥×¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "üËö¥¿¥¤¥× `%s' ¤Ï Info ¤òÆ°¤«¤»¤ë¤Û¤ÉÍø¸ý¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "¤³¤³¤Ï¤â¤¦¡¢¤³¤Î¥Î¡¼¥É¤ÎºÇ½ª¥Ú¡¼¥¸¤Ç¤¹¡£"
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "¤³¤³¤Ï¤â¤¦¡¢¤³¤Î¥Î¡¼¥É¤ÎºÇ½é¤Î¥Ú¡¼¥¸¤Ç¤¹¡£"
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "Í£°ì¤Î¥¦¥£¥ó¥É¥¦¡£"
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "·ë²Ì¥¦¥£¥ó¥É¥¦¤¬¾®¤µ¤¹¤®¤ëÍͤǤ¹"
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 "¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦ÍѤξì½ê¤¬Â­¤ê¤Þ¤»¤ó¡¢¥¦¥£¥ó¥É¥¦¤ò°ì¤Äºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: info/infodoc.c:46 info/infodoc.c:95
-#, fuzzy
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
-msgstr "Info ¥¦¥£¥ó¥É¥¦Æâ¤Î´ðËÜ¥³¥Þ¥ó¥É\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
+msgstr ""
 
-#: info/infodoc.c:49
+#: info/infodoc.c:47
 #, fuzzy
-msgid "\\%-10[quit-help]  Quit this help.\n"
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "  %-10s  ¤³¤Î¥Ø¥ë¥×¤ò½ªÎ»¤¹¤ë¡£\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 #, fuzzy
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "  %-10s  Info ¤â°ì½ï¤Ë½ªÎ»¤¹¤ë¡£\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 #, fuzzy
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Info ¥Á¥å¡¼¥È¥ê¥¢¥ë¤òµ¯Æ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
+#: info/infodoc.c:51
 #, fuzzy
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr "¾¤Î¥Î¡¼¥É¤òÁªÂò¤¹¤ë:\n"
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "  %-10s  1 ¹Ôʬ¸åÊý¤ØÌ᤹¡£\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:52
 #, fuzzy
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `¼¡' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "  %-10s  1 ¹ÔʬÁ°Êý¤Ø¤¹¤¹¤á¤ë¡£\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:53
 #, fuzzy
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `Á°' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬¸åÊý¤ØÌ᤹¡£\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:54
 #, fuzzy
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤«¤é `¾å' ¤Ø°ÜÆ°¤¹¤ë¡£\n"
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬Á°Êý¤Ø¿Ê¤á¤ë¡£\n"
+
+#: info/infodoc.c:55
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
+
+#: info/infodoc.c:56
+#, fuzzy
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
 #: info/infodoc.c:58
 #, fuzzy
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
-msgstr ""
-"             ¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤ÎÁªÂò¤Ç¡¢Â¾¤Î¥Î¡¼¥É¤¬ÁªÂò¤µ¤ì¤ë»ö¤Ë¤Ê¤ë¡£\n"
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr "  %-10s  ¤³¤Î¥Î¡¼¥ÉÆâ¤Î¼¡¤Î¥Ï¥¤¥Ñ¡¼¥ê¥ó¥¯¤Ø¥¹¥­¥Ã¥×¤¹¤ë¡£\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
 #, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
-msgstr "  %-10s  Áê¸ß»²¾È¤òé¤ë¡£»²¾È̾¤òÆɤ߼è¤ë¡£\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr "  %-10s  ¥«¡¼¥½¥ë°ÌÃ֤Υϥ¤¥Ñ¡¼¥ê¥ó¥¯¤òé¤ë¡£\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:60
 #, fuzzy
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr "  %-10s  ¤³¤Î¥¦¥£¥ó¥É¥¦¤ÇºÇ¸å¤Ë¸«¤¿¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
 #: info/infodoc.c:62
 #, fuzzy
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr "  %-10s  ¤³¤Î¥Î¡¼¥ÉÆâ¤Î¼¡¤Î¥Ï¥¤¥Ñ¡¼¥ê¥ó¥¯¤Ø¥¹¥­¥Ã¥×¤¹¤ë¡£\n"
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `Á°' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
 #: info/infodoc.c:63
 #, fuzzy
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr "  %-10s  ¤³¤Î¥Î¡¼¥ÉÆâ¤Î¼¡¤Î¥Ï¥¤¥Ñ¡¼¥ê¥ó¥¯¤Ø¥¹¥­¥Ã¥×¤¹¤ë¡£\n"
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `¼¡' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
 #: info/infodoc.c:64
 #, fuzzy
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr "  %-10s  ¥«¡¼¥½¥ë°ÌÃ֤Υϥ¤¥Ñ¡¼¥ê¥ó¥¯¤òé¤ë¡£\n"
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `Á°' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
 #: info/infodoc.c:65
 #, fuzzy
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr "  %-10s  `¥Ç¥£¥ì¥¯¥È¥ê' ¥Î¡¼¥É¤Ø°ÜÆ°¡£`g (DIR)' ¤ÈƱ¤¸¡£\n"
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `¼¡' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
 #: info/infodoc.c:66
 #, fuzzy
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr "  %-10s  Top ¥Î¡¼¥É¤Ø°ÜÆ°¡£`g Top' ¤ÈƱ¤¸¡£\n"
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤«¤é `¾å' ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
+#: info/infodoc.c:67
 #, fuzzy
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr "¥Î¡¼¥ÉÆâ¤Ç¤Î°ÜÆ°:\n"
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:70
+#: info/infodoc.c:68
 #, fuzzy
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
 msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
+#: info/infodoc.c:70
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "  %-10s  ¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎºÇ½é¤«¤é 9 ÈÖÌÜËø¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
+
 #: info/infodoc.c:71
 #, fuzzy
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "  %-10s  ¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎºÇ¸å¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
 
 #: info/infodoc.c:72
 #, fuzzy
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "  %-10s  1 ¹ÔʬÁ°Êý¤Ø¤¹¤¹¤á¤ë¡£\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  ̾Á°¤Ç»ØÄꤷ¤¿¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
 
 #: info/infodoc.c:73
 #, fuzzy
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "  %-10s  1 ¹Ôʬ¸åÊý¤ØÌ᤹¡£\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "  %-10s  Áê¸ß»²¾È¤òé¤ë¡£»²¾È̾¤òÆɤ߼è¤ë¡£\n"
 
 #: info/infodoc.c:74
 #, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬Á°Êý¤Ø¿Ê¤á¤ë¡£\n"
-
-#: info/infodoc.c:75
-#, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬¸åÊý¤ØÌ᤹¡£\n"
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  ̾Á°¤Ç»ØÄꤵ¤ì¤¿¥Î¡¼¥É¤Ë°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
+#: info/infodoc.c:76
 #, fuzzy
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr "¤½¤Î¾¤Î¥³¥Þ¥ó¥É:\n"
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  ¸½ºß¤Î Info ¥Õ¥¡¥¤¥ëÁ´ÂΤò¡¢»ØÄꤵ¤ì¤¿Ê¸»úÎó¤ÇÁ°Êý¸¡º÷¤·¡¢\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:77
 #, fuzzy
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "  %-10s  ¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎºÇ½é¤«¤é 9 ÈÖÌÜËø¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `Á°' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:78
 #, fuzzy
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "  %-10s  ¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎºÇ¸å¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr ""
+"  %-10s  ¸½ºß¤Î Info ¥Õ¥¡¥¤¥ë¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¹àÌܤǡ¢Ê¸»úÎó¤ò»ØÄꤷ¤Æ¸¡º÷¤·¡¢\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
 #, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr "          ºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¹àÌܤ¬»²¾È¤·¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:83
-#, fuzzy
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"               (¥Õ¥¡¥¤¥ë̾)¥Î¡¼¥É̾ ¤ÎÍͤˡ¢¥Õ¥¡¥¤¥ë̾¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ"
-"¤¹¡£\n"
-
-#: info/infodoc.c:85
+#: info/infodoc.c:81
 #, fuzzy
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr "               ¸«¤Ä¤«¤Ã¤¿¤â¤Î¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "¸½ºß¤ÎÁàºî¤òÃæ»ß"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 #, fuzzy
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
-msgstr "               ¸«¤Ä¤«¤Ã¤¿¤â¤Î¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr "Info ¥¦¥£¥ó¥É¥¦Æâ¤Î´ðËÜ¥³¥Þ¥ó¥É\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  ¤³¤Î¥Ø¥ë¥×¤ò½ªÎ»¤¹¤ë¡£\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Info ¤â°ì½ï¤Ë½ªÎ»¤¹¤ë¡£\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Info ¥Á¥å¡¼¥È¥ê¥¢¥ë¤òµ¯Æ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `¼¡' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `Á°' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤«¤é `¾å' ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  ̾Á°¤Ç»ØÄꤷ¤¿¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 "             ¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤ÎÁªÂò¤Ç¡¢Â¾¤Î¥Î¡¼¥É¤¬ÁªÂò¤µ¤ì¤ë»ö¤Ë¤Ê¤ë¡£\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Áê¸ß»²¾È¤òé¤ë¡£»²¾È̾¤òÆɤ߼è¤ë¡£\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  ¤³¤Î¥¦¥£¥ó¥É¥¦¤ÇºÇ¸å¤Ë¸«¤¿¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥ÉÆâ¤Î¼¡¤Î¥Ï¥¤¥Ñ¡¼¥ê¥ó¥¯¤Ø¥¹¥­¥Ã¥×¤¹¤ë¡£\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  ¥«¡¼¥½¥ë°ÌÃ֤Υϥ¤¥Ñ¡¼¥ê¥ó¥¯¤òé¤ë¡£\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  `¥Ç¥£¥ì¥¯¥È¥ê' ¥Î¡¼¥É¤Ø°ÜÆ°¡£`g (DIR)' ¤ÈƱ¤¸¡£\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Top ¥Î¡¼¥É¤Ø°ÜÆ°¡£`g Top' ¤ÈƱ¤¸¡£\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+#, fuzzy
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr "¥Î¡¼¥ÉÆâ¤Ç¤Î°ÜÆ°:\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬Á°Êý¤Ø¿Ê¤á¤ë¡£\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬¸åÊý¤ØÌ᤹¡£\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  1 ¹ÔʬÁ°Êý¤Ø¤¹¤¹¤á¤ë¡£\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  1 ¹Ôʬ¸åÊý¤ØÌ᤹¡£\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:119
+#, fuzzy
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr "¤½¤Î¾¤Î¥³¥Þ¥ó¥É:\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  ¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎºÇ½é¤«¤é 9 ÈÖÌÜËø¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  ¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎºÇ¸å¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-"  %-10s  ¸½ºß¤Î Info ¥Õ¥¡¥¤¥ë¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¹àÌܤǡ¢Ê¸»úÎó¤ò»ØÄꤷ¤Æ¸¡º÷¤·¡¢\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr "          ºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¹àÌܤ¬»²¾È¤·¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  ̾Á°¤Ç»ØÄꤵ¤ì¤¿¥Î¡¼¥É¤Ë°ÜÆ°¤¹¤ë¡£\n"
-
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 "               (¥Õ¥¡¥¤¥ë̾)¥Î¡¼¥É̾ ¤ÎÍͤˡ¢¥Õ¥¡¥¤¥ë̾¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ"
 "¤¹¡£\n"
 
-#: info/infodoc.c:133
+#: info/infodoc.c:129
 #, fuzzy, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  ¸½ºß¤Î Info ¥Õ¥¡¥¤¥ëÁ´ÂΤò¡¢»ØÄꤵ¤ì¤¿Ê¸»úÎó¤ÇÁ°Êý¸¡º÷¤·¡¢\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr "               ¸«¤Ä¤«¤Ã¤¿¤â¤Î¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:135
+#: info/infodoc.c:131
 #, fuzzy, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "\\\\  %-10s  ¸½ºß¤Î Info ¥Õ¥¡¥¤¥ë¤ò¡¢»ØÄꤵ¤ì¤¿Ê¸»úÎó¤Ç¸åÊý¸¡º÷¤·¡¢\n"
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr "               ¸«¤Ä¤«¤Ã¤¿¤â¤Î¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "¸½ºß¤Î¸¡º÷¥Ñ¥¹:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
 msgstr "Info ¥¦¥£¥ó¥É¥¦¤ÇÍøÍѲÄǽ¤Ê¥³¥Þ¥ó¥É:\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr "¥¨¥³¡¼Îΰè¤ÇÍøÍѲÄǽ¤Ê¥³¥Þ¥ó¥É:\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -772,7 +800,7 @@ msgstr ""
 "°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢%s ¤òÄ̤¸¤Æ¤Î¤ßµ¯Æ°¤Ç¤­¤Þ¤¹:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -780,89 +808,72 @@ msgstr ""
 "°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢Á´¤¯µ¯Æ°¤¹¤ë»ö¤¬¤Ç¤­¤Þ¤»¤ó:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-"--- ½ªÎ»¤¹¤ë¤Ë¤Ï `\\[history-node]' ¤« `\\[kill-node]' ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤ ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "»È¤¤Êý¤òɽ¼¨¤¹¤ë"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "`(info)Help' ¥Î¡¼¥É¤Ë°ÜÆ°¤¹¤ë"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "¥­¡¼Áàºî¤òɽ¼¨¤¹¤ë"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "¥­¡¼¤ÎÀâÌÀ: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s ¤Ï %s ¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Í¿¤¨¤é¤ì¤¿¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤Î¤Ë¡¢²¿¤ò¥¿¥¤¥×¤¹¤ë¤«¤òɽ¼¨¤¹¤ë"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "¤É¤Î¥³¥Þ¥ó¥É: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' ¤Ï¥­¡¼³ä¤êÅö¤Æ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s ¤Ï %s ¤òÄ̤¸¤Æ¤Î¤ß¸Æ¤Ó½Ð¤»¤Þ¤¹¡£"
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s ¤Ï %s ¤òÄ̤¸¤Æ¸Æ¤Ó½Ð¤»¤Þ¤¹"
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "`%s' ¤È¤¤¤¦µ¡Ç½¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
+#, fuzzy
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
-msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
-"\n"
-"ÌõÃí: Èó¾ï¤Ë½ÅÍפÊʸ¾Ï¤Î¤¿¤á¡¢¸¶Ê¸¤ò»Ä¤·¤Æ¤¤¤Þ¤¹¡£\n"
-"  -- »²¹ÍÌõ\n"
-"°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó¡£¤¢¤Ê¤¿¤Ï¡¢GNU General Public Licence ¤Îʸ¸À¤Î²¼¤Ç¡¢\n"
-"¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤òºÆÇÛÉۤǤ­¤Þ¤¹¡£¤³¤ì¤é¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤ÀâÌÀ¤Ï¡¢COPYING\n"
-"¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£\n"
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr "¾¤Î¥Î¡¼¥É¤òÁªÂò¤¹¤ë:\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -976,22 +987,22 @@ msgstr ""
 "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org ¤Ø¡¢\n"
 "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Ø¡£\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "ÉÔŬÀÚ¤Ê infokey ¥Õ¥¡¥¤¥ë `%s' ¤ò̵»ë¤·¤Þ¤¹ - ¾®¤µ¤¹¤®¤Þ¤¹"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "ÉÔŬÀÚ¤Ê infokey ¥Õ¥¡¥¤¥ë `%s' ¤ò̵»ë¤·¤Þ¤¹ - Â礭¤¹¤®¤Þ¤¹"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "infokey ¥Õ¥¡¥¤¥ë `%s' Æɹþ¤ßÃæ¤Î¥¨¥é¡¼ -- Á´¤ÆÆɹþ¤á¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -999,13 +1010,13 @@ msgstr ""
 "infokey ¥Õ¥¡¥¤¥ë `%s' ¤¬ÉÔŬÀÚ (¥Þ¥¸¥Ã¥¯Èֹ椬°ã¤¦) ¤Ç¤¹ -- infokey ¤ò¼Â¹Ô¤·"
 "¤Æ¹¹¿·¤·¤Þ¤·¤ç¤¦"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 "¤¢¤Ê¤¿¤Î infokey ¥Õ¥¡¥¤¥ë `%s' ¤Ï¸Å¤¤¤Ç¤¹ -- infokey ¤ò¼Â¹Ô¤·¤Æ¹¹¿·¤·¤Þ¤·¤ç¤¦"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -1013,7 +1024,7 @@ msgstr ""
 "infokey ¥Õ¥¡¥¤¥ë `%s' ¤¬ÉÔŬÀڤǤ¹ (¥»¥¯¥·¥ç¥óŤ¬ÉÔÀµ¤Ç¤¹) -- infokey ¤ò¼Â¹Ô"
 "¤·¤Æ¹¹¿·¤·¤Þ¤·¤ç¤¦"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -1021,48 +1032,48 @@ msgstr ""
 "infokey ¥Õ¥¡¥¤¥ë `%s' ¤¬ÉÔŬÀڤǤ¹ (¥»¥¯¥·¥ç¥ó¥³¡¼¥É¤¬ÉÔÀµ¤Ç¤¹) -- infokey ¤ò"
 "¼Â¹Ô¤·¤Æ¹¹¿·¤·¤Þ¤·¤ç¤¦"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 "infokey ¥Õ¥¡¥¤¥ë¤ËÉÔÀµ¤Ê¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤¹ -- ´ö¤Ä¤«¤Î¥­¡¼¥Ð¥¤¥ó¥É¤¬Ìµ»ë¤µ¤ì¤Þ"
 "¤·¤¿"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "infokey ¥Õ¥¡¥¤¥ë¤ËÉÔÀµ¤Ê¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤¹ -- ´ö¤Ä¤«¤ÎÊÑ¿ôÀßÄ̵꤬»ë¤µ¤ì¤Þ¤·¤¿"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "Info ¥³¥Þ¥ó¥É̾¤È¤½¤ÎÀâÌÀ¤òÆɤà"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "ÀâÌÀ¤¹¤ë¥³¥Þ¥ó¥É: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "¥¨¥³¡¼Îΰè¤Ç¥³¥Þ¥ó¥É̾¤òÆɤߡ¢¼Â¹Ô¤¹¤ë"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "¤³¤³¤Ç¤Ï `echo-area' ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, fuzzy, c-format
 msgid "Undefined command: %s"
 msgstr "ÃΤé¤Ê¤¤¥³¥Þ¥ó¥É `%s'"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "ɽ¼¨¤µ¤ì¤ë¥¦¥£¥ó¥É¥¦¤Î¹â¤µ¤òÀßÄê"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "¥¹¥¯¥ê¡¼¥ó¤Î¹â¤µ¤ò¥»¥Ã¥È (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1071,12 +1082,12 @@ msgstr ""
 "   ¤³¤Î¥Õ¥¡¥¤¥ë¤òºî¤ë¸µ¤Ë¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¾å¼ê¤¯½èÍý¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1088,7 +1099,7 @@ msgstr ""
 "  (¥Õ¥¡¥¤¥ë)¥Î¡¼¥É                  ¹Ô¿ô   ¥µ¥¤¥º  ´Þ¤Þ¤ì¤ë¥Õ¥¡¥¤¥ë\n"
 "  ----------------                  -----   ----   ----------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1098,24 +1109,29 @@ msgstr ""
 "¤¤¡£\n"
 "\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "ºÇ¶áˬ¤ì¤¿¥Î¡¼¥ÉÁ´¤Æ¤Î¥á¥Ë¥å¡¼¤ò´Þ¤ó¤Ç¤¤¤ë¥¦¥£¥ó¥É¥¦¤òºîÀ®"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "ɽ¼¨¤µ¤ì¤Æ¤¤¤ë¥¦¥£¥ó¥É¥¦Æâ¤Î¡¢°ÊÁ°Ë¬¤ì¤¿»ö¤Î¤¢¤ë¥Î¡¼¥É¤òÁªÂò"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "ˬ¤ì¤¿¥Î¡¼¥É¤òÁªÂò: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "¤½¤Î»²¾È¤Ï¾Ã¤¨¤Þ¤·¤¿! (%s)¡£"
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1124,107 +1140,78 @@ msgstr ""
 "Info ¥Ð¡¼¥¸¥ç¥ó %s ¤Ë¤è¤¦¤³¤½¡£\\[get-help-window] ¤Ç»È¤¤Êý¡¢\\[menu-item] ¤Ç"
 "¥á¥Ë¥å¡¼¹àÌܤò¸Æ¤Ó½Ð¤»¤Þ¤¹¡£"
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "¼¡¤Î¹Ô¤Ë°ÜÆ°"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "Á°¤Î¹Ô¤Ë°ÜÆ°"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "¹ÔËö¤Ë°ÜÆ°"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "¹ÔƬ¤Ë°ÜÆ°"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "¼¡"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "¼¡ ¤Î¥Î¡¼¥É¤òé¤Ã¤Æ¤¤¤Þ¤¹..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "ºÇ½é¤Î¥á¥Ë¥å¡¼¹àÌܤòÁªÂò..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "¼¡ ¤Î¥Î¡¼¥É¤òÁªÂò..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "%d ²ó ¾å ¤Ë°ÜÆ°¤·¡¢¤½¤³¤Ç ¼¡ ¤Ø¡£"
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ë¤Ï¡¢¤³¤ì°Ê¾å¤Î¥Î¡¼¥É¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤Î `Á°' ¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤Î Á° ¤Ë°ÜÆ°¤·¤Þ¤¹¡£"
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ç¤Ï¡¢¤³¤Î¥Î¡¼¥É¤Î `Á°' ¤ä `¾å' ¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤Î ¾å ¤Ë°ÜÆ°¤·¤Þ¤¹¡£"
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "`Á°' ¤ÎºÇ¸å¤Î¥á¥Ë¥å¡¼¹àÌܤ˰ÜÆ°¤·¤Þ¤¹¡£"
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "¥Î¡¼¥É¹½Â¤¤òÄ̤¸¤Æ¿Ê¤á¤¿¤ê²¼¤¬¤Ã¤¿¤ê¤¹¤ë"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "¥Î¡¼¥É¹½Â¤¤òÄ̤¸¤ÆÌá¤Ã¤¿¤ê¾å¤¬¤Ã¤¿¤ê¤¹¤ë"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥¹¥¯¥í¡¼¥ë¥À¥¦¥ó"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥¹¥¯¥í¡¼¥ë¤·¡¢¥Ç¥Õ¥©¥ë¥È¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤òÀßÄê"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥Î¡¼¥ÉÈÏ°ÏÆâ¤ÇÁ°Êý¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥Î¡¼¥ÉÈÏ°ÏÆâ¤ÇÁ°Êý¥¹¥¯¥í¡¼¥ë¤·¡¢¥Ç¥Õ¥©¥ë¥È¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤ò"
 "ÀßÄê"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤òµÕ¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤òµÕ¥¹¥¯¥í¡¼¥ë¤·¡¢¥Ç¥Õ¥©¥ë¥È¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤òÀßÄê"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥Î¡¼¥ÉÈÏ°ÏÆâ¤Ç¸åÊý¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1232,398 +1219,431 @@ msgstr ""
 "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥Î¡¼¥ÉÈÏ°ÏÆâ¤Ç¸åÊý¥¹¥¯¥í¡¼¥ë¤·¡¢¥Ç¥Õ¥©¥ë¥È¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤ò"
 "ÀßÄê"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "¤³¤Î¥Î¡¼¥É¤ÎºÇ½é¤Ë°ÜÆ°"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "¤³¤Î¥Î¡¼¥É¤ÎºÇ¸å¤Ë°ÜÆ°"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "¹Ô¿ô¤Ë¤è¤ë¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "¹Ô¿ô¤Ë¤è¤ëµÕ¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "²èÌÌ¥µ¥¤¥º¤ÎȾʬ¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "²èÌÌ¥µ¥¤¥º¤ÎȾʬµÕ¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "¼¡¤Î¥¦¥£¥ó¥É¥¦¤òÁªÂò"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "Á°¤Î¥¦¥£¥ó¥É¥¦¤òÁªÂò"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "¸½ºß¤Î¥¦¥£¥ó¥É¥¦¤òʬ³ä"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "¸½ºß¤Î¥¦¥£¥ó¥É¥¦¤òºï½ü"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "±Êµ×¥¦¥£¥ó¥É¥¦¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "¾¤Î¥¦¥£¥ó¥É¥¦¤òºï½ü"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "¾¤Î¥¦¥£¥ó¥É¥¦¤ò¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "¾¤Î¥¦¥£¥ó¥É¥¦¤òµÕ¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤òÂ礭¤¯¤¹¤ë(¤Þ¤¿¤Ï¾®¤µ¤¯¤¹¤ë)"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "²Ä»ë¥¦¥£¥ó¥É¥¦¤ÎÍøÍѲÄǽ¥¹¥¯¥ê¡¼¥ó¶õ´Ö¤òʬ³ä¤¹¤ë"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "¸½ºß¤Î¥¦¥£¥ó¥É¥¦¤Ë¶Ø§½èÍý¤ò»Ü¤¹"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "¼¡ ¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "Á° ¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "¾å ¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Î¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥Î¡¼¥É¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤»¤ó"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤Î¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "¤³¤Î¥Î¡¼¥É¤Î¥á¥Ë¥å¡¼Æâ¤Ç¤ÎºÇ¸å¤Î¹àÌܤòÁªÂò"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "¤³¤Î¥á¥Ë¥å¡¼¹àÌܤòÁªÂò"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "¤³¤Î¥á¥Ë¥å¡¼¤Ë %d ¸Ä¤Î¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "¥á¥Ë¥å¡¼¹àÌÜ (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "¥á¥Ë¥å¡¼¹àÌÜ: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "»²¾ÈÀè (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "»²¾ÈÀè: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "¥á¥Ë¥å¡¼¤òÆɤó¤Ç¡¢¤½¤Î¥Î¡¼¥É¤òÁªÂò¤¹¤ë"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "µÓÃí¤äÁê¸ß»²¾È¤òÆɤó¤Ç¡¢¤½¤Î¥Î¡¼¥É¤òÁªÂò¤¹¤ë"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "¤³¤Î¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎÀèƬ¤Ë°ÜÆ°¤¹¤ë"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "²Äǽ¤Ê¸Â¤ê¿¤¯¤Î¥á¥Ë¥å¡¼¹àÌܤذìÅÙ¤Ëˬ¤ì¤ë"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "¥Î¡¼¥É̾¤òÆɤó¤Ç¡¢ÁªÂò¤¹¤ë"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "¥Î¡¼¥É¤Ø°ÜÆ°: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "¥Î¡¼¥É `%s' ¤Ë¥á¥Ë¥å¡¼¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à `%s' ¤Ï¥Î¡¼¥É `%s' Ãæ¤Ë¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "`%s' ¤«¤é»²¾È¤µ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó(`%s' Ãæ)"
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "dir ¤«¤é¥á¥Ë¥å¡¼³«»Ï¥ê¥¹¥È¤òÆɤߡ¢¤½¤ì¤òé¤ë"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "¥á¥Ë¥å¡¼¤Ë³¤¯: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "¥×¥í¥°¥é¥àµ¯Æ°¤Ë´Ø¤¹¤ëÀâÌÀ¤Î¥Î¡¼¥É¤ò¸«¤Ä¤±¤ë"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "[%s] ¤Îµ¯Æ°¥Î¡¼¥É¤ò¸«¤Ä¤±¤ë: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "man ¥Ú¡¼¥¸¤Ø¤Î»²¾È¤òÆɤó¤Ç¡¢ÁªÂò¤¹¤ë"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "Man ¥Ú¡¼¥¸¤òɽ¼¨: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Î `ÀèƬ' ¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "`(dir)'¥Î¡¼¥É¤òÁªÂò¤¹¤ë"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "¥Î¡¼¥É¤ÎÀÚ¤ê¼è¤ê (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "`%s' ¥Î¡¼¥É¤òÀÚ¤ê¼è¤ì¤Þ¤»¤ó"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "ºÇ¸å¤Î¥Î¡¼¥É¤ÏÀÚ¤ê¼è¤ì¤Þ¤»¤ó"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "ºÇ¸å¤ËÁªÂò¤µ¤ì¤¿¥Î¡¼¥É¤òÁªÂò¤¹¤ë"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "¤³¤Î¥Î¡¼¥É¤òÀÚ¤ê¼è¤ë"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "¥Õ¥¡¥¤¥ë̾¤òÆɤó¤ÇÁªÂò¤¹¤ë"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "`%s' ¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó¡£"
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "´°Î»¡£"
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "¥Î¡¼¥É %s ¤Î½ñ¤­¹þ¤ß..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "INFO_PRINT_COMMAND ¤Ë¤è¤Ã¤Æ¤³¤Î¥Î¡¼¥É¤ÎÆâÍƤò¥Ñ¥¤¥×¤¹¤ë"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "`%s' ¤Ø¤Î¥Ñ¥¤¥×¤ò³«¤±¤Þ¤»¤ó¡£"
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "¥Î¡¼¥É `%s' ¤ò°õºþ..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "¹ÔƬ¤Þ¤Ç¤òÀÚ¤ê¼è¤ë"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Éû¥Õ¥¡¥¤¥ë %s ¤òõ¤·¤Æ¤¤¤Þ¤¹ ..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr "ʸ»úÎó¤òÆɤߡ¢Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò¤Ä¤±¤Æ¸¡º÷¤¹¤ë"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "ʸ»úÎó¤òÆɤó¤Ç¸¡º÷¤¹¤ë"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "ʸ»úÎó¤òÆɤó¤Ç¸åÊý¸¡º÷¤¹¤ë"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "ʸ»úÎó¤Ø¤Î%s%s [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr "(Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò¤Ä¤±¤Æ) "
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "¸åÊý¸¡º÷"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "¸¡º÷"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr "(Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò¤Ä¤±¤Æ) "
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "¸¡º÷¤Ë¼ºÇÔ¡£"
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "Ʊ°ìÊý¸þ¤ÇºÇ¸å¤Î¸¡º÷¤ò·«¤êÊÖ¤¹"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "Á°¤Î¸¡º÷ʸ»úÎ󤬤¢¤ê¤Þ¤»¤ó"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "µÕÊý¸þ¤ÇºÇ¸å¤Î¸¡º÷¤ò·«¤êÊÖ¤¹"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "ÆþÎϤ·¤¿Ê¸»úÎó¤ÎÂÐÏÃŪ¤Ê¸¡º÷"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "Ã༡¸åÊý¸¡º÷: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "Ã༡¸åÊý¸¡º÷: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "Ã༡¸¡º÷: "
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "Ã༡¸¡º÷: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "¼ºÇÔ "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "Á°¤ÎÁê¸ß»²¾È¤Ë°ÜÆ°"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "¼¡¤ÎÁê¸ß»²¾È¤Ë°ÜÆ°"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "»²¾È¤Þ¤¿¤Ï¡¢¤³¤Î¹Ô¤Ë¸½¤ì¤¿¥á¥Ë¥å¡¼¹àÌܤòÁªÂò"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "¸½ºß¤ÎÁàºî¤òÃæ»ß"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "»ß¤á¤Þ¤·¤¿"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "¥¦¥£¥ó¥É¥¦¤Î»ØÄê¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "²èÌ̤κÆÉÁ²è"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Info ¤Î»ÈÍѤò½ªÎ»"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr "¤³¤Î¥­¡¼¤Î¾®Ê¸»ú¤Ë¥Ð¥¤¥ó¥É¤µ¤ì¤¿¥³¥Þ¥ó¥É¤ò¼Â¹Ô"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "ÉÔÌÀ¤Ê¥³¥Þ¥ó¥É (%s) ¤Ç¤¹¡£"
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" ¤Ï̵¸ú¤Ç¤¹"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, fuzzy, c-format
 msgid "`%s' is invalid"
 msgstr "\"%s\" ¤Ï̵¸ú¤Ç¤¹"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "¸½ºß¤Î¿ôÃÍ°ú¿ô¤Ë¤³¤Î¿ôÃͤò²Ã¤¨¤ë"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "¸½ºß¤Î¿ôÃÍ°ú¿ô¤ò³«»Ï(Ëô¤Ï 4 Çܤ¹¤ë)"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "ÆâÉôŪ¤Ë \\[universal-argument] ¤Ë¤è¤Ã¤ÆÍøÍѤµ¤ì¤Þ¤¹"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: ²¾ÁÛ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿!\n"
@@ -1656,521 +1676,676 @@ msgstr "\"On\" ¤Î»þ¡¢¸¡º÷ʸ»úÎó¤È°ìÃפ·¤¿¾ì½ê¤òȿžɽ¼¨¤µ¤»¤ë"
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "ºÇ¸å¤Î¥Î¡¼¥É¤Ë¤ª¤¤¤Æ¡¢¥¹¥¯¥í¡¼¥ë¤ò¹Ô¤Ê¤Ã¤¿¤È¤­¤ËÆ°ºî¤òÄ´Àá"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "¥«¡¼¥½¥ë¤ò¥¦¥£¥ó¥É¥¦¤Î³°¤ËÆ°¤«¤½¤¦¤È¤·¤¿»þ¤Î¥¹¥¯¥í¡¼¥ë¹Ô¿ô"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "\"On\" ¤Î»þ¡¢Info ¤Ï ISO Latin ʸ»ú¤Îɽ¼¨¤¬²Äǽ¤Ë¤Ê¤ë"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "ºÇ¸å¤Î¥Î¡¼¥É¤Ë¤ª¤¤¤Æ¡¢¥¹¥¯¥í¡¼¥ë¤ò¹Ô¤Ê¤Ã¤¿¤È¤­¤ËÆ°ºî¤òÄ´Àá"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "ÊÑ¿ô¤Î»È¤¤Êý¤ò²òÀ⤹¤ë"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "ÊÑ¿ô¤ÎÀâÌÀ: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Info ÊÑ¿ô¤ÎÃͤòÀßÄê"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "ÊÑ¿ô¤òÀßÄê: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "%s ¤ËÃͤòÀßÄê (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "%s ¤ËÃͤòÀßÄê (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** µì¼°¤Î¥¿¥° ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), ¹Ô¿ô ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d ¹Ô --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d ¹Ô --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Éû¥Õ¥¡¥¤¥ë: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
+msgid "%s: warning: "
+msgstr "%s: ·Ù¹ð: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+msgid " for %s"
+msgstr " %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\t´°Á´¤Ê ¥ª¥×¥·¥ç¥ó¥ê¥¹¥È¤òÆÀ¤ë¤Ë¤Ï `%s --help' ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... TEXINFO¥Õ¥¡¥¤¥ë...\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org¡¢\n"
+"°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Þ¤Ç¡£\n"
+
+#: install-info/install-info.c:597
+#, fuzzy, c-format
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"¤³¤ì¤¬¡¢(dir)Top ¤È¸Æ¤Ð¤ì¤ë Info ³¬ÁؤκǾå°Ì¥Î¡¼¥É¤Î´Þ¤á¤é¤ì¤Æ¤¤¤ë\n"
+".../info/dir ¥Õ¥¡¥¤¥ë¤Ç¤¹¡£\n"
+"¤¢¤Ê¤¿¤¬¡¢»Ï¤á¤Æ Info ¤òµ¯Æ°¤·¤¿¤Î¤Ê¤é¡¢¤Þ¤º¤³¤Î¥Î¡¼¥É¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£\n"
+"\n"
+"%s\t¤³¤ì¤¬¡¢INFO ¥Ä¥ê¡¼¤ÎĺÅÀ¤Ç¤¹\n"
+"\n"
+"  ¤³¤³(the Directory ¥Î¡¼¥É)¤Ç¤Ï¡¢¼ç¤À¤Ã¤¿¼çÂê¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
+"  ¥­¡¼ \"q\" ¤Ç½ªÎ»¤·¡¢\"?\" ¤Ç Info ¤Î¥³¥Þ¥ó¥É¤ò¥ê¥¹¥È¥¢¥Ã¥×¤·¡¢\"d\" ¤Ç¤³¤³"
+"¤Ë\n"
+"  Ìá¤ê¤Þ¤¹¡£\n"
+"  \"h\" ¤ÇƳÆþʸ»ú¤òÆþÎϤ·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\n"
+"  \"mEmacs<Return>\" ¤Ç Emacs ¥Þ¥Ë¥å¥¢¥ë¤òˬ¤ì¤ë¡¢¤Ê¤É¤Ç¤¹¡£\n"
+"\n"
+"  Emacs ¤ÎÆâ¤Ê¤é¤Ð¡¢¥á¥Ë¥å¡¼¹àÌܤäÁê¸ß»²¾È¤ò¡¢¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó 2 ¤ò¥¯¥ê¥Ã¥¯¤·"
+"¤Æ\n"
+"  ÁªÂò¤Ç¤­¤Þ¤¹¡£\n"
+"\n"
+"* ¥á¥Ë¥å¡¼:\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï¡¢°ú¿ô¤¬É¬ÍפǤ¹\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: (%s) ¤òÆɤ᤺¡¢(%s) ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: `--%s' ¤Ïǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
+msgid "%s: empty file"
+msgstr "%s: ¶õ¤Î¥Õ¥¡¥¤¥ë"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY ¤ËÂбþ¤¹¤ë END-INFO-DIR-ENTRY ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY ¤ËÂбþ¤¹¤ë START-INFO-DIR-ENTRY ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: `%c%s' ¤Ïǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Info ¥Õ¥¡¥¤¥ë¤Ï°ìÅÙ¤À¤±»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹ -- %c\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤¬Û£Ëæ¤Ç¤¹\n"
+msgid "excess command line argument `%s'"
+msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹ `%s'"
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ""
+"ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó -- ¾Ü¤·¤¯¤Ï --help ÉդǼ¹Ԥ·¤Æ¤¯¤À¤µ¤¤¡£"
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+"dir ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó -- ¾Ü¤·¤¯¤Ï --help ÉդǼ¹Ԥ·¤Æ²¼¤µ¤¤¡£"
+
+#: install-info/install-info.c:2278
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+msgid "no info dir entry in `%s'"
+msgstr "`%s' ¤Ë Info dir ÍѤιàÌܤ¬¤¢¤ê¤Þ¤»¤ó"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "`%s' ¹àÌܤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó -- ²¿¤âºï½ü¤·¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "°ì·î"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "Æó·î"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "»°·î"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "»Í·î"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "¸Þ·î"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "Ï»·î"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "¼··î"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "Ȭ·î"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "¶å·î"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "½½·î"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "½½°ì·î"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "½½Æó·î"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "@var ¤Ç»È¤¨¤½¤¦¤Ë¤Ê¤¤Ê¸»ú %c"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "Á´¤ÆÂçʸ»ú¤Î @sc °ú¿ô¡¢½¾¤Ã¤Æ¸ú²Ì¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`{' ¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¤¬¡¢`%c' ¤Ç¤·¤¿"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "verb ¥Ö¥í¥Ã¥¯Æâ¤Ç¥Õ¥¡¥¤¥ëËöÈø¤È¤Ê¤ê¤Þ¤·¤¿"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`}' ¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¤¬¡¢`%c' ¤Ç¤·¤¿"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s ¤ÏÇѤ줿̿Îá¤Ç¤¹"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp ¤Ë¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¡¢Àµ¤Î¿ôÃͤòÍ¿¤¨¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "¤½¤Î¤Þ¤Þ"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "¤Ê¤·"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr ""
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "@def °ú¿ô¤Ë `}' ¤ò˺¤ì¤Æ¤¤¤Þ¤¹"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "µ¡Ç½"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "¥Þ¥¯¥í"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Æü췿"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "ÊÑ¿ô"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "¥æ¡¼¥¶¥ª¥×¥·¥ç¥ó"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô"
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "¥á¥½¥Ã¥É"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "of"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "on"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "@def °ú¿ô¤Ë `}' ¤ò˺¤ì¤Æ¤¤¤Þ¤¹"
 
 #: makeinfo/defun.c:711
 #, fuzzy, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "`%2$sx' ¤ò»È¤¦¤¿¤á¤Ë¤Ï `%1$s' ÁÞÆþ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr ""
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr ""
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr ""
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "See "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "`%c%s' ¤Ë¤Ï `%s' ¤À¤±¤Ç¤Ê¤¯¡¢`{...}' ·Á¼°¤Î°ú¿ô¤¬É¬ÍפǤ¹"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "µÓÃí `%s' ¤ÎÊĤ¸¥Ö¥ì¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "µÓÃí¤Ë¿Æ¥Î¡¼¥É¤ÎÄêµÁ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 #, fuzzy
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "µÓÃí¤Ë¿Æ¥Î¡¼¥É¤ÎÄêµÁ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "µÓÃí"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "̵Âê"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, fuzzy, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "ÉÔŬÀڤʥΡ¼¥É̾¤Ç¤¹: `%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "ÉÔÌÀ¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹ `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "¸«½Ð¤· `%s' ¤Ï´û¤Ë¸ºß¤·¤Þ¤¹"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "@synindex ¤Ë¡¢ÃΤé¤Ê¤¤¸«½Ð¤· `%s' ¤ä `%s' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex ¤Ë¡¢ÃΤé¤Ê¤¤¸«½Ð¤· `%s' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "¸«½Ð¤· `%s' ¤Î¥¨¥ó¥È¥ê¤Ï¤¢¤é¤æ¤ë¥Î¡¼¥É¤Î³°Â¦¤Ç¤¹"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(¤¢¤é¤æ¤ë¥Î¡¼¥É¤Î³°Â¦)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "See "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr ""
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "insertion_type_pname Ãæ¤Ë²õ¤ì¤¿·¿¤¬¤¢¤ê¤Þ¤¹"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "ÎóµóÍÑ¥¹¥¿¥Ã¥¯¤¬¥ª¡¼¥Ð¥Õ¥í¡¼¤·¤Þ¤·¤¿"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "¥é¥Ù¥ëʸ»ú¤¬¥ª¡¼¥Ð¡¼¥Õ¥í¡¼¡¢%c ¤ËÌᤷ¤Þ¤¹"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %citem ¤òÀ°·Á¤¹¤ë¤¿¤á"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr ""
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "`@end' ¤Ë¤Ï `%s' ¤¬É¬ÍפǤ¹¤¬¡¢`%s' ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "`%cend %s' ¤È¤ÎÂбþ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s ¤Ë¤Ï±Ñ¿ôʸ»ú¤¬É¬ÍפǤ¹"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "verbatim ¥Ö¥í¥Ã¥¯Ãæ¤Ç¥Õ¥¡¥¤¥ë¤ÎËöÈø¤È¤Ê¤ê¤Þ¤·¤¿"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "`@%2$s' ¥Ö¥í¥Ã¥¯Æ⦤ǤΠ@%1$s ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu ¤¬ºÇ½é¤Î @node °ÊÁ°¤Ë¸½¤ì¤Þ¤·¤¿¡£`Top' ¥Î¡¼¥É¤ò¤Ä¤¯¤ê¤Þ¤¹"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "¿ʬ @top ¥Î¡¼¥É¤Ï @ifinfo ¤è¤ê¤Ï @ifnottex ¤Ëʤ¤ï¤ì¤ë¤Ù¤­¤Ç¤Ï¡©"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu ¤¬ºÇ½é¤Î¥Î¡¼¥É°ÊÁ°¤Ë¸½¤ì¤Þ¤·¤¿¡£`ĺÅÀ' ¥Î¡¼¥É¤òºî¤ê¤Þ¤¹"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "`@%2$s' ¥Ö¥í¥Ã¥¯Æ⦤ǤΠ@%1$s ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "`%c%s' ¤È¤ÎÂбþ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "`%c%s' ¤Î¸å¤í¤Ë¤Ï²¿¤«¤¬É¬ÍפǤ¹"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, fuzzy, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "`%s' ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô `%s'¡£`%s' ¤ò»È¤¤¤Þ¤¹"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "`@%2$s' ¥Ö¥í¥Ã¥¯Æ⦤ǤΠ@%1$s ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "`%s' ¥Ö¥í¥Ã¥¯Æ⦤ǤΠ@itemx ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "ÁÞÆþ¥Ö¥í¥Ã¥¯³°¤Ç¡¢%c%s ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ¤ÏÍ­¸ú¤Ê ISO 639 ¸À¸ì¥³¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾ `%s' ¤òǧ¼±¤Ç¤­¤Þ¤»¤ó"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "»ÄÇ°¤Ê¤¬¤é¡¢¥¨¥ó¥³¡¼¥É `%s' ¤Ï¼õ¤±ÉÕ¤±¤é¤ì¤Þ¤»¤ó"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "¥¨¥ó¥³¡¼¥Éʸ»ú `%s' ¤¬Ìµ¸ú¤Ç¤¹"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s ¤Ï `%c' ¤Ç¤Ï¤Ê¤¯¡¢`i' ¤« `j' ¤ò°ú¿ô¤È¤·¤ÆɬÍפȤ·¤Þ¤¹"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s ¤Ï°ú¿ô¤È¤·¤Æ `i' ¤« `j' ¤Î¤¤¤º¤ì¤«°ìʸ»ú¤¬É¬ÍפǤ¹"
@@ -2185,7 +2360,7 @@ msgstr "¥Þ¥¯¥í `%s' ¤Ï°ÊÁ°¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹"
 msgid "here is the previous definition of `%s'"
 msgstr "¤³¤³¤Ï¡¢`%s' ¤ÎÁ°¤ÎÄêµÁ¤Ç¤¹"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, fuzzy, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "¥Þ¥¯¥íŸ³«Æâ¤Î \\ ¤Î¸å¤í¤Ë \\ ¤ä¥Ñ¥é¥á¥¿Ì¾¤Ç¤Ï¤Ê¤¯ `%s' ¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
@@ -2195,46 +2370,50 @@ msgstr "¥Þ¥¯¥íŸ³«Æâ¤Î \\ ¤Î¸å¤í¤Ë \\ ¤ä¥Ñ¥é¥á¥¿Ì¾¤Ç¤Ï¤Ê¤¯ `%s' ¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "¥Þ¥¯¥í `%s' ¸Æ¤Ó½Ð¤·(%d¹ÔÌÜ)¤Î°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend ¥Þ¥¯¥í¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg ¤Ï¡¢°ú¿ô¤ò°ì¤ÄÍ¿¤¨¤¿¤È¤­¤Î¤ßÍ­¸ú¤Ç¤¹"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@%2$s ¤È°ìÃפ·¤Ê¤¤ @end %1$s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "¥¨¥é¡¼¤¬Â¿¤¹¤®¤Þ¤¹!  Äü¤á¤Þ¤·¤¿¡£\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: ·Ù¹ð: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "´Ö°ã¤Ã¤¿°ÌÃÖ¤Ë %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¾Ü¤·¤¯¤Ï `%s --help' ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... TEXINFO¥Õ¥¡¥¤¥ë...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2242,17 +2421,17 @@ msgstr ""
 "Texinfo ¥½¡¼¥¹Ê¸½ñ¤òÍÍ¡¹¤Ê·Á¼°¤ÇÆɤá¤ë¤è¤¦¤ËÊÑ´¹¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï\n"
 "¥ª¥ó¥é¥¤¥ó¤Ç Emacs ¤äñÆȤΠGNU Info ¤ÇÆɤà¤Î¤ËŬ¤·¤¿ Info ¥Õ¥¡¥¤¥ë¤Ç¤¹¡£\n"
 
-#: makeinfo/makeinfo.c:350
-#, c-format
+#: makeinfo/makeinfo.c:354
+#, fuzzy, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
@@ -2268,14 +2447,14 @@ msgstr ""
 "  -v, --verbose               ¹Ô¤Ê¤ï¤ì¤ë»ö¤òÀâÌÀ¤¹¤ë¡£\n"
 "      --version               ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë¡£\n"
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 "½ÐÎÏ·Á¼°¥»¥¯¥·¥ç¥ó (¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï Info ¤òÀ¸À®¤·¤Þ¤¹):\n"
 "      --docbook             Info ¤Ç¤Ï¤Ê¤¯ DocBook ¤ò½ÐÎϤ¹¤ë¡£\n"
@@ -2285,21 +2464,24 @@ msgstr ""
 "                              ¤Ä¤±¤Ê¤¤¤Èɸ½à½ÐÎϤ˽ñ¤­¹þ¤à\n"
 "      --xml                 Info ¤Ç¤Ï¤Ê¤¯ XML (TexinfoML) ·Á¼°¤Ç½ÐÎϤ¹¤ë¡£\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
 #, fuzzy
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 "°ìÈ̽ÐÎÏ¥ª¥×¥·¥ç¥ó:\n"
 "  -E, --macro-expand FILE   ¥Þ¥¯¥íŸ³«¤µ¤ì¤¿¥½¡¼¥¹¤ò FILE ¤Ë½ÐÎϤ¹¤ë¡£\n"
@@ -2310,18 +2492,21 @@ msgstr ""
 "  -o, --output=FILE         FILE ¤Ø½ÐÎϤ¹¤ë (ʬ³ä HTML ¤Î¾ì¹ç¥Ç¥£¥ì¥¯¥È"
 "¥ê)¡£\n"
 
-#: makeinfo/makeinfo.c:386
-#, c-format
+#: makeinfo/makeinfo.c:391
+#, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2342,24 +2527,27 @@ msgstr ""
 "                                ¤À¤È¡¢´û¸¤Î»ú²¼¤²¤ò¤½¤Î¤Þ¤Þ»È¤¦¡£\n"
 "      --split-size=NUM        Info ¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤ò NUM ¤Çʬ³ä (default %d)\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 #, fuzzy
 msgid ""
 "Input file options:\n"
@@ -2376,7 +2564,7 @@ msgstr ""
 "  -P DIR                         @include õº÷¥Ñ¥¹¤ÎÀèƬ¤Ë DIR ¤òÁÞÆþ¤¹¤ë¡£\n"
 "  -U VAR                         ÊÑ¿ô VAR ¤ò̤ÄêµÁ¤Ë¤¹¤ë¡£@clear ¤ÈƱ¤¸¡£\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
@@ -2404,7 +2592,7 @@ msgstr ""
 "     --no-ifinfo   @ifinfo ¥Æ¥¯¥¹¥È¤ò½èÍý¤·¤Ê¤¤¡£\n"
 "     --no-iftex    @iftex ¤ä @tex ¥Æ¥¯¥¹¥È¤ò½èÍý¤·¤Ê¤¤¡£\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -2417,20 +2605,21 @@ msgstr ""
 "  HTML ¤òÀ¸À®¤¹¤ë¤Ê¤é --ifhtml ¤¬Í­¸ú¤Ç¾¤Ï̵¸ú¤Ç¤¹¡£\n"
 "  Info ¤ä¥×¥ì¥¤¥ó¥Æ¥¯¥¹¥È¤òÀ¸À®¤¹¤ë¤Ê¤é --ifinfo ¤¬Í­¸ú¤Ç¾¤Ï̵¸ú¤Ç¤¹¡£\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 #, fuzzy
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "Îã:\n"
 "  makeinfo foo.texi                    foo ¤Î @setfilename ¤Ë Info ¤ò½ñ¹þ¤à\n"
@@ -2439,83 +2628,77 @@ msgstr ""
 "  makeinfo --number-sections foo.texi  Àá¤ËÈÖ¹æ¤òÉÕ¤±¤¿ Info ¤ò½ÐÎÏ\n"
 "  makeinfo --no-split foo.texi         Â礭¤µ¤Ë´Ø¤ï¤é¤º°ì¤Ä¤Î Info ¤ò½ÐÎÏ\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s °ú¿ô¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¤Æ¡¢¿ôÃͤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "¥Þ¥¯¥í³ÈÄ¥½ÐÎÏ `%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, fuzzy, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "¥Þ¥¯¥í³ÈÄ¥½ÐÎÏ `%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: --paragraph-indent °ú¿ô¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¡¢¿ôÃÍ/`none'/`asis' ¤Ç¤Ê¤±¤ì¤Ð\n"
 "    ¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: --footnote-style °ú¿ô¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¡¢`separate' Ëô¤Ï `end' ¤Ç¤Ê¤±¤ì¤Ð\n"
 "    ¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ¥Õ¥¡¥¤¥ë°ú¿ô¤ò˺¤ì¤Æ¤¤¤Þ¤¹¤è\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "¤³¤³¤Ç¤Ï `%s' ¤¬Í׵ᤵ¤ì¤Þ¤¹"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê `%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%2$s' ¤Ë `%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr "%s: Info ¤Î½ÐÎϤò¹Ô¤Ê¤¦¤Î¤Ç¡¢¥Þ¥¯¥í³ÈÄ¥¤òɸ½à½ÐÎϤ˽ÐÎϤ·¤Þ¤»¤ó¡£\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "`%3$s' ¤«¤é %1$s ¥Õ¥¡¥¤¥ë `%2$s' ¤òºîÀ®¤·¤Þ¤¹¡£\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr ""
-"¤³¤ì¤Ï %1$s¡¢%3$s ¤è¤ê makeinfo ¥Ð¡¼¥¸¥ç¥ó %2$s ¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤Þ¤·¤¿¡£\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2523,81 +2706,81 @@ msgstr ""
 "%s: ¥¨¥é¡¼¤Ë¤è¤ê¡¢¥Þ¥¯¥í½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òºï½ü¤·¤Þ¤¹¡£\n"
 "       -- »Ä¤·¤¿¤¤¾ì¹ç¤Ë¤Ï `--force' ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: ¥¨¥é¡¼¤Ë¤è¤ê¡¢½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òºï½ü¤·¤Þ¤¹¡£\n"
 "       -- »Ä¤·¤¿¤¤¾ì¹ç¤Ë¤Ï `--force' ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "ÃΤé¤Ê¤¤¥³¥Þ¥ó¥É `%s'"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "@%s ¤Ø¤Î°ú¿ô¤È¤·¤Æ¥³¥Þ¥ó¥É¤òÍ¿¤¨¤ë¤Ë¤Ï¡¢¥Ö¥ì¡¼¥¹¤ò»È¤¤¤Þ¤·¤ç¤¦"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s ¤Ë¤Ï `{...}' ¤¬É¬ÍפǤ¹"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "Âбþ¤Î¤Ê¤¤ }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "̾Á°¤¬Ìµ¤¤¡ª"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "ÊĤ¸¤ë¥Ö¥ì¡¼¥¹¤Î¤Ê¤¤ %c%s"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image ¥Õ¥¡¥¤¥ë `%s' (HTML ÍÑ) ¤¬Æɤá¤Þ¤»¤ó: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "`%2$s' ¤Ë `%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image ¥Õ¥¡¥¤¥ë `%s' (text ÍÑ) ¤¬Æɤá¤Þ¤»¤ó: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "@image ¤Ë¥Õ¥¡¥¤¥ë̾¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{`%s' ¤ÎÃͤ¬¤Ê¤¤}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s ¤Ë¤Ï̾Á°¤¬É¬ÍפǤ¹"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "@end %s ¤ÎÂбþ¤ÎÁ°¤Ë¥Õ¥¡¥¤¥ë¤Î½ª¤ê¤Ë½Ð¤¯¤ï¤·¤Þ¤·¤¿"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
@@ -2606,162 +2789,129 @@ msgstr ""
 msgid "Missing } in @multitable template"
 msgstr "@multitable ¥Æ¥ó¥×¥ì¡¼¥È¤Ë } ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "@multitable ¤Î¸å¤í¤Î¥Æ¥¯¥¹¥È `%s' ¤ò̵»ë¤·¤Þ¤¹"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "¥Þ¥ë¥Á¥Æ¡¼¥Ö¥ë¹àÌÜÆâ¤Î¥«¥é¥à¿ô¤¬Â¿¤¹¤®¤Þ¤¹(ºÇÂç %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, fuzzy, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "¥Þ¥ë¥Á¥Æ¡¼¥Ö¥ëÆâ¤Ç¤Ï¡¢Âè %d ¹Ô¤òÁªÂò¤Ç¤­¤Þ¤»¤ó"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "¥Þ¥ë¥Á¥Æ¡¼¥Ö¥ë¤Î³°Â¦¤Î @tab ¤ò̵»ë¤·¤Þ¤¹"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** ¥Þ¥ë¥Á¥«¥é¥à¤ÎºÇ¸å¤ÎÎ󤫤é½ÐÎÏ\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* Âè %d ¥«¥é¥à: ½ÐÎÏ = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "¥Î¡¼¥É `%s' Á°(%d ¹ÔÌÜ)¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "¥Î¡¼¥É %s ¤òÀ°·ÁÃæ...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, fuzzy, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "¥Î¡¼¥É `%s' ¤Ë¤Ï¥»¥¯¥·¥ç¥óÍÑ¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹(Îã: %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "`%c%s' ¥³¥Þ¥ó¥É¤Ë»ØÄꤵ¤ì¤¿¥Î¡¼¥É̾¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "¥¢¥ó¥«¡¼ `%s' ¤È¥Î¡¼¥É `%s' ¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤·¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "¤³¤Î @anchor ¥³¥Þ¥ó¥É¤Ï̵»ë¤µ¤ì¤Þ¤¹ -- ¤½¤³¤Ø¤Î»²¾È¤ÏÆ°ºî¤·¤Þ¤»¤ó"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "¤³¤Î¥¢¥ó¥«¡¼Ì¾¤òÊѹ¹¤¹¤ë¤« `--no-split' ¥ª¥×¥·¥ç¥ó¤ò»È¤¤¤Þ¤·¤ç¤¦"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "split-HTML ¥Õ¥¡¥¤¥ë `%s' ¤Î½ª¤ê¤Ë¡¢¤¢¤ë¤Ï¤º¤Î¤Ê¤¤Ê¸»úÎ󤬤¢¤ê¤Þ¤¹"
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "¼¡:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Á°:"
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "¾å:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "¥¢¥ó¥«¡¼ `%s' ¤È `%s' ¤¬Æ±¤¸¥Õ¥¡¥¤¥ë̾¤Ë¥Þ¥Ã¥×¤·¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor ¥³¥Þ¥ó¥É¤Ï̵»ë¤µ¤ì¤Þ¤¹ -- ¤½¤³¤Ø¤Î»²¾È¤ÏÆ°ºî¤·¤Þ¤»¤ó"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s ¤Ï¸ºß¤·¤Ê¤¤¥Î¡¼¥É `%s' ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "¥á¥Ë¥å¡¼"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Áê¸ß"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, fuzzy, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "¥Î¡¼¥É `%s' ¤Î¼¡¤Î¥Õ¥£¡¼¥ë¥É¤¬¥Î¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤»¤ó -- "
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "¤³¤Î¥Î¡¼¥É (%s) ¤Ï¤­¤Á¤ó¤È Á° ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "Á°"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "¥Î¡¼¥É `%s' ¤ÎÁ°¤Î¥Õ¥£¡¼¥ë¥É¤¬¥Î¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤»¤ó -- "
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "¤³¤Î¥Î¡¼¥É (%s) ¤Ï¤­¤Á¤ó¤È ¼¡ ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "¾å"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 "¥Î¡¼¥É `%s' ¤Ë¤Ï ¾å°Ì¹àÌܤ¬¤¢¤ë¤Î¤Ë¡¢`%s' ¤Ø¤Î¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "¥Î¡¼¥É `%s' ¤Ï´û¤Ë %d ²ó»²¾È¤µ¤ì¤Æ¤¤¤Þ¤¹"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "»²¾È¤µ¤ì¤Æ¤¤¤Ê¤¤¥Î¡¼¥É `%s'"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê `%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s"
@@ -2776,269 +2926,105 @@ msgstr "ÉÕÏ¿ %c "
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "ÆâÉô¥¨¥é¡¼ (Àáõº÷Ãæ) \"%s\"!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "ÆâÉô¥¨¥é¡¼ (Àáõº÷Ãæ) \"%s\"!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s ¤ÏÇѻߤ·¤Þ¤·¤¿¡£ -- Âå¤ï¤ê¤Ë %c%s ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "%ctop ¤Î¥Î¡¼¥É¤Ï¡¢¥»¥¯¥·¥ç¥ó¤È¤·¤Æ´û¤Ë¸ºß¤·¤Þ¤¹"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "¤³¤³¤Ï %ctop ¥Î¡¼¥É¤Ç¤¹"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop ¤¬ %cnode ¤ÎÁ°¤Ë»È¤ï¤ì¤Þ¤·¤¿¡¢%s ¤Ë·è¤á¤¦¤Á¤·¤Þ¤¹"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Ìܼ¡"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "´Ê°×Ìܼ¡"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image ¥Õ¥¡¥¤¥ë `%s' ¤¬Æɤá¤Þ¤»¤ó: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: ·Ù¹ð: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " %s"
-
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\t´°Á´¤Ê ¥ª¥×¥·¥ç¥ó¥ê¥¹¥È¤òÆÀ¤ë¤Ë¤Ï `%s --help' ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
-
-#: util/install-info.c:434
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [INFO¥Õ¥¡¥¤¥ë [DIR¥Õ¥¡¥¤¥ë]]\n"
-"\n"
-"Info ¥Ç¥£¥ì¥¯¥È¥ê¥Õ¥¡¥¤¥ë `DIR¥Õ¥¡¥¤¥ë' Æâ¤Î `INFO¥Õ¥¡¥¤¥ë' ¤«¤é\n"
-"dir ¥¨¥ó¥È¥ê¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Þ¤¿¤Ïºï½ü¤·¤Þ¤¹¡£\n"
-"\n"
-"¥ª¥×¥·¥ç¥ó:\n"
-" --delete          ¸½Â¸¤¹¤ë INFO¥Õ¥¡¥¤¥ë ¤Î¹àÌܤò DIR¥Õ¥¡¥¤¥ë ¤«¤éºï½ü¤¹¤ë\n"
-"                     -- ¿·¤¿¤Ê¹àÌܤòÁÞÆþ¤·¤Ê¤¤\n"
-" --dir-file=NAME   Info ¥Ç¥£¥ì¥¯¥È¥ê¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤹ¤ë\n"
-"                     DIR-FILE °ú¿ô¤òÍøÍѤ¹¤ë¤Î¤ÈƱ¤¸\n"
-" --entry=TEXT      Info ¥Ç¥£¥ì¥¯¥È¥ê¹àÌܤȤ·¤Æ TEXT ¤òÁÞÆþ¤¹¤ë\n"
-"                     TEXT ¤Ï¡¢Info ¤Î¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤Î¹Ô¤Î·Á¼°¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é"
-"¤º\n"
-"                     ¤³¤ì¤Ë¡¢¶õÇò¤Ç»Ï¤Þ¤ë¤¤¤¯¤Ä¤«¤Î¹Ô¤òÄɲäǤ­¤ë\n"
-"                     Ê£¿ô¹Ô¤Î¹àÌܤò»ØÄꤷ¤¿¾ì¹ç¡¢Á´¤Æ¤¬²Ã¤¨¤é¤ì¤ë\n"
-"                     ¹àÌܤò»ØÄꤷ¤Ê¤±¤ì¤Ð¡¢Info ¥Õ¥¡¥¤¥ë¼«¿È¤Î¾ðÊó¤Ë¤è¤Ã¤Æ\n"
-"                     ·èÄꤹ¤ë\n"
-" --help            »È¤¤Êý¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë¡£\n"
-" --info-file=FILE  ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë Info ¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë\n"
-"                     INFO-FILE °ú¿ô¤òÍøÍѤ¹¤ë¤Î¤ÈƱ¤¸\n"
-" --info-dir=DIR    --dir-file=DIR/dir ¥ª¥×¥·¥ç¥ó¤ÈƱ¤¸\n"
-" --item=TEXT       --entry TEXT ¥ª¥×¥·¥ç¥ó¤ÈƱ¤¸\n"
-"                     Info ¥Ç¥£¥ì¥¯¥È¥ê¹àÌܤϼºݤ˥á¥Ë¥å¡¼¹àÌܤˤʤë\n"
-" --quiet           ·Ù¹ð¥á¥Ã¥»¡¼¥¸¤òÍÞÀ©¤¹¤ë\n"
-" --remove          --delete ¥ª¥×¥·¥ç¥ó¤ÈƱ¤¸\n"
-" --section=SEC     ¥Ç¥£¥ì¥¯¥È¥ê¤Î SEC ¥»¥¯¥·¥ç¥ó¤Ë¤³¤Î¥Õ¥¡¥¤¥ë¤Î¹àÌܤòÃÖ¤¯\n"
-"                     Ê£¿ô¤Î¥»¥¯¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥»¥¯¥·¥ç¥óËè¤ËÁ´¤Æ¤Î¹à"
-"ÌÜ\n"
-"                     ¤¬Äɲ䵤ì¤ë\n"
-"                     ¥»¥¯¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¡¢Info ¥Õ¥¡¥¤¥ë¼«¿È¤Î¾ðÊó¤Ë\n"
-"                     ¤è¤Ã¤Æ·èÄꤹ¤ë\n"
-" --version         ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë¡£\n"
-"\n"
-"Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org¡¢\n"
-"°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Þ¤Ç¡£\n"
-
-#: util/install-info.c:488
-#, fuzzy, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
-msgstr ""
-"¤³¤ì¤¬¡¢(dir)Top ¤È¸Æ¤Ð¤ì¤ë Info ³¬ÁؤκǾå°Ì¥Î¡¼¥É¤Î´Þ¤á¤é¤ì¤Æ¤¤¤ë\n"
-".../info/dir ¥Õ¥¡¥¤¥ë¤Ç¤¹¡£\n"
-"¤¢¤Ê¤¿¤¬¡¢»Ï¤á¤Æ Info ¤òµ¯Æ°¤·¤¿¤Î¤Ê¤é¡¢¤Þ¤º¤³¤Î¥Î¡¼¥É¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£\n"
-"\n"
-"%s\t¤³¤ì¤¬¡¢INFO ¥Ä¥ê¡¼¤ÎĺÅÀ¤Ç¤¹\n"
-"\n"
-"  ¤³¤³(the Directory ¥Î¡¼¥É)¤Ç¤Ï¡¢¼ç¤À¤Ã¤¿¼çÂê¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
-"  ¥­¡¼ \"q\" ¤Ç½ªÎ»¤·¡¢\"?\" ¤Ç Info ¤Î¥³¥Þ¥ó¥É¤ò¥ê¥¹¥È¥¢¥Ã¥×¤·¡¢\"d\" ¤Ç¤³¤³"
-"¤Ë\n"
-"  Ìá¤ê¤Þ¤¹¡£\n"
-"  \"h\" ¤ÇƳÆþʸ»ú¤òÆþÎϤ·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\n"
-"  \"mEmacs<Return>\" ¤Ç Emacs ¥Þ¥Ë¥å¥¢¥ë¤òˬ¤ì¤ë¡¢¤Ê¤É¤Ç¤¹¡£\n"
-"\n"
-"  Emacs ¤ÎÆâ¤Ê¤é¤Ð¡¢¥á¥Ë¥å¡¼¹àÌܤäÁê¸ß»²¾È¤ò¡¢¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó 2 ¤ò¥¯¥ê¥Ã¥¯¤·"
-"¤Æ\n"
-"  ÁªÂò¤Ç¤­¤Þ¤¹¡£\n"
-"\n"
-"* ¥á¥Ë¥å¡¼:\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: (%s) ¤òÆɤ᤺¡¢(%s) ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: ¶õ¤Î¥Õ¥¡¥¤¥ë"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY ¤ËÂбþ¤¹¤ë END-INFO-DIR-ENTRY ¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY ¤ËÂбþ¤¹¤ë START-INFO-DIR-ENTRY ¤¬¤¢¤ê¤Þ¤»¤ó"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "of"
 
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr ""
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "on"
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Info ¥Õ¥¡¥¤¥ë¤Ï°ìÅÙ¤À¤±»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "Áê¸ß»²¾È¤Ø¤ÎÂè°ì°ú¿ô¤¬¶õ¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
 
-#: util/install-info.c:1284
+#: makeinfo/xref.c:252
 #, c-format
-msgid "excess command line argument `%s'"
-msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹ `%s'"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
-"ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó -- ¾Ü¤·¤¯¤Ï --help ÉդǼ¹Ԥ·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
 msgstr ""
-"dir ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó -- ¾Ü¤·¤¯¤Ï --help ÉդǼ¹Ԥ·¤Æ²¼¤µ¤¤¡£"
 
-#: util/install-info.c:1313
-#, c-format
-msgid "no info dir entry in `%s'"
-msgstr "`%s' ¤Ë Info dir ÍѤιàÌܤ¬¤¢¤ê¤Þ¤»¤ó"
+#: makeinfo/xref.c:390
+#, fuzzy, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "`.' ¤ä ',' ¤Ï %c ¤Ç¤Ï¤Ê¤¯¡¢Áê¸ß»²¾È¤Ë³¤±¤é¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "¥á¥Ë¥å¡¼¹àÌÜ `%s' ¤Ï¡¢`%s' ¤Ë´û¤Ë¸ºß¤·¤Þ¤¹"
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "¤³¤Î¥Î¡¼¥É¤ËÁê¸ß»²¾È¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "`%s' ¹àÌܤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó -- ²¿¤âºï½ü¤·¤Þ¤»¤ó¤Ç¤·¤¿"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "@inforef ¤Ø¤ÎÂè°ì°ú¿ô¤Ï¶õ¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "»È¤¤Êý¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "½èÍý¤Î¸å¤Ë¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë¤ò»Ä¤·¤Æ¤ª¤­¤Þ¤¹"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "½èÍý¤Î¤¢¤È¤Ë¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹ (default)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "½ÐÎϤò FILE ¤ËÁ÷¤ê¤Þ¤¹"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... ¥Õ¥¡¥¤¥ë...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "TeX ¤Î°Ù¤Î¥½¡¼¥ÈºÑ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 "`foo.texi' ʸ½ñ¤ËÂФ·¤Æ¤Ï¡¢Ä̾ï¤Ï¥Õ¥¡¥¤¥ë¤È¤·¤Æ `foo.%c%c' ¤ò»ØÄꤷ¤Þ¤¹¡£\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3047,27 +3033,418 @@ msgstr ""
 "\n"
 "¥ª¥×¥·¥ç¥ó:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: texinfo ¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "%s ¤ÎºÆ¥ª¡¼¥×¥ó¤Ë¼ºÇÔ"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: texinfo ¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "%s ¤Ë¥Ú¡¼¥¸Èֹ椬¤¢¤ê¤Þ¤»¤ó"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "%s ¹àÌܤËÆó¤ÄÌܤιàÌÜ̾¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "               ¸«¤Ä¤«¤Ã¤¿¤â¤Î¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "               (¥Õ¥¡¥¤¥ë̾)¥Î¡¼¥É̾ ¤ÎÍͤˡ¢¥Õ¥¡¥¤¥ë̾¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ"
+#~ "¤¹¡£\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `¼¡' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr "  %-10s  `¥Ç¥£¥ì¥¯¥È¥ê' ¥Î¡¼¥É¤Ø°ÜÆ°¡£`g (DIR)' ¤ÈƱ¤¸¡£\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr "  %-10s  Top ¥Î¡¼¥É¤Ø°ÜÆ°¡£`g Top' ¤ÈƱ¤¸¡£\n"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-forward-page-only]  Scroll forward within this node.\n"
+#~ msgstr "  %-10s  1 ¹ÔʬÁ°Êý¤Ø¤¹¤¹¤á¤ë¡£\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[scroll-backward-page-only]  Scroll backward within this node.\n"
+#~ msgstr "  %-10s  1 ¹Ôʬ¸åÊý¤ØÌ᤹¡£\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr "               ¸«¤Ä¤«¤Ã¤¿¤â¤Î¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr ""
+#~ "--- ½ªÎ»¤¹¤ë¤Ë¤Ï `\\[history-node]' ¤« `\\[kill-node]' ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤ "
+#~ "---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr "  %-10s  ¤³¤Î¥Î¡¼¥ÉÆâ¤Î¼¡¤Î¥Ï¥¤¥Ñ¡¼¥ê¥ó¥¯¤Ø¥¹¥­¥Ã¥×¤¹¤ë¡£\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥á¥Ë¥å¡¼¹àÌÜ...]\n"
+#~ "\n"
+#~ "Info ¥Õ¥©¡¼¥Þ¥Ã¥È¤Î¥É¥­¥å¥á¥ó¥È¤òÆɤࡣ\n"
+#~ "\n"
+#~ "¥ª¥×¥·¥ç¥ó:\n"
+#~ " --apropos=SUBJECT        Á´¥Þ¥Ë¥å¥¢¥ë¤Î¹àÌܤ«¤é¼çÂê¤ò¸«¤Ä¤±¤ë\n"
+#~ " --directory=DIR          DIR ¤ò INFOPATH ¤ËÄɲ乤ë\n"
+#~ " --dribble=FILENAME       FILENAME ¤Ë¥æ¡¼¥¶¤Î¥­¡¼¥¹¥È¥í¡¼¥¯¤ò³Ð¤¨¤Æ¤ª¤¯\n"
+#~ " --file=FILENAME          ˬÌäÀè¥Õ¥¡¥¤¥ë¤ò FIENAME ¤È»ØÄꤹ¤ë\n"
+#~ " --help                   ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë\n"
+#~ " --index-search=STRING    ¹àÌÜ¥¨¥ó¥È¥ê STRING ¤Ç»Ø¼¨¤µ¤ì¤¿¥Î¡¼¥É¤Ë¹Ô¤¯\n"
+#~ " --node=NODENAME          ºÇ½é¤Ëˬ¤ì¤ë Info ¥Õ¥¡¥¤¥ë¤Î¥Î¡¼¥É»ØÄꤹ¤ë\n"
+#~ " --output=FILENAME        ÁªÂò¤µ¤ì¤¿¥Î¡¼¥É¤ò FILENAME ¤Ë½ÐÎϤ¹¤ë\n"
+#~ " --restore=FILENAME       ºÇ½é¤Î¥­¡¼¥¹¥È¥í¡¼¥¯¤ò FILENAME ¤«¤éÆɹþ¤à\n"
+#~ " --show-options, --usage  ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¥Î¡¼¥É¤Ë¹Ô¤¯\n"
+#~ " --subnodes               ½ÐÎÏ¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤òºÆµ¢Åª¤Ë½ÐÎϤ¹¤ë\n"
+#~ "%s --subnodes             ¥á¥Ë¥å¡¼¹àÌܤòºÆµ¢Åª¤Ë½ÐÎϤ¹¤ë\n"
+#~ " --vi-keys                vi ¤ä less ¤Î¤è¤¦¤Ê¥­¡¼¥Ð¥¤¥ó¥É¤ò»È¤¦\n"
+#~ " --version                ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë\n"
+#~ "\n"
+#~ "ºÇ½é¤Ë¥ª¥×¥·¥ç¥ó°Ê³°¤Î°ú¿ô¤¬¤¢¤Ã¤¿¾ì¹ç¡¢¤½¤ì¤Ïµ¯ÅÀ¥á¥Ë¥å¡¼¥¨¥ó¥È¥ê¤È¤Ê¤ê¤Þ"
+#~ "¤¹\n"
+#~ " -- INFOPATH ¤Ë±è¤Ã¤¿Á´¤Æ¤Î `dir' ¥Õ¥¡¥¤¥ë¤«¤é¤¯¤Þ¤Ê¤¯Ãµ¤·¤Þ¤¹\n"
+#~ "¤³¤ì¤¬»ØÄꤵ¤ì¤Ê¤¤¾ì¹ç¡¢¤¹¤Ù¤Æ¤Î `dir' ¥Õ¥¡¥¤¥ë¤ò·Ò¤®¹ç¤ï¤»¤Æɽ¼¨¤·¤Þ"
+#~ "¤¹¡£\n"
+#~ "»Ä¤ê¤Î°ú¿ô¤ÏºÇ½é¤ËˬÌ䤵¤ì¤ë¥Î¡¼¥É¤Ë´ØÏ¢¤¹¤ë¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤Î̾Á°¤È¤·¤Æ\n"
+#~ "°·¤ï¤ì¤Þ¤¹¡£\n"
+#~ "\n"
+#~ "Îã:\n"
+#~ "  info                       ºÇ¾å°Ì¤Î dir ¥á¥Ë¥å¡¼¤òɽ¼¨\n"
+#~ "  info emacs                 ºÇ¾å°Ì dir ¤Î emacs ¥Î¡¼¥É¤«¤é³«»Ï\n"
+#~ "  info emacs buffers         emacs ¥Þ¥Ë¥å¥¢¥ëÆâ¤Î buffers ¥Î¡¼¥É¤«¤é³«»Ï\n"
+#~ "  info --show-options emacs  emacs ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¥Î¡¼¥É¤«¤é³«"
+#~ "»Ï\n"
+#~ "  info -f ./foo.info         ./foo.info ¤òɽ¼¨¤·¡¢dir ¤Ïõº÷¤·¤Ê¤¤\n"
+#~ "\n"
+#~ "Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org¡¢\n"
+#~ "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Þ¤Ç¡£\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr ""
+#~ "             ¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤ÎÁªÂò¤Ç¡¢Â¾¤Î¥Î¡¼¥É¤¬ÁªÂò¤µ¤ì¤ë»ö¤Ë¤Ê¤ë¡£\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "               (¥Õ¥¡¥¤¥ë̾)¥Î¡¼¥É̾ ¤ÎÍͤˡ¢¥Õ¥¡¥¤¥ë̾¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ"
+#~ "¤¹¡£\n"
+
+#, fuzzy
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr ""
+#~ "\\\\  %-10s  ¸½ºß¤Î Info ¥Õ¥¡¥¤¥ë¤ò¡¢»ØÄꤵ¤ì¤¿Ê¸»úÎó¤Ç¸åÊý¸¡º÷¤·¡¢\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "               ¸«¤Ä¤«¤Ã¤¿¤â¤Î¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "¼¡ ¤Î¥Î¡¼¥É¤òé¤Ã¤Æ¤¤¤Þ¤¹..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "ºÇ½é¤Î¥á¥Ë¥å¡¼¹àÌܤòÁªÂò..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "¼¡ ¤Î¥Î¡¼¥É¤òÁªÂò..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "%d ²ó ¾å ¤Ë°ÜÆ°¤·¡¢¤½¤³¤Ç ¼¡ ¤Ø¡£"
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤Î Á° ¤Ë°ÜÆ°¤·¤Þ¤¹¡£"
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤Î ¾å ¤Ë°ÜÆ°¤·¤Þ¤¹¡£"
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "`Á°' ¤ÎºÇ¸å¤Î¥á¥Ë¥å¡¼¹àÌܤ˰ÜÆ°¤·¤Þ¤¹¡£"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "µ¡Ç½"
+
+#~ msgid "Macro"
+#~ msgstr "¥Þ¥¯¥í"
+
+#~ msgid "Special Form"
+#~ msgstr "Æü췿"
+
+#~ msgid "Variable"
+#~ msgstr "ÊÑ¿ô"
+
+#~ msgid "User Option"
+#~ msgstr "¥æ¡¼¥¶¥ª¥×¥·¥ç¥ó"
+
+#~ msgid "Instance Variable"
+#~ msgstr "¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô"
+
+#~ msgid "Method"
+#~ msgstr "¥á¥½¥Ã¥É"
+
+#~ msgid "Untitled"
+#~ msgstr "̵Âê"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr ""
+#~ "¤³¤ì¤Ï %1$s¡¢%3$s ¤è¤ê makeinfo ¥Ð¡¼¥¸¥ç¥ó %2$s ¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤Þ¤·¤¿¡£\n"
+
+#~ msgid "Next:"
+#~ msgstr "¼¡:"
+
+#~ msgid "Previous:"
+#~ msgstr "Á°:"
+
+#~ msgid "Up:"
+#~ msgstr "¾å:"
+
+#~ msgid "Menu"
+#~ msgstr "¥á¥Ë¥å¡¼"
+
+#~ msgid "Cross"
+#~ msgstr "Áê¸ß"
+
+#~ msgid "Prev"
+#~ msgstr "Á°"
+
+#~ msgid "Up"
+#~ msgstr "¾å"
+
+#~ msgid "see "
+#~ msgstr "see "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [INFO¥Õ¥¡¥¤¥ë [DIR¥Õ¥¡¥¤¥ë]]\n"
+#~ "\n"
+#~ "Info ¥Ç¥£¥ì¥¯¥È¥ê¥Õ¥¡¥¤¥ë `DIR¥Õ¥¡¥¤¥ë' Æâ¤Î `INFO¥Õ¥¡¥¤¥ë' ¤«¤é\n"
+#~ "dir ¥¨¥ó¥È¥ê¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Þ¤¿¤Ïºï½ü¤·¤Þ¤¹¡£\n"
+#~ "\n"
+#~ "¥ª¥×¥·¥ç¥ó:\n"
+#~ " --delete          ¸½Â¸¤¹¤ë INFO¥Õ¥¡¥¤¥ë ¤Î¹àÌܤò DIR¥Õ¥¡¥¤¥ë ¤«¤éºï½ü¤¹"
+#~ "¤ë\n"
+#~ "                     -- ¿·¤¿¤Ê¹àÌܤòÁÞÆþ¤·¤Ê¤¤\n"
+#~ " --dir-file=NAME   Info ¥Ç¥£¥ì¥¯¥È¥ê¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤹ¤ë\n"
+#~ "                     DIR-FILE °ú¿ô¤òÍøÍѤ¹¤ë¤Î¤ÈƱ¤¸\n"
+#~ " --entry=TEXT      Info ¥Ç¥£¥ì¥¯¥È¥ê¹àÌܤȤ·¤Æ TEXT ¤òÁÞÆþ¤¹¤ë\n"
+#~ "                     TEXT ¤Ï¡¢Info ¤Î¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤Î¹Ô¤Î·Á¼°¤Ç¤Ê¤±¤ì¤Ð"
+#~ "¤Ê¤é¤º\n"
+#~ "                     ¤³¤ì¤Ë¡¢¶õÇò¤Ç»Ï¤Þ¤ë¤¤¤¯¤Ä¤«¤Î¹Ô¤òÄɲäǤ­¤ë\n"
+#~ "                     Ê£¿ô¹Ô¤Î¹àÌܤò»ØÄꤷ¤¿¾ì¹ç¡¢Á´¤Æ¤¬²Ã¤¨¤é¤ì¤ë\n"
+#~ "                     ¹àÌܤò»ØÄꤷ¤Ê¤±¤ì¤Ð¡¢Info ¥Õ¥¡¥¤¥ë¼«¿È¤Î¾ðÊó¤Ë¤è¤Ã"
+#~ "¤Æ\n"
+#~ "                     ·èÄꤹ¤ë\n"
+#~ " --help            »È¤¤Êý¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë¡£\n"
+#~ " --info-file=FILE  ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë Info ¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ"
+#~ "¤ë\n"
+#~ "                     INFO-FILE °ú¿ô¤òÍøÍѤ¹¤ë¤Î¤ÈƱ¤¸\n"
+#~ " --info-dir=DIR    --dir-file=DIR/dir ¥ª¥×¥·¥ç¥ó¤ÈƱ¤¸\n"
+#~ " --item=TEXT       --entry TEXT ¥ª¥×¥·¥ç¥ó¤ÈƱ¤¸\n"
+#~ "                     Info ¥Ç¥£¥ì¥¯¥È¥ê¹àÌܤϼºݤ˥á¥Ë¥å¡¼¹àÌܤˤʤë\n"
+#~ " --quiet           ·Ù¹ð¥á¥Ã¥»¡¼¥¸¤òÍÞÀ©¤¹¤ë\n"
+#~ " --remove          --delete ¥ª¥×¥·¥ç¥ó¤ÈƱ¤¸\n"
+#~ " --section=SEC     ¥Ç¥£¥ì¥¯¥È¥ê¤Î SEC ¥»¥¯¥·¥ç¥ó¤Ë¤³¤Î¥Õ¥¡¥¤¥ë¤Î¹àÌܤòÃÖ"
+#~ "¤¯\n"
+#~ "                     Ê£¿ô¤Î¥»¥¯¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥»¥¯¥·¥ç¥óËè¤ËÁ´¤Æ¤Î"
+#~ "¹àÌÜ\n"
+#~ "                     ¤¬Äɲ䵤ì¤ë\n"
+#~ "                     ¥»¥¯¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¡¢Info ¥Õ¥¡¥¤¥ë¼«¿È¤Î¾ðÊó"
+#~ "¤Ë\n"
+#~ "                     ¤è¤Ã¤Æ·èÄꤹ¤ë\n"
+#~ " --version         ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë¡£\n"
+#~ "\n"
+#~ "Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org¡¢\n"
+#~ "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Þ¤Ç¡£\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "¥á¥Ë¥å¡¼¹àÌÜ `%s' ¤Ï¡¢`%s' ¤Ë´û¤Ë¸ºß¤·¤Þ¤¹"
+
+#, fuzzy
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr "  %-10s  ¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎºÇ½é¤«¤é 9 ÈÖÌÜËø¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "¥Î¡¼¥É `%s' ¤Ï´û¤Ë %d ²ó»²¾È¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ "\n"
+#~ "ÌõÃí: Èó¾ï¤Ë½ÅÍפÊʸ¾Ï¤Î¤¿¤á¡¢¸¶Ê¸¤ò»Ä¤·¤Æ¤¤¤Þ¤¹¡£\n"
+#~ "  -- »²¹ÍÌõ\n"
+#~ "°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó¡£¤¢¤Ê¤¿¤Ï¡¢GNU General Public Licence ¤Îʸ¸À¤Î²¼"
+#~ "¤Ç¡¢\n"
+#~ "¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤òºÆÇÛÉۤǤ­¤Þ¤¹¡£¤³¤ì¤é¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤ÀâÌÀ¤Ï¡¢"
+#~ "COPYING\n"
+#~ "¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-arg ¤Ï¡¢°ú¿ô¤ò°ì¤ÄÍ¿¤¨¤¿¤È¤­¤Î¤ßÍ­¸ú¤Ç¤¹"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Ìܼ¡"
+
+#~ msgid "Short Contents"
+#~ msgstr "´Ê°×Ìܼ¡"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "½èÍý¤Î¸å¤Ë¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë¤ò»Ä¤·¤Æ¤ª¤­¤Þ¤¹"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "½èÍý¤Î¤¢¤È¤Ë¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹ (default)"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr "          ºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¹àÌܤ¬»²¾È¤·¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ "\n"
+#~ "ÌõÃí: Èó¾ï¤Ë½ÅÍפÊʸ¾Ï¤Î¤¿¤á¡¢¸¶Ê¸¤ò»Ä¤·¤Æ¤¤¤Þ¤¹¡£\n"
+#~ "  -- »²¹ÍÌõ\n"
+#~ "°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó¡£¤¢¤Ê¤¿¤Ï¡¢GNU General Public Licence ¤Îʸ¸À¤Î²¼"
+#~ "¤Ç¡¢\n"
+#~ "¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤òºÆÇÛÉۤǤ­¤Þ¤¹¡£¤³¤ì¤é¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤ÀâÌÀ¤Ï¡¢"
+#~ "COPYING\n"
+#~ "¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£\n"
+
 #~ msgid "%s: Specify the Info directory only once.\n"
 #~ msgstr "%s: Info ¥Ç¥£¥ì¥¯¥È¥ê¤Ï°ìÅÙ¤À¤±»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
@@ -3080,27 +3457,12 @@ msgstr "%s ¹àÌܤËÆó¤ÄÌܤιàÌÜ̾¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 #~ msgid "Cannot specify more than one macro expansion output"
 #~ msgstr "Ê£¿ô¤Î¥Þ¥¯¥í³ÈÄ¥½ÐÎϤò»ØÄê¤Ç¤­¤Þ¤»¤ó"
 
-#~ msgid "First argument to cross-reference may not be empty"
-#~ msgstr "Áê¸ß»²¾È¤Ø¤ÎÂè°ì°ú¿ô¤¬¶õ¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
-
-#~ msgid "see "
-#~ msgstr "see "
-
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "`.' ¤ä ',' ¤Ï %c ¤Ç¤Ï¤Ê¤¯¡¢Áê¸ß»²¾È¤Ë³¤±¤é¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-#~ msgid "First argument to @inforef may not be empty"
-#~ msgstr "@inforef ¤Ø¤ÎÂè°ì°ú¿ô¤Ï¶õ¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
-
 #~ msgid "Node:"
 #~ msgstr "¥Î¡¼¥É:"
 
 #~ msgid "%s: TOC should be here, but it was not found"
 #~ msgstr "%s: TOC ¤¬¤³¤³¤Ë¤¢¤ë¤Ï¤º¤Ê¤Î¤Ë¡¢¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#~ msgid "virtual memory exhausted"
-#~ msgstr "²¾ÁÛ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿"
-
 #~ msgid "No `%s.png' or `.jpg', and no extension supplied"
 #~ msgstr "`%s.png' ¤ä `.jpg' ¤¬¤Ê¤¯¡¢³ÈÄ¥»Ò¤¬¤Ä¤±¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 
@@ -3110,14 +3472,6 @@ msgstr "%s ¹àÌܤËÆó¤ÄÌܤιàÌÜ̾¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 #~ msgid "`%s' has no Up field"
 #~ msgstr "`%s' ¤Ë ¾å ¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#, fuzzy
-#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-#~ msgstr "  %-10s  1 ¹ÔʬÁ°Êý¤Ø¤¹¤¹¤á¤ë¡£\n"
-
-#, fuzzy
-#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-#~ msgstr "  %-10s  1 ¹Ôʬ¸åÊý¤ØÌ᤹¡£\n"
-
 #~ msgid ""
 #~ "Email bug reports to bug-texinfo@gnu.org,\n"
 #~ "general questions and discussion to help-texinfo@gnu.org."
diff --git a/Build/source/utils/texinfo/po/nb.gmo b/Build/source/utils/texinfo/po/nb.gmo
index d29bd4223a4..83bcf5e063c 100644
--- a/Build/source/utils/texinfo/po/nb.gmo
+++ b/Build/source/utils/texinfo/po/nb.gmo
diff --git a/Build/source/utils/texinfo/po/nb.po b/Build/source/utils/texinfo/po/nb.po
index 316de2e825d..76cd569f593 100644
--- a/Build/source/utils/texinfo/po/nb.po
+++ b/Build/source/utils/texinfo/po/nb.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.7.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
 "PO-Revision-Date: 2004-12-05 15:37+0100\n"
 "Last-Translator: Trond Endrestøl <Trond.Endrestol@gtf.ol.no>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -29,132 +29,198 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: valget «%s» er flertydig\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: valget «--%s» tillater ikke et argument\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: valget «%c%s» tillater ikke et argument\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: valget «%s» krever et argument\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukjent valg «--%s»\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukjent valg «%c%s»\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ulovlig valg -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ugyldig valg -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: valget krever et argument -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: valget «-W %s» er flertydig\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: valget «-W %s» tillater ikke et argument\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr ""
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "Flytte forover et tegn"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "Flytte bakover et tegn"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "Flytte til starten av denne linjen"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "Flytte til slutten av denne linjen"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "Flytte forover et ord"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "Flytte tilbake et ord"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Slette tegnet under markøren"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "Slette tegnet bak markøren"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Avbryte eller avslutte operasjon"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Godta (eller tvinge fullføring av) denne linjen"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Sette inn neste tegn ordrett"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Sette inn dette tegnet"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Sette inn en tabulator"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Transponere tegnet ved punktet"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Rykke tilbake innholdet fra forrige felling"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "Fellingsringen er tom"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Rykke tilbake en tidligere felling"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "Slette til slutten av linjen"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "Slette til begynnelsen av linjen"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "Slette ordet etter markøren"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "Slette ordet før markøren"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Ingen fullføringer"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Ikke fullstendig"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "Liste mulige fullføringer"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "Eneste fullføring"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "En fullføring:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d fullføringer:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "Sett inn fullføring"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "Bygger fullføringer..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "Rulle fullføringsvinduet"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "Fotnoter kunne ikke vises"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr "Vise fotnotene assosiert med denne noden i et annet vindu"
 
@@ -162,76 +228,76 @@ msgstr "Vise fotnotene assosiert med denne noden i et annet vindu"
 msgid "---------- Footnotes ----------"
 msgstr "---------- Fotnoter -----------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "Lete opp en streng i indeksen til denne filen"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "Finner indeksinnslag..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "Ingen indekser funnet."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Indeksinnslag: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Gå til det neste passende indeksinnslaget fra forrige '\\[index-search]'-"
 "kommando"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "Ingen tidligere indekssøkestrenger."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Ingen indeksinnslag."
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "Ingen %sindeksinnslag inneholdende «%s»."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "mer "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "KAN IKKE SE DETTE"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr "Fant «%s» i %s. («\\[next-index-match]» prøver å finne den neste.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "Sjekker indekser i «%s»..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "Ingen av de tilgjengelig infofilene har «%s» i deres indekser."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Kravle gjennom alle kjente infofilers indekser etter en streng\n"
 "       og bygge opp en meny"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Indeksapropos: "
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, c-format
 msgid ""
 "\n"
@@ -240,111 +306,99 @@ msgstr ""
 "\n"
 "* Menu: Noder med indekser som inneholder «%s»:\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Prøv --help for mer informasjon.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
 #, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Det finnes INGEN garanti.  Du kan redistribuere denne programvaren\n"
-"etter betingelsene i GNU General Public License.  For mer informasjon\n"
-"om dette, se filen COPYING.\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "ingen innslag funnet for «%s»\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-"  -b, --speech-friendly        vær vennlig ovenfor talesyntetisatorer.\n"
-
-#: info/info.c:597
+#: info/info.c:598
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+#, fuzzy
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+"  -b, --speech-friendly        vær vennlig ovenfor talesyntetisatorer.\n"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Bruksmåte: %s [VALG]... [MENYPUNKT...]\n"
-"\n"
-"Lese dokumentasjon i Infoformat.\n"
-"\n"
-"Valg:\n"
-"     --apropos=EMNE           søke etter EMNE i alle indeksene til alle "
-"Infofilene.\n"
-" -d, --directory=KAT          legge til KAT til INFOPATH.\n"
-"     --dribble=FILNAVN        huske brukerens tastetrykk i FILNAVN.\n"
-" -f, --file=FILNAVN           angi Infofilen som skal besøkes.\n"
-" -h, --help                   vise denne hjelpen og avslutte.\n"
-"     --index-search=STRENG    gå til noden pekt på av indeksoppslaget "
-"STRENG.\n"
-" -n, --node=NODENAVN          angi noder i første besøkte Infofil.\n"
-" -o, --output=FILNAVN         skrive ut utvalgte noder til FILNAVN.\n"
-" -R, --raw-escapes            ikke fjern ANSI-escapes fra mansider.\n"
-"     --restore=FILNAVN        lese innledende tastetrykk fra FILNAVN.\n"
-" -O, --show-options, --usage  gå til kommandolinje-valg-noden.\n"
-"%s     --subnodes               rekursivt skrive ut menypunkter.\n"
-"     --vi-keys                bruke vi-aktige og less-aktige "
-"tastebindinger.\n"
-"     --version                vise programversjon og avslutte.\n"
-"\n"
-"Det første ikke-valg-argumentet, dersom tilstede, er menypunktet som du\n"
-"starter fra; det blir søkt etter i alle «dir»-filer langs med INFOPATH.\n"
-"Dersom menypunktet ikke er tilstede, vil info flette sammen alle\n"
-"«dir»-filene og vise resultatet.  Øvrige gjenværende argumenter blir\n"
-"behandlet som navnene til menypunktene relativ til den første besøkte\n"
-"noden.\n"
-"\n"
-"Eksempler:\n"
-"  info                       vise toppnivå dirmeny\n"
-"  info emacs                 starte ved emacs-noden fra toppnivå dir\n"
-"  info emacs buffers         starte ved buffers-noden i emacs-manualen\n"
-"  info --show-options emacs  starte ved emacs kommandolinjevalg\n"
-"  info -f ./foo.info         vise filen ./foo.info, ikke søke gjennom dir\n"
-
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -356,420 +410,417 @@ msgstr ""
 "generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n"
 "Websida for Texinfo: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Kan ikke finne noden «%s»."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Kan ikke finne noden «(%s)%s»."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "Kan ikke finne et vindu!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "Markøren vises ikke innen dette vinduets node!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "Kan ikke slette det siste vinduet."
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "Ingen meny i denne noden."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "Ingen fotnoter i denne noden."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "Ingen kryssreferanser i denne noden."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Ingen «%s»-peker for denne noden."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Ukjent Info-kommando «%c»; prøv «?» for hjelp."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Terminaltypen «%s» er ikke smart nok for å kjøre Info."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "Du er allerede på den siste siden av denne noden."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "Du er allerede på den første siden til denne noden."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "Bare et vindu."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "Resulterende vindu ville blitt for lite."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Ikke nok plass for et hjelpevindu, vennligst slett et vindu."
 
-# The next translation should match the length of this one
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
-"Grunnleggende kommandoer i infovinduer\n"
-"**************************************\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "\\%-10[quit-help]  Avslutte denne hjelpen.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Avslutte Info fullstendig.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Starte Infoopplæring.\n"
 
-# The next translation should match the length of this one
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"Velger andre noder:\n"
-"-------------------\n"
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-line]  Rulle bakover 1 linje.\n"
+
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  Rulle forover 1 linje.\n"
+
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Rulle bakover en side.\n"
+
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Rulle forover en side.\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  Flytte til neste node etter denne noden.\n"
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Gå til begynnelsen av denne noden.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  Flytte til forrige node før denne noden.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Flytte «opp» fra denne noden.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Gå til slutten av denne noden.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
-"\\%-10[menu-item]  Velge et menypunkt angitt ved navn.\n"
-"              Valg av et menypunkt fører til at en annen node blir valgt.\n"
+"\\%-10[move-to-prev-xref]  Flytte til neste hypertekstlenke innen denne "
+"noden.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
+#, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
-msgstr ""
-"\\%-10[history-node]  Følge en kryssreferanse.  Leser navnet til "
-"referansen.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr "\\%-10[dir-node]  Følge hypertekstlenken under markøren.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr ""
 "\\%-10[history-node]  Flytte til den siste noden sett i dette vinduet.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr ""
-"\\%-10[move-to-prev-xref]  Flytte til neste hypertekstlenke innen denne "
-"noden.\n"
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[prev-node]  Flytte til forrige node før denne noden.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr ""
-"\\%-10[move-to-prev-xref]  Flytte til neste hypertekstlenke innen denne "
-"noden.\n"
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[next-node]  Flytte til neste node etter denne noden.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr "\\%-10[dir-node]  Følge hypertekstlenken under markøren.\n"
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Flytte til forrige node før denne noden.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
-"\\%-10[dir-node]  Flytte til «katalog»-noden.  Det samme som «\\[goto-node] "
-"(DIR)».\n"
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Flytte til neste node etter denne noden.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr ""
-"\\%-10[top-node]  Flytte til «Top»-noden.  Det samme som «\\[goto-node] "
-"Top».\n"
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Flytte «opp» fra denne noden.\n"
 
-# The next translation should match the length of this one
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"Flytte innen en node:\n"
-"---------------------\n"
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[end-of-node]  Gå til slutten av denne noden.\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[end-of-node]  Gå til slutten av denne noden.\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Gå til begynnelsen av denne noden.\n"
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "  %-10s  Velge første ... niende punkt i nodens meny.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Gå til slutten av denne noden.\n"
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Velge det siste punktet i nodens meny.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "\\%-10[next-line]  Rulle forover 1 linje.\n"
+#, fuzzy
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  Velge menypunkt spesifisert ved navn.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "\\%-10[prev-line]  Rulle bakover 1 linje.\n"
+#, fuzzy
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr ""
+"\\%-10[history-node]  Følge en kryssreferanse.  Leser navnet til "
+"referansen.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Rulle forover en side.\n"
-
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Rulle bakover en side.\n"
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  Flytte til noden spesifisert av navn.\n"
 
-# The next translation should match the length of this one
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
 msgstr ""
-"Andre kommandoer:\n"
-"-----------------\n"
+"  %-10s  Søke forlengs gjennom denne Infofilen for en spesifikk streng,\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "\\%-10[menu-digit]  Velge første ... niende punkt i nodens meny.\n"
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[prev-node]  Flytte til forrige node før denne noden.\n"
 
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "\\%-10[last-menu-item]  Velge det siste punktet i nodens meny.\n"
+# This translation is connected to the next one
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "  %-10s  Søke etter en spesifikk streng i indeksinnslagene i denne\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
+#, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 "\\%-10[index-search]  Søke etter en angitt streng blant indeksinnslagene i "
 "denne\n"
 "              infofilen og velge noden til det første innslaget som blir "
 "funnet.\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  Flytte til en node angitt ved navn.\n"
-"              Du kan like godt inkludere et filnavn, som i (FILNAVN)"
-"NODENAVN.\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  Søke forover etter en angitt streng\n"
-"              og velge den noden som den neste forekomsten blir funnet i.\n"
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "Avbryte gjeldende operasjon"
 
-#: info/infodoc.c:87
+# The next translation should match the length of this one
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  Søke baklengs etter en angitt streng\n"
-"              og velge den noden som den neste forekomsten blir funnet i.\n"
+"Grunnleggende kommandoer i infovinduer\n"
+"**************************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Avslutte denne hjelpen.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Avslutte Info fullstendig.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Starte Infoopplæring.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Flytte til «neste»-noden etter denne noden.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Flytte til «forrige»-noden før denne noden.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Flytte «opp» fra denne noden.\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Velge menypunkt spesifisert ved navn.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr ""
-"              Valg av menypunkt fører til at en annen node blir valgt.\n"
+"\\%-10[menu-item]  Velge et menypunkt angitt ved navn.\n"
+"              Valg av et menypunkt fører til at en annen node blir valgt.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Følge en kryssreferanse.  Leser navnet til referansen.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Flytte til den siste noden sett i dette vinduet.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Flytte til neste hypertekstlenke innen denne noden.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Følge hypertekstlenken under markøren.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Flytte til «katalog»-noden.  Det samme som «g (DIR)».\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Flytte til «Top»-noden.  Det samme som «g Top».\n"
 
-#: info/infodoc.c:118
+# The next translation should match the length of this one
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Flytte innen en node:\n"
+"---------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Rulle forover en side.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Rulle bakover en side.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Gå til begynnelsen av denne noden.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Gå til slutten av denne noden.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Rulle forover 1 linje.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Rulle bakover 1 linje.\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+# The next translation should match the length of this one
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Andre kommandoer:\n"
+"-----------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  Velge første ... niende punkt i nodens meny.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Velge det siste punktet i nodens meny.\n"
 
-# This translation is connected to the next one
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr "  %-10s  Søke etter en spesifikk streng i indeksinnslagene i denne\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
-"              infofil, og velge noden referert av det første oppslaget "
+"\\%-10[index-search]  Søke etter en angitt streng blant indeksinnslagene i "
+"denne\n"
+"              infofilen og velge noden til det første innslaget som blir "
 "funnet.\n"
 
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Flytte til noden spesifisert av navn.\n"
-
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
+"\\%-10[goto-node]  Flytte til en node angitt ved navn.\n"
 "              Du kan like godt inkludere et filnavn, som i (FILNAVN)"
 "NODENAVN.\n"
 
-#: info/infodoc.c:133
-#, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr ""
-"  %-10s  Søke forlengs gjennom denne Infofilen for en spesifikk streng,\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
+#: info/infodoc.c:129
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
-"              og velge den noden som i det neste tilfellet blir funnet.\n"
+"\\%-10[search]  Søke forover etter en angitt streng\n"
+"              og velge den noden som den neste forekomsten blir funnet i.\n"
 
-#: info/infodoc.c:135
-#, c-format
-msgid "  %-10s  Search backward for a specified string\n"
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
 msgstr ""
-"  %-10s  Søke baklengs gjennom denne Infofilen for en spesifikk streng,\n"
+"\\%-10[search]  Søke forover etter en angitt streng\n"
+"              og velge den noden som den neste forekomsten blir funnet i.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "Gjeldende søkesti er:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -777,7 +828,7 @@ msgstr ""
 "Kommandoer tilgjengelig i Infovinduer:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -785,7 +836,7 @@ msgstr ""
 "Kommandoer tilgjengelig i ekkoområdet:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -794,7 +845,7 @@ msgstr ""
 "Følgende kommandoer kan bare bli påkallet via %s:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -802,82 +853,74 @@ msgstr ""
 "Følgende kommandoer kan ikke bli påkallet i det hele tatt:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr "--- Bruk «\\[history-node]» eller «\\[kill-node]» for å avslutte ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "Vise hjelpemelding"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "Vise infonoden «(info)Help»"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "Skrive ut dokumentasjonen for KEY"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Beskriv tast: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s er udefinert."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s er udefinert."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s er definert som %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Vise hva som må tastes for å utføre en gitt kommando"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Hvor er kommandoen: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "«%s» er ikke på noen taster"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s kan bare bli påkallet via %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s kan bli påkallet via %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Det finnes ingen funksjon ved navn «%s»"
 
-#: info/infokey.c:145
-#, c-format
+# The next translation should match the length of this one
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Det finnes INGEN garanti.  Du kan redistribuere denne programvaren\n"
-"etter betingelsene i GNU General Public License.  For mer informasjon\n"
-"om dette, se filen COPYING.\n"
+"Velger andre noder:\n"
+"-------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -986,22 +1029,22 @@ msgstr ""
 "  --help                       vise denne hjelpen og avslutte.\n"
 "  --version                    vise programversjon og avslutte.\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Ignorerer ugyldig infokeyfil «%s» - for liten"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Ignorerer ugyldig infokeyfil «%s» - for stor"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "Feil ved lesing av infokeyfil «%s» - for kort"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -1009,12 +1052,12 @@ msgstr ""
 "Ugyldig infokeyfil «%s» (feil magiske tall) -- kjør infokey for å oppdatere "
 "den"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr "Din infokeyfil «%s» er utdatert -- kjør infokey for å oppdatere den"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -1022,7 +1065,7 @@ msgstr ""
 "Ugyldig infokeyfil «%s» (feil avdelingslengde) -- kjør infokey for å "
 "oppdatere den"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -1030,45 +1073,45 @@ msgstr ""
 "Ugyldig infokeyfil «%s» (feil avdelingskode) -- kjør infokey for å oppdatere "
 "den"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "Feil data i infokeyfil -- noen tastebindinger ble ignorert"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr "Feil data i infokeyfil -- noen variabelinnstillinger ble ignorert"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "Lese inn navnet på en infokommando og beskrive den"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Beskriv kommandoen: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "Lese et kommandonavn i ekkoområdet og utføre den"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Kan ikke utføre en «echo-area»-kommando her."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, c-format
 msgid "Undefined command: %s"
 msgstr "udefinert kommando: %s"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "Sette høyden på det viste vinduet"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Sette skjermhøyde til (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1077,12 +1120,12 @@ msgstr ""
 "   Kildefiler søkt gjennom for å lage denne filen inkluderer:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kunne ikke manipulere filen %s.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1094,7 +1137,7 @@ msgstr ""
 "  (Fil)Node                         Linjer  Str.   Inneholdene fil\n"
 "  ---------                         ------  ----   ---------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1102,24 +1145,29 @@ msgstr ""
 "Her er menyen over nodene du har nylig besøkt.\n"
 "Velg en fra denne menyen, eller bruk «\\[history-node]» i et annet vindu.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "Lag et vindu inneholdene en meny over alle de nylig besøkte nodene"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Velge en node som har blitt tidligere besøkt i et synlig vindu"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Velg besøkt node: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Referansen forsvant! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1128,107 +1176,78 @@ msgstr ""
 "Velkommen til Info versjon %s. Trykk «\\[get-help-window]» for hjelp,\n"
 "«\\[menu-item]» for menypunkt."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "Flytte ned til neste linje"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "Flytte opp til den forrige linjen"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "Flytte til slutten av linjen"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "Flytte til starten av linjen"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "neste"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Følger nestenoden..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Velger første menypunkt..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Velger nestenoden..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "Flytter opp %d gang(er), deretter neste."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "Ingen flere noder i dette dokumentet."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "Ingen «forrige» for denne noden."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Flytter til forrige i dette vinduet."
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "Ingen «forrige» eller «opp» for denne noden i dette dokumentet."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Flytter opp i dette vinduet."
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Flytter til «forrige»s siste menypunkt."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "Flytte forover eller ned gjennom nodestrukturen"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "Flytte tilbake eller opp gjennom nodestrukturen"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "Rulle forover i dette vinduet"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr "Rulle forover i dette vinduet og sette standard vindustørrelse"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr "Rulle forover i dette vinduet, men forbli innenfor noden"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "Rulle forover i dette vinduet, forbli innenfor noden og sette standard "
 "vindustørrelse"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "Rulle bakover i dette vinduet"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr "Rulle bakover i dette vinduet og sette standard vindustørrelse"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr "Rulle bakover i dette vinduet, men forbli innenfor noden"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1236,401 +1255,434 @@ msgstr ""
 "Rulle bakover i dette vinduet, forbli innenfor noden og sette standard "
 "vindustørrelse"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "Flytte til starten av denne noden"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "Flytte til slutten av denne noden"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "Rulle ned pr. antall linjer"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "Rulle opp pr. antall linjer"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "Rulle ned en halv side"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "Rulle opp en halv side"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "Velge neste vindu"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "Velge forrige vindu"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "Dele gjeldende vindu"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "Slette den gjeldende vindu"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "Kan ikke slette et permanent vindu"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "Slette alle andre vinduer"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "Rulle det andre vinduet"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "Rulle det andre vinduet bakover"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "Øke (eller minke) dette vinduet"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "Dele den tilgjengelige skjermplassen mellom de synlige vinduene"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Veksle tilstanden til linjebryting i gjeldende vindu"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "Velge neste node"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "Velge forrige node"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "Velge oppnoden"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "Velge den siste noden i denne filen"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "Dette vinduet har ingen andre noder"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "Velge første node i denne filen"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "Velge det siste punktet i nodens meny"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "Velge dette menypunktet"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Det er ikke %d punkter i denne menyen."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menypunkt (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Menypunkt: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Følge kryssreferanse (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "Følge kryssreferanse: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "Lese et menyvalg og velge dens node"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Lese en fotnote eller kryssreferanse og velge dens node"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "Flytte til starten av denne nodens meny"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "Besøke så mange menypunkter som mulig samtidig"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "Lese et nodenavn og velge det"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "Gå til node: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Ingen meny i noden «%s»."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Ingen menypunkt «%s» i noden «%s»."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Klarte ikke å finne noden referert av «%s» i «%s»."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Lese en liste over menyer fra dir og følge dem"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "Følge menyer: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Finne noden som beskriver bruksmåten for programmet"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Finne Invocation-noden til [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "Lese en manualside-referanse og velge den"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "Hent manualsiden: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "Velge «Top»-noden i denne filen"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "Velge noden «(dir)»"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Slette noden (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Kan ikke slette noden «%s»"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "Kan ikke slette den forrige noden"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "Velge den sist valgte noden"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "Slette denne noden"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "Lese inn navnet på en fil og velge den"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Finne fil: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Kan ikke finne «%s»."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Kunne ikke opprette utskriftsfil «%s»."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Ferdig."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "Skriver noden «%s»..."
 
 # I need a better substitute for the verb «to pipe».
 # «Å pipe» sounds no good to me.
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "«Pipe» innholdet av denne noden gjennom INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Kan ikke åpne «pipe» til «%s»."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "Skriver ut noden «%s»..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "Slette til begynnelsen av linjen"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Søker i delfil «%s»..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr ""
 "Lese inn en streng og søke etter den med skille på store og små bokstaver"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "Lese inn en streng og søke etter den"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "Lese inn en streng og søke bakover etter den"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "%s%setter streng [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr " med skille på store og små bokstaver "
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "Søke bakover"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "Søke"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " med skille på store og små bokstaver "
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "Søk mislyktes"
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "Gjenta forrige søk i samme retning"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "Ingen tidligere søkestreng"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "Gjenta forrige søk i motsatt retning"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "Søke interaktivt for en streng mens du skriver"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "I-søk bakover: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "I-søk bakover: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "I-søk: "
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "I-søk: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "Mislyktes "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "Flytte til forrige kryssreferanse"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "Flytte til neste kryssreferanse"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "Velge referanse eller menypunkt på denne linjen"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "Avbryte gjeldende operasjon"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Avbrutt"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "Flytte markøren til en angitt linje i vinduet"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "Tegne skjermen på nytt"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Avslutte Info"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr "Kjør kommandoen knyttet til denne tastens «liten-bokstav-variant»"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Ukjent kommando (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "«%s» er ugyldig"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, c-format
 msgid "`%s' is invalid"
 msgstr "«%s» er ugyldig"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "Legge til dette siffret til det gjeldende numeriske argumentet"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Starte (eller multiplisere med 4) den gjeldende numeriske argumentet"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "Brukt internt av \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Tomt for virtuelt minne!\n"
@@ -1665,195 +1717,364 @@ msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr ""
 "Kontrollerer hva som skjer når rulling er ønsket ved slutten av en node"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "Antall linjer som skal rulles når markøren flyttes utenfor vinduet"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "Når «On», aksepterer og viser Info ISO-Latin-tegn"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr ""
+"Kontrollerer hva som skjer når rulling er ønsket ved slutten av en node"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "Forklar bruken av en variabel"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Beskriv variabel: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Sette verdien til en Infovariabel"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Sett variabel: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "Sette %s til verdien (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "Sette %s til verdien (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Tagger er ute av synk ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), linjer ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d linjer --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d linjer --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Delfil: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: valget «%s» er flertydig\n"
+msgid "%s: warning: "
+msgstr "%s: advarsel: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: valget «--%s» tillater ikke et argument\n"
+msgid " for %s"
+msgstr " for %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: valget «%c%s» tillater ikke et argument\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tPrøv «%s --help» for en komplett liste over valg.\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Send bugrapporter til bug-texinfo@gnu.org,\n"
+"generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n"
+"Websida for Texinfo: http://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: valget «%s» krever et argument\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Dette er filen .../info/dir, som inneholder den øverste\n"
+"noden i Info-hierarkiet, kalt (dir)Top.\n"
+"Første gangen du starter Info begynner du i denne noden.\n"
+"\n"
+"%s\tDette er toppen av INFO-treet\n"
+"\n"
+"  Denne katalognoden gir en meny over alle hovedemner.\n"
+"  Inntasting av «q» avslutter, «?» lister alle Info-kommandoene, «d» returner "
+"hit,\n"
+"  «h» gir en innføring for nybegynnere,\n"
+"  «mEmacs<Return>» besøker Emacs-manualen, osv.\n"
+"\n"
+"  I Emacs kan du klikke med musknapp 2 på et menypunkt eller kryssreferanse\n"
+"  for å velge den.\n"
+"\n"
+"%s\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukjent valg «--%s»\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: kunne ikke lese (%s) og kunne ikke opprette (%s)\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukjent valg «%c%s»\n"
+msgid "%s: empty file"
+msgstr "%s: tom fil"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY uten tilhørende END-INFO-DIR-ENTRY"
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY uten tilhørende START-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovlig valg -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: har allerede en dirfil: %s\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ugyldig valg -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Spesifiser infofilen bare en gang.\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: valget krever et argument -- %c\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: valget «-W %s» er flertydig\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: valget «-W %s» tillater ikke et argument\n"
+msgid "excess command line argument `%s'"
+msgstr "overflødig argument på kommandolinjen «%s»"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr "Ingen innfil angitt; prøv --help for mer informasjon."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr "Ingen dir-fil angitt; prøv --help for mer informasjon."
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "ingen info-dir-oppføring i «%s»"
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "fant ingen oppføringer for «%s»; ingenting slettet"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "argumentene til @%s ble ignorert"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "januar"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "februar"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "mars"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "april"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "mai"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "juni"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "juli"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "august"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "september"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "oktober"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "november"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "desember"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "usannsynlig tegn %c i @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc-argument med store bokstaver, dermed ingen effekt"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "«{» forventet, men så «%c»"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "slutt-på-fila inne i verb-blokk"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "«{» forventet, men så «%c»"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1861,327 +2082,311 @@ msgstr ""
 "@strong{Note...} lager en overflødig kryssreferanse i Info; skriv om for å "
 "unngå dette"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s er utgått"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp krever et positivt numerisk argument, ikke `%s'"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Ugyldig argument til %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Ugyldig argument til @%s"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr "insert"
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "Manglende «}» i @def-arg"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Funksjon"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Makro"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Spesiell form"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Variabel"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Brukervalg"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Forekomst"
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Ugyldig argument til @%s"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Metode"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "av"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "på"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Manglende «}» i @def-arg"
 
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "Må være i et «@%s»-miljø for å bruke «@%s»"
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr "`%s' utelatt før outputfilnavn"
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr "`%s' utelatt pga skriving til stdout"
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr "Outputbuffer er ikke tomt."
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Se "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "«%c%s» trenger et argument «{...}», ikke bare «%s»"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "Ingen avsluttende krøllparentes for fotnoten «%s»"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "Fotnote definert uten foreldrenode"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Fotnoter i fotnoter er ikke tillatt"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "Fotnoter"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: kunne ikke åpne --css-file: %s"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: --css-file endte i en kommentar"
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "Uten navn"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr "[uforventet] kunne ikke poppe neste htmltagg"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[uforventet] ugyldig nodenavn: «%s»"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Ukjent indeks «%s»"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info kan ikke håndtere `:' i indeksinnslaget `%s'"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indeksen «%s» eksisterer allerede"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Ukjent indeks «%s» og/eller «%s» i @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr "(linje )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr "(linje %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Ukjent indeks «%s» i @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Innslag for indeksen «%s» utenfor node"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(utenfor noder)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "Se "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr "@item er ikke tillatt som argument til @itemize"
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Broken-Type i insertion_type_pname"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "Stakkoverflyt ved oppramsing"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "bokstavoverflyt, starter på nytt ved %c"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s krever et argument: formattereren for %citem"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr "%cfloat-miljøer kan ikke nøstes"
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "`@end' forventet «%s», men så «%s»"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Ingen tilsvarende «%cend %s»"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s krever en bokstav eller et siffer"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "slutt-på-filen inne i verbatimblokk"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "@%s er meningsløs utenfor et «@float»-miljø"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu sett før første @node, oppretter «Top»-noden"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "kanskje burde din @top-node bli pakket inn i @ifnottex istedet for @ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu sett før første node, oppretter «Top»-noden"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr "@%s gir ikke mening utenfor «@titlepage»- og «@quotation»-miljøer"
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "@%s er meningsløs utenfor et «@titlepage»-miljø"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Umatchet «%c%s»"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "«%c%s» trenger noe etter den"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Ugyldig argument «%s» til «%s», bruker «%s»"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s er meningsløs innenfor en «@%s»-blokk"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx er meningsløs innenfor en «@%s»-blokk"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s funnet utenfor en innsettingsblokk"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s er ikke en gyldig ISO 639-språkkode"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "ugjenkjennelig kodingsnavn «%s»"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "beklager, kodingen «%s» er ikke støttet"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "Ugyldig kodet tegn «%s»"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s forventer «i» eller «j» som argument, ikke «%c»"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s forventer et enkelt tegn, «i» eller «j» som argument"
@@ -2196,7 +2401,7 @@ msgstr "makroen «%s» er tidligere definert"
 msgid "here is the previous definition of `%s'"
 msgstr "her er den tidligere definisjonen av «%s»"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "\\ i makroekspansjon fulgt av «%s» istedet for parameternavn"
@@ -2206,46 +2411,50 @@ msgstr "\\ i makroekspansjon fulgt av «%s» istedet for parameternavn"
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makroen «%s» kalt på linje %d med for mange argumenter"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend macro ikke funnet"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg bare brukbart når makroen bare tar et argument"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
+
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "umatchet @end %s med @%s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "For mange feil!  Ga opp.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: advarsel: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "Feilplassert %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2253,17 +2462,17 @@ msgstr ""
 "Oversette Texinfodokumentasjon til forskjellige andre formater:\n"
 "Infofiler for lesing online med Emacs eller den frittstående GNU Info.\n"
 
-#: makeinfo/makeinfo.c:350
-#, c-format
+#: makeinfo/makeinfo.c:354
+#, fuzzy, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
@@ -2278,14 +2487,14 @@ msgstr ""
 "  -v, --verbose               forklare hva som blir gjort.\n"
 "      --version               vise programversjon og avslutte.\n"
 
-#: makeinfo/makeinfo.c:364
-#, no-wrap
+#: makeinfo/makeinfo.c:369
+#, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 "Valg av outputformat (standard er å produsere Info):\n"
 "      --docbook             generere DocBook XML i stedet for Info.\n"
@@ -2293,20 +2502,24 @@ msgstr ""
 "      --xml                 generere Texinfo XML i stedet for Info.\n"
 "      --plaintext           generere ren tekst i stedet for Info.\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
+#, fuzzy
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 "Generelle outputvalg:\n"
 "  -E, --macro-expand FIL    sende makroekspandert kilde til FIL,\n"
@@ -2325,18 +2538,21 @@ msgstr ""
 "  -o, --output=FIL          sende output til FIL (eller katalog dersom "
 "splittet HTML),\n"
 
-#: makeinfo/makeinfo.c:386
-#, c-format
+#: makeinfo/makeinfo.c:391
+#, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2350,8 +2566,8 @@ msgstr ""
 "      --footnote-style=STIL   generere fotnoter i Info i henhold til STIL:\n"
 "                                «separate» for å legge fotnotene i egne "
 "noder;\n"
-"                                «end» for å legge fotnotene i slutten av "
-"hver node\n"
+"                                «end» for å legge fotnotene i slutten av hver "
+"node\n"
 "                                  der fotnotene er definert (standard).\n"
 "      --paragraph-indent=ANT  rykke inn Infoavsnitt med ANT mellomrom "
 "(standard %d).\n"
@@ -2362,23 +2578,27 @@ msgstr ""
 "      --split-size=ANT        splitte Infofilene ved lengde ANT (standard %"
 "d).\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
+#, fuzzy
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 "Valg for HTML:\n"
 "      --css-include=FIL         inkluder FIL i HTML <style>-taggen;\n"
 "                                  les stdin dersom FIL er -.\n"
 
-#: makeinfo/makeinfo.c:409
-#, c-format
+#: makeinfo/makeinfo.c:418
+#, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 "Valg for XML og DocBook:\n"
@@ -2387,7 +2607,7 @@ msgstr ""
 "                                  Dersom ANT er 0, blir ignorerbart tomrom "
 "ikke brukt.\n"
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2407,7 +2627,7 @@ msgstr ""
 "  -U VAR                         udefiner variabelen VAR, som om @clear "
 "brukes.\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2443,7 +2663,7 @@ msgstr ""
 "  --no-iftex         ikke behandle @iftex og @tex.\n"
 "  --no-ifxml         ikke behandle @ifxml og @xml.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2457,19 +2677,21 @@ msgstr ""
 "  dersom ren tekst genereres er --ifplaintext påslått og de andre av;\n"
 "  dersom XML genereres er --ifxml påslått og de andre av.\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
+#, fuzzy
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "Eksempler:\n"
 "  makeinfo foo.texi                     skrive Info til foos @setfilename\n"
@@ -2482,81 +2704,75 @@ msgstr ""
 "  makeinfo --number-sections foo.texi   skrive Info med nummererte avsnitt\n"
 "  makeinfo --no-split foo.texi          skrive en Infofil uansett størrelse\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr "%s: Ignorerer ugjenkjennelig TEXINFO_OUTPUT_FORMAT-verdi «%s».\n"
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s: kunne ikke åpne makroekspansjonoutput «%s»"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s: ignorerer sekundær makroekspansjonoutpur «%s».\n"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
-msgstr ""
-"%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
+msgstr "%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mangler filargument.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Flerlinjekommandoen %c%s brukes ikke riktig"
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "Forventet «%s»"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kan ikke opprette katalogen «%s»: %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Ingen «%s» funnet i «%s»"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Hopper over makroekspansjon til stdout siden Info-output også sendes "
 "dit.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Lager %s-filen «%s» fra «%s».\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "Dette er %s, produsert av makeinfo versjon %s fra %s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2564,81 +2780,80 @@ msgstr ""
 "%s: Fjerner makroutskriftsfilen «%s» på grunn av feil; bruk --force for å "
 "bevare.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
-"%s: Fjerner utskriftsfilen «%s» på grunn av feil; bruk --force for å "
-"bevare.\n"
+"%s: Fjerner utskriftsfilen «%s» på grunn av feil; bruk --force for å bevare.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Ukjent kommando «%s»"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s forventet krøllparanteser"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "Umatchet }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "INTET_NAVN!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s mangler avsluttende krøllparentes"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image-fil «%s» (for HTML) er uleselig: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, c-format
 msgid "No such file `%s'"
 msgstr "«%s» er ingen fil"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image-fil «%s» (for tekstformat) er uleselig: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "@image mangler filnavn"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr "udefinert flagg: %s"
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Ingen verdi for «%s»}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s krever et navn"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Traff slutt-på-filen før matchende @end %s"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' er for lang for ekspansjon; ikke ekspandert"
@@ -2647,164 +2862,130 @@ msgstr "`%.40s...' er for lang for ekspansjon; ikke ekspandert"
 msgid "Missing } in @multitable template"
 msgstr "Manglende «}» i @multitable-mal"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignorerer løs tekst «%s» etter @multitable"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "For mange kolonner i multitabellrad (maks %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[uforventet] kan ikke velge kolonne #%d i multitabell"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "ignorerer @tab utenfor multitabell"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multikolonne-output fra siste rad:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolonne #%d output = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Noden «%s» er tidligere definert ved linje %d"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Skriver noden %s...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Noden «%s» krever en inndelingskommando (f.eks. %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Ingen nodenavn spesifisert for «%c%s»-kommandoen"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Ankeret «%s» og noden «%s» blir knyttet til det samme filnavnet"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 "Denne @anchor-kommandoen ble ignorert, referanser til den vil ikke virke"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Omdøpe dette ankeret eller bruk «--no-split»-valget"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "Uforventet streng ved slutten av splitt-HTML-fila «%s»"
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "Neste:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Forrige:"
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "Opp:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Ankrene «%s» og «%s» peker til det samme filnavnet"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor-kommando ignorert; referanser til den vil ikke virke"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 "%s referanse til ikke-eksisterende node «%s» (kanskje ugyldig inndeling?)"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "Meny"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Kryss"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
-msgstr ""
-"Nestefeltet til noden «%s» er ikke pekt på (kanskje ugyldig inndeling?)"
+msgstr "Nestefeltet til noden «%s» er ikke pekt på (kanskje ugyldig inndeling?)"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Denne noden (%s) har den dårlige forrigepekeren"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "forrige"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Forrigefeltet til noden «%s» er ikke pekt på"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Denne noden (%s) har den dårlige nestepekeren"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "`%s' har ingen Up-felt (kanskje feil inndeling?)"
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "opp"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "Noden «%s» mangler et menypunkt for «%s» selv om den er dens oppmål"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "noden «%s» har blitt referert %d ganger"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "ureferert node «%s»"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr "Fjerner %s\n"
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Kan ikke slette filen «%s»: %s"
@@ -2819,265 +3000,106 @@ msgstr "Vedlegg %c"
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "Intern feil (search_sectioning) «%s»!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Intern feil (search_sectioning) «%s»!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s er avlegs; bruk %c%s i stedet"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Node med %ctop som en seksjon eksisterer allerede"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Her er %ctop-noden"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop brukt før %cnode, benytter %s"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Innholdsfortegnelse"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Kort innholdsfortegnelse"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-fil «%s» er uleselig: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 "@headitem som siste punkt i en @multitable fører til uyldige DocBook-"
 "dokumenter"
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: advarsel: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " for %s"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "av"
 
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\tPrøv «%s --help» for en komplett liste over valg.\n"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "på"
 
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Bruksmåte: %s [VALG]... [INFOFIL [DIRFIL]]\n"
-"\n"
-"Installere eller slette dir-innslag fra INFOFIL i Info-katalogfilen\n"
-"DIRFIL.\n"
-"\n"
-"Valg:\n"
-" --delete          slette eksisterende innslag for INFOFIL fra DIRFIL;\n"
-"                     ikke sett inn noe nye innslag.\n"
-" --dir-file=NAVN   angi filnavnet til Info-katalogfilen.\n"
-"                     Dette er det samme som å bruke DIRFIL-argumentet.\n"
-" --entry=TEKST     sette inn TEKST som en Info-kataloginnslag.\n"
-"                     TEKST bør ha form som et Info-menypunkt\n"
-"                     pluss null eller flere linjer som starter med "
-"whitespace.\n"
-"                     Dersom du angir mer enn et innslag, blir alle lagt "
-"til.\n"
-"                     Dersom du ikke angir noen innslag, blir de bestemt\n"
-"                     fra informasjon i selve Infofilen.\n"
-" --help            vise denne hjelpen og avslutte.\n"
-" --info-file=FIL   angi Infofilen som skal installeres i katalogen.\n"
-"                     Dette er det samme som å bruke INFOFIL-argumentet.\n"
-" --info-dir=DIR    det samme som --dir-file=DIR/dir.\n"
-" --item=TEKST      det samme som --entry TEKST.\n"
-"                     Et Info-kataloginnslag er egentlig et menypunkt.\n"
-" --quiet           undertrykke advarsler.\n"
-" --remove          det samme som --delete.\n"
-" --section=AVS     putte denne filens innslag i avsnittet AVS i katalogen.\n"
-"                     Dersom du angir mer enn et avsnitt, blir alle "
-"innslagene\n"
-"                     lagt til i hver av avsnittene.\n"
-"                     Dersom du ikke angir noen avsnitt, blir de bestemt\n"
-"                     fra informasjon i selve Infofilen.\n"
-" --version         vise programversjon og avslutte.\n"
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
 msgstr ""
-"Dette er filen .../info/dir, som inneholder den øverste\n"
-"noden i Info-hierarkiet, kalt (dir)Top.\n"
-"Første gangen du starter Info begynner du i denne noden.\n"
-"\n"
-"%s\tDette er toppen av INFO-treet\n"
-"\n"
-"  Denne katalognoden gir en meny over alle hovedemner.\n"
-"  Inntasting av «q» avslutter, «?» lister alle Info-kommandoene, «d» "
-"returner hit,\n"
-"  «h» gir en innføring for nybegynnere,\n"
-"  «mEmacs<Return>» besøker Emacs-manualen, osv.\n"
-"\n"
-"  I Emacs kan du klikke med musknapp 2 på et menypunkt eller kryssreferanse\n"
-"  for å velge den.\n"
-"\n"
-"%s\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: kunne ikke lese (%s) og kunne ikke opprette (%s)\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: tom fil"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY uten tilhørende END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY uten tilhørende START-INFO-DIR-ENTRY"
-
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr "%s: har allerede en dirfil: %s\n"
-
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Spesifiser infofilen bare en gang.\n"
-
-#: util/install-info.c:1284
+#: makeinfo/xref.c:252
 #, c-format
-msgid "excess command line argument `%s'"
-msgstr "overflødig argument på kommandolinjen «%s»"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
-msgstr "Ingen innfil angitt; prøv --help for mer informasjon."
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr ""
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr "Ingen dir-fil angitt; prøv --help for mer informasjon."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr ""
 
-#: util/install-info.c:1313
+#: makeinfo/xref.c:390
 #, c-format
-msgid "no info dir entry in `%s'"
-msgstr "ingen info-dir-oppføring i «%s»"
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr ""
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "menypunktet «%s» eksisterer allerede for filen «%s»"
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "Ingen kryssreferanser i denne noden."
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "fant ingen oppføringer for «%s»; ingenting slettet"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr ""
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "vise denne hjelpen og avslutte"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "bevar midlertidige filer etter behandling"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "ikke bevar midlertidige filer etter behandling (standard)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "sende utdata til FILE"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "vise programversjon og avslutte"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Bruksmåte: %s [VALG]... FIL...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Generere en sortert indeks for hver TeX-outputfil.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
-msgstr ""
-"Vanligvis er FIL... angitt som «foo.%c%c» for et dokument «foo.texi».\n"
+msgstr "Vanligvis er FIL... angitt som «foo.%c%c» for et dokument «foo.texi».\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3086,23 +3108,388 @@ msgstr ""
 "\n"
 "Valg:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: ikke en texinfo-indeksfil"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "feil ved gjenåpning av %s"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: ikke en texinfo-indeksfil"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "Ingen sidenummer i %s"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "oppføring %s følger en oppføring med et annet navn"
+
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10[search]  Søke forover etter en angitt streng\n"
+#~ "              og velge den noden som den neste forekomsten blir funnet "
+#~ "i.\n"
+
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10[goto-node]  Flytte til en node angitt ved navn.\n"
+#~ "              Du kan like godt inkludere et filnavn, som i (FILNAVN)"
+#~ "NODENAVN.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "\\%-10[next-node]  Flytte til neste node etter denne noden.\n"
+
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr ""
+#~ "\\%-10[dir-node]  Flytte til «katalog»-noden.  Det samme som «\\[goto-node] "
+#~ "(DIR)».\n"
+
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr ""
+#~ "\\%-10[top-node]  Flytte til «Top»-noden.  Det samme som «\\[goto-node] "
+#~ "Top».\n"
+
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10[search-backward]  Søke baklengs etter en angitt streng\n"
+#~ "              og velge den noden som den neste forekomsten blir funnet "
+#~ "i.\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr ""
+#~ "--- Bruk «\\[history-node]» eller «\\[kill-node]» for å avslutte ---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr ""
+#~ "\\%-10[move-to-prev-xref]  Flytte til neste hypertekstlenke innen denne "
+#~ "noden.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "Bruksmåte: %s [VALG]... [MENYPUNKT...]\n"
+#~ "\n"
+#~ "Lese dokumentasjon i Infoformat.\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "     --apropos=EMNE           søke etter EMNE i alle indeksene til alle "
+#~ "Infofilene.\n"
+#~ " -d, --directory=KAT          legge til KAT til INFOPATH.\n"
+#~ "     --dribble=FILNAVN        huske brukerens tastetrykk i FILNAVN.\n"
+#~ " -f, --file=FILNAVN           angi Infofilen som skal besøkes.\n"
+#~ " -h, --help                   vise denne hjelpen og avslutte.\n"
+#~ "     --index-search=STRENG    gå til noden pekt på av indeksoppslaget "
+#~ "STRENG.\n"
+#~ " -n, --node=NODENAVN          angi noder i første besøkte Infofil.\n"
+#~ " -o, --output=FILNAVN         skrive ut utvalgte noder til FILNAVN.\n"
+#~ " -R, --raw-escapes            ikke fjern ANSI-escapes fra mansider.\n"
+#~ "     --restore=FILNAVN        lese innledende tastetrykk fra FILNAVN.\n"
+#~ " -O, --show-options, --usage  gå til kommandolinje-valg-noden.\n"
+#~ "%s     --subnodes               rekursivt skrive ut menypunkter.\n"
+#~ "     --vi-keys                bruke vi-aktige og less-aktige "
+#~ "tastebindinger.\n"
+#~ "     --version                vise programversjon og avslutte.\n"
+#~ "\n"
+#~ "Det første ikke-valg-argumentet, dersom tilstede, er menypunktet som du\n"
+#~ "starter fra; det blir søkt etter i alle «dir»-filer langs med INFOPATH.\n"
+#~ "Dersom menypunktet ikke er tilstede, vil info flette sammen alle\n"
+#~ "«dir»-filene og vise resultatet.  Øvrige gjenværende argumenter blir\n"
+#~ "behandlet som navnene til menypunktene relativ til den første besøkte\n"
+#~ "noden.\n"
+#~ "\n"
+#~ "Eksempler:\n"
+#~ "  info                       vise toppnivå dirmeny\n"
+#~ "  info emacs                 starte ved emacs-noden fra toppnivå dir\n"
+#~ "  info emacs buffers         starte ved buffers-noden i emacs-manualen\n"
+#~ "  info --show-options emacs  starte ved emacs kommandolinjevalg\n"
+#~ "  info -f ./foo.info         vise filen ./foo.info, ikke søke gjennom "
+#~ "dir\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr ""
+#~ "              Valg av menypunkt fører til at en annen node blir valgt.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "              Du kan like godt inkludere et filnavn, som i (FILNAVN)"
+#~ "NODENAVN.\n"
+
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr ""
+#~ "  %-10s  Søke baklengs gjennom denne Infofilen for en spesifikk streng,\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "              og velge den noden som i det neste tilfellet blir funnet.\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "Følger nestenoden..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "Velger første menypunkt..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "Velger nestenoden..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "Flytter opp %d gang(er), deretter neste."
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "Flytter til forrige i dette vinduet."
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "Flytter opp i dette vinduet."
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "Flytter til «forrige»s siste menypunkt."
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "Funksjon"
+
+#~ msgid "Macro"
+#~ msgstr "Makro"
+
+#~ msgid "Special Form"
+#~ msgstr "Spesiell form"
+
+#~ msgid "Variable"
+#~ msgstr "Variabel"
+
+#~ msgid "User Option"
+#~ msgstr "Brukervalg"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Forekomst"
+
+#~ msgid "Method"
+#~ msgstr "Metode"
+
+#~ msgid "Untitled"
+#~ msgstr "Uten navn"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "Dette er %s, produsert av makeinfo versjon %s fra %s.\n"
+
+#~ msgid "Next:"
+#~ msgstr "Neste:"
+
+#~ msgid "Previous:"
+#~ msgstr "Forrige:"
+
+#~ msgid "Up:"
+#~ msgstr "Opp:"
+
+#~ msgid "Menu"
+#~ msgstr "Meny"
+
+#~ msgid "Cross"
+#~ msgstr "Kryss"
+
+#~ msgid "Prev"
+#~ msgstr "forrige"
+
+#~ msgid "Up"
+#~ msgstr "opp"
+
+#, fuzzy
+#~ msgid "see "
+#~ msgstr "Se "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "Bruksmåte: %s [VALG]... [INFOFIL [DIRFIL]]\n"
+#~ "\n"
+#~ "Installere eller slette dir-innslag fra INFOFIL i Info-katalogfilen\n"
+#~ "DIRFIL.\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ " --delete          slette eksisterende innslag for INFOFIL fra DIRFIL;\n"
+#~ "                     ikke sett inn noe nye innslag.\n"
+#~ " --dir-file=NAVN   angi filnavnet til Info-katalogfilen.\n"
+#~ "                     Dette er det samme som å bruke DIRFIL-argumentet.\n"
+#~ " --entry=TEKST     sette inn TEKST som en Info-kataloginnslag.\n"
+#~ "                     TEKST bør ha form som et Info-menypunkt\n"
+#~ "                     pluss null eller flere linjer som starter med "
+#~ "whitespace.\n"
+#~ "                     Dersom du angir mer enn et innslag, blir alle lagt "
+#~ "til.\n"
+#~ "                     Dersom du ikke angir noen innslag, blir de bestemt\n"
+#~ "                     fra informasjon i selve Infofilen.\n"
+#~ " --help            vise denne hjelpen og avslutte.\n"
+#~ " --info-file=FIL   angi Infofilen som skal installeres i katalogen.\n"
+#~ "                     Dette er det samme som å bruke INFOFIL-argumentet.\n"
+#~ " --info-dir=DIR    det samme som --dir-file=DIR/dir.\n"
+#~ " --item=TEKST      det samme som --entry TEKST.\n"
+#~ "                     Et Info-kataloginnslag er egentlig et menypunkt.\n"
+#~ " --quiet           undertrykke advarsler.\n"
+#~ " --remove          det samme som --delete.\n"
+#~ " --section=AVS     putte denne filens innslag i avsnittet AVS i "
+#~ "katalogen.\n"
+#~ "                     Dersom du angir mer enn et avsnitt, blir alle "
+#~ "innslagene\n"
+#~ "                     lagt til i hver av avsnittene.\n"
+#~ "                     Dersom du ikke angir noen avsnitt, blir de bestemt\n"
+#~ "                     fra informasjon i selve Infofilen.\n"
+#~ " --version         vise programversjon og avslutte.\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "menypunktet «%s» eksisterer allerede for filen «%s»"
+
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr "\\%-10[menu-digit]  Velge første ... niende punkt i nodens meny.\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "noden «%s» har blitt referert %d ganger"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Det finnes INGEN garanti.  Du kan redistribuere denne programvaren\n"
+#~ "etter betingelsene i GNU General Public License.  For mer informasjon\n"
+#~ "om dette, se filen COPYING.\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-arg bare brukbart når makroen bare tar et argument"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Innholdsfortegnelse"
+
+#~ msgid "Short Contents"
+#~ msgstr "Kort innholdsfortegnelse"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "bevar midlertidige filer etter behandling"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "ikke bevar midlertidige filer etter behandling (standard)"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr ""
+#~ "              infofil, og velge noden referert av det første oppslaget "
+#~ "funnet.\n"
+
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "Det finnes INGEN garanti.  Du kan redistribuere denne programvaren\n"
+#~ "etter betingelsene i GNU General Public License.  For mer informasjon\n"
+#~ "om dette, se filen COPYING.\n"
diff --git a/Build/source/utils/texinfo/po/nl.gmo b/Build/source/utils/texinfo/po/nl.gmo
index 81ecd32f915..72e9e0b51e6 100644
--- a/Build/source/utils/texinfo/po/nl.gmo
+++ b/Build/source/utils/texinfo/po/nl.gmo
diff --git a/Build/source/utils/texinfo/po/nl.po b/Build/source/utils/texinfo/po/nl.po
index 20ae5111ce1..53cbe1a3c10 100644
--- a/Build/source/utils/texinfo/po/nl.po
+++ b/Build/source/utils/texinfo/po/nl.po
@@ -1,936 +1,1019 @@
-# Dutch messages for GNU texinfo
-# Copyright (C) 1998 Free Software Foundation, Inc.
-# Ivo Timmermans <zarq@iname.com>, 1998.
+# Dutch translations for texinfo.
+# Copyright (C) 2008 Free Software Foundation, Inc.
 #
+# Ivo Timmermans <zarq@iname.com>, 1998.
+# Freek de Kruijf <f.de.kruijf@hetnet.nl>, 2004, 2005, 2007.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 3.12\n"
+"Project-Id-Version: texinfo-4.11.93\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
-"PO-Revision-Date: 1998-04-16 22:35+02:00\n"
-"Last-Translator: Ivo Timmermans <zarq@iname.com>\n"
-"Language-Team: Dutch <nl@li.org>\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2008-03-30 19:22+0200\n"
+"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr "Onbekende systeemfout"
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: optie '%s' is niet eenduidig\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: optie '--%s' staat geen argument toe\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: optie '%c%s' staat geen argument toe\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: optie '%s' vereist een argument\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: onbekende optie '--%s'\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: onbekende optie '%c%s'\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ongeldige optie -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ongeldige optie -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: optie vereist een argument -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: optie '-W %s' is niet eenduidig\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: optie '-W %s' staat geen argument toe\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "onvoldoende geheugen beschikbaar"
 
-#: info/echo-area.c:284 info/session.c:689
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
-msgstr "Beweeg een teken naar voren"
+msgstr "Eén teken verder"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
-msgstr "Beweeg een teken naar achteren"
+msgstr "Eén teken terug"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
-msgstr "Ga naar het begin van deze regel"
+msgstr "Naar het begin van de regel"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
-msgstr "Ga naar het einde van deze regel"
+msgstr "Naar het einde van de regel"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
-msgstr "Beweeg een woord naar voren"
+msgstr "Eén woord verder"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
-msgstr "Beweeg een woord naar achteren"
+msgstr "Eén woord terug"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
-msgstr "Verwijder het teken onder de cursor"
+msgstr "Het teken onder de cursor verwijderen"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
-msgstr "Verwijder het teken achter de cursor"
+msgstr "Het teken na de cursor verwijderen"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
-msgstr "Annuleer of beëindig operatie"
+msgstr "Operatie annuleren of beëindigen"
 
-# completion?
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
-msgstr "Accepteer (of forceer voltooiïng van) deze regel"
+msgstr "Deze regel accepteren (of de voltooiing ervan forceren)"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
-msgstr "Voeg volgend teken letterlijk in"
+msgstr "De volgende toets verbatim invoegen"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
-msgstr "Voeg dit teken in"
+msgstr "Dit teken invoegen"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
-msgstr "Voeg een TAB code in"
+msgstr "Een TAB-teken invoegen"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
-msgstr "Transponeer karakters op een punt"
+msgstr "De tekens op dit punt transponeren"
 
-# kill?
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
-msgstr "Zet de inhoud van de laatste kill terug"
+msgstr "Het laatst verwijderde terughalen"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
-msgstr "Kill ring is leeg"
+msgstr "De verwijderingsbuffer is leeg."
 
-# kill?
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
-msgstr "Zet een eerdere kill terug"
+msgstr "Een eerdere verwijdering terughalen"
 
-# kill?
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
-msgstr "Verwijder tot aan het einde van de regel"
+msgstr "Tot aan het eind van de regel verwijderen"
 
-# kill?
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
-msgstr "Verwijder tot aan het begin van de regel"
+msgstr "Tot aan het begin van de regel verwijderen"
 
-# kill?
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
-msgstr "Verwijder het woord na de cursor"
+msgstr "Het woord na de cursor verwijderen"
 
-# kill?
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
-msgstr "Verwijder het woord voor de cursor"
+msgstr "Het woord voor de cursor verwijderen"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
-msgstr "Geen voltooiïngen"
+msgstr "Geen voltooiingen"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Niet compleet"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
-msgstr "Geef een lijst van mogelijke voltooiïngen"
+msgstr "De mogelijke voltooiingen tonen"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
-msgstr "Enige voltooiïng"
+msgstr "Enige voltooiing"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
-msgstr "Een voltooiïng:\n"
+msgstr "Eén mogelijkheid:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
-msgstr "%d voltooiïngen:\n"
+msgstr "Er zijn %d mogelijkheden:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
-msgstr "Voeg voltooiïng in"
+msgstr "Een voltooiing invoegen"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
-msgstr "Voltooiïngen aan het bouwen..."
+msgstr "Opbouwen van voltooiingen..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
-msgstr "Verschuif het voltooiïngsvenster"
+msgstr "Het voltooiingsvenster scrollen"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
-msgstr "De voetnoten konden niet weergegeven worden"
+msgstr "De voetnoten kunnen niet weergegeven worden"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr ""
-"Laat de voetnoten zien die met deze pagina verbonden zijn in een ander "
-"venster"
+"In een ander venster de voetnoten tonen die met deze pagina verbonden zijn"
 
 #: info/footnotes.h:26
-#, fuzzy
 msgid "---------- Footnotes ----------"
-msgstr ""
-"---------- Voetnoten ----------\n"
-"\n"
+msgstr "---------- Voetnoten ----------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
-msgstr "Zoek een string op in de index voor dit bestand"
+msgstr "Een tekenreeks opzoeken in de index van dit bestand"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
-msgstr "Zoeken naar index ingangen..."
+msgstr "Zoeken naar index-items..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
-msgstr "Geen indices gevonden."
+msgstr "Geen indexen gevonden."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
-msgstr "Index ingang: "
+msgstr "Index-item: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
-"Ga naar de volgende overeenkomende index-ingang van het laatste `\\[index-"
-"search]' commando"
+"Naar het volgende overeenkomende item van het laatste '\\[index-search]'-"
+"commando"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
-msgstr "Geen eerdere index zoek string."
+msgstr "Geen eerdere index-zoektekenreeks."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
-msgstr "Geen index ingangen."
+msgstr "Geen index-items."
 
-#: info/indices.c:375
-#, fuzzy, c-format
+#: info/indices.c:374
+#, c-format
 msgid "No %sindex entries containing `%s'."
-msgstr "Geen index ingangen %sdie \"%s\" bevatten."
+msgstr "Er zijn geen index-items %s die '%s' bevatten."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "meer "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "KAN DIT NIET ZIEN"
 
-#: info/indices.c:422
-#, fuzzy, c-format
+#: info/indices.c:421
+#, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
-msgstr ""
-"\"%s\" gevonden in %s. (`\\[next-index-match]' probeert de volgende te "
-"vinden.)"
+msgstr "'%s' gevonden in %s -- ('\\[next-index-match]' zoekt de volgende)"
 
-#: info/indices.c:541
-#, fuzzy, c-format
+#: info/indices.c:549
+#, c-format
 msgid "Scanning indices of `%s'..."
-msgstr "Zoeken in indices van \"%s\"..."
+msgstr "Zoeken in de indexen van '%s'..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
-msgstr ""
+msgstr "Geen van de beschikbare Info-bestanden heeft '%s' in z'n index."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
-"Doorzoek alle bekende indices van info-bestanden voor een string en maak een "
-"menu"
+"Alle Info-bestandsindexen doorzoeken naar een tekenreeks en een menu maken"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
-msgstr "Index apropos: "
+msgstr "Index-apropos: "
 
-#: info/indices.c:654
-#, fuzzy, c-format
+#: info/indices.c:662
+#, c-format
 msgid ""
 "\n"
 "* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
-"* Menu: Pagina's waarvan de indices \"%s\" bevatten:\n"
+"* Menu: Pagina's waarvan de indexen '%s' bevatten:\n"
 
-#: info/info.c:275 info/infokey.c:899
-#, fuzzy, c-format
+#: info/info.c:273 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
-msgstr "Probeer --help voor meer informatie."
+msgstr "Gebruik '--help' voor meer informatie.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
-#, fuzzy, c-format
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"Er is GEEN garantie.  Je mag deze programmatuur herdistribueren\n"
-"onder de voorwaarden van de GNU General Public License.\n"
-"Voor meer informatie hierover, zie de bestanden met de naam COPYING.\n"
+"Dit is vrije software: u mag het vrijelijk wijzigen en verder verspreiden.\n"
+"De precieze licentie is GPLv3+: GNU GPL versie 3 of later;\n"
+"zie http://gnu.org/licenses/gpl.html voor de volledige tekst.\n"
+"Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
 
-#: info/info.c:498
-#, fuzzy, c-format
+#: info/info.c:504
+#, c-format
 msgid "no index entries found for `%s'\n"
-msgstr "geen ingangen gevonden\n"
+msgstr "geen index-items gevonden voor '%s'\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-
-#: info/info.c:597
-#, fuzzy, c-format
+#: info/info.c:598
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
+msgstr ""
+"Gebruik:  %s [OPTIE]... [MENU-ITEM...]\n"
 "\n"
+"Documentatie in Info-opmaak lezen.\n"
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+"Opties:\n"
+"      --apropos=TEKENREEKS     in alle Info-indexen naar deze tekenreeks "
+"zoeken\n"
+"  -d, --directory=MAP          deze map toevoegen aan het zoekpad "
+"'INFOPATH'\n"
+"      --dribble=BESTAND        toetsaanslagen in dit bestand opslaan\n"
+"  -f, --file=BESTAND           het te bekijken Info-bestand"
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+"  -h, --help                   deze hulptekst tonen en stoppen\n"
+"      --index-search=NAAM      de pagina tonen waarnaar dit index-item "
+"verwijst\n"
+"  -n, --node=PAGINANAAM        een te bezoeken pagina\n"
+"  -o, --output=BESTAND         de gekozen pagina's naar dit bestand schrijven"
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+"  -R, --raw-escapes            \"ruwe\" ANSI-stuurcodes schrijven "
+"(standaard)\n"
+"      --no-raw-escapes         stuurcodes als tekst uitschrijven\n"
+"      --restore=BESTAND        de eerste toetsaanslagen uit dit bestand "
+"lezen\n"
+"  -O, --show-options, --usage  de pagina met de commandoregelopties tonen"
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+"  -b, --speech-friendly        uitvoer toesnijden op spraaksynthesizers"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+"      --subnodes               recursief alle menu-items uitvoeren\n"
+"      --vi-keys                toetsbindingen als in 'vi' en 'less' "
+"gebruiken\n"
+"      --version                versie-informatie tonen en stoppen\n"
+"  -w, --where, --location      het volledige pad van het Info-bestand tonen"
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+"\n"
+"Als 'info' zonder argumenten gestart wordt, dan toont het een overzicht van\n"
+"alle beschikbare documenten.  Als er argumenten gegeven worden, dan wordt "
+"het\n"
+"eerste argument begrepen als het te kiezen menu-item uit dat overzicht.\n"
+"Eventuele overige argumenten worden steeds begrepen als het te kiezen\n"
+"menu-item in de op dat moment bereikte pagina."
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Aanroep: %s [OPTIE]... [INFO-BESTAND [MENU-ITEM...]]]\n"
 "\n"
-"Lees documentatie in Info-formaat\n"
-"Voor een meer complete omschrijving van het gebruik van Info, type `info "
-"info options'.\n"
-"\n"
-"Opties:\n"
-"--directory DIR              Voeg DIR toe aan INFOPAD.\n"
-"--dribble BESTAND            Onthoud toetsaanslagen in BESTAND.\n"
-"--file BESTAND               Specificeer te bekijken Info bestand.\n"
-"--node PAGINANAAM            Specificeer pagina's in het eerste Info "
-"bestand.\n"
-"--output BESTAND             Schrijf de geselecteerde pagina's naar "
-"BESTAND.\n"
-"--restore BESTAND            Lees de eerste toetsaanslagen uit BESTAND.\n"
-"--subnodes                   Geef recursief alle menu-items.\n"
-"--help                       Laat deze helptekst zien en beëindig.\n"
-"--version                    Geef de versie-informatie van Info en "
-"beëindig.\n"
-"\n"
-"Het eerste argument, indien aanwezig, is de naam van het Info-bestand\n"
-"dat ingelezen dient te worden. Alle overige argumenten worden\n"
-"beschouwd als de namen van menu items in de eerste bezochte pagina.  Bij\n"
-"voorbeeld, `info emacs buffers' gaat naar de pagina `buffers' in het\n"
-"bestand `emacs'.\n"
-"\n"
-"Meld fouten in het programma aan bug-texinfo@gnu.org;\n"
-"meld onjuistheden in de vertaling aan nl@li.org."
-
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+"Voorbeelden:\n"
+"  info                         het inhoudsmenu tonen (een compleet "
+"overzicht)\n"
+"  info emacs                   de eerste pagina van het Emacs-document "
+"tonen\n"
+"  info emacs buffers           de 'Buffers'-pagina van het Emacs-document "
+"tonen\n"
+"  info --show-options emacs    de pagina met de Emacs-commandoregelopties "
+"tonen\n"
+"  info --subnodes -o em.txt emacs  het gehele Emacs-document in 'em.txt' "
+"dumpen\n"
+"  info -f ./foo.info           het bestand './foo.info' tonen"
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
 "Texinfo home page: http://www.gnu.org/software/texinfo/"
 msgstr ""
+"\n"
+"Stuur foutrapportages naar <bug-texinfo@gnu.org>,\n"
+"algemene vragen en commentaar naar <help-texinfo@gnu.org>,\n"
+"en opmerkingen over de vertaling naar <vertaling@vrijschrift.org>.\n"
+"Texinfo-homepagina: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
-#, fuzzy, c-format
+#: info/info.c:684
+#, c-format
 msgid "Cannot find node `%s'."
-msgstr "Kan pagina `%s' niet verwijderen"
+msgstr "Kan pagina '%s' niet vinden."
 
-#: info/info.c:670
-#, fuzzy, c-format
+#: info/info.c:685
+#, c-format
 msgid "Cannot find node `(%s)%s'."
-msgstr "Kan pagina `%s' niet verwijderen"
+msgstr "Kan pagina '(%s)%s' niet vinden."
 
-#: info/info.c:671
-#, fuzzy
+#: info/info.c:686
 msgid "Cannot find a window!"
-msgstr "Kan een permanent venster niet verwijderen"
+msgstr "Kan geen venster vinden!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
-msgstr ""
+msgstr "Het punt bevindt zich niet in de pagina van dit venster!"
 
-#: info/info.c:673
-#, fuzzy
+#: info/info.c:688
 msgid "Cannot delete the last window."
-msgstr "Kan een permanent venster niet verwijderen"
+msgstr "Het laatste venster kan niet gesloten worden."
 
-#: info/info.c:674
-#, fuzzy
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "Er is geen menu op deze pagina."
 
-#: info/info.c:675
-#, fuzzy
+#: info/info.c:690
 msgid "No footnotes in this node."
-msgstr "Geen verwijzingen in deze pagina."
+msgstr "Er zijn geen voetnoten op deze pagina."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
-msgstr "Geen verwijzingen in deze pagina."
+msgstr "Er zijn geen kruisverwijzingen op deze pagina."
 
-#: info/info.c:677
-#, fuzzy, c-format
+#: info/info.c:692
+#, c-format
 msgid "No `%s' pointer for this node."
-msgstr "Geen \"Volgende\" wijzer voor deze pagina."
+msgstr "Er is geen '%s'-koppeling op deze pagina."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
-msgstr ""
+msgstr "Onbekend Info-commando '%c'; typ '?' voor hulp."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
-msgstr ""
+msgstr "Terminaltype '%s' is niet krachtig genoeg voor Info."
 
-#: info/info.c:680
-#, fuzzy
+#: info/info.c:695
 msgid "You are already at the last page of this node."
-msgstr "Ga naar het begin van deze pagina"
+msgstr "U bent al aan het eind van deze pagina."
 
-#: info/info.c:681
-#, fuzzy
+#: info/info.c:696
 msgid "You are already at the first page of this node."
-msgstr "Ga naar het begin van deze pagina"
+msgstr "U bent al aan het begin van deze pagina."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
-msgstr ""
+msgstr "Slechts één venster."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
-msgstr ""
+msgstr "Het resulterende venster zou te klein zijn."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
-msgstr ""
+msgstr "Niet genoeg ruimte voor een hulp-venster; sluit een venster."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-#, fuzzy
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
-msgstr "Basiscommando's in Info Vensters"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
+msgstr "=====  Basiscommando's van 'info'  =====\n"
 
-#: info/infodoc.c:49
-#, fuzzy
-msgid "\\%-10[quit-help]  Quit this help.\n"
-msgstr "Geen \"Vorige\" voor deze pagina."
+#: info/infodoc.c:47
+msgid "\\%-10[quit-help]  Close this help window.\n"
+msgstr "\\%-10[quit-help]  Dit hulpvenster sluiten.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
-msgstr ""
+msgstr "\\%-10[quit]  Info afsluiten.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
-msgstr ""
+msgstr "\\%-10[get-info-help-node]  Een korte Info-cursus oproepen.\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-#, fuzzy
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr "Selecteer de `Vorige' pagina"
+#: info/infodoc.c:51
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-line]  Eén regel omhoog.\n"
+
+#: info/infodoc.c:52
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  Eén regel omlaag.\n"
+
+#: info/infodoc.c:53
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Eén blad terug (<Backspace>).\n"
+
+#: info/infodoc.c:54
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Eén blad verder (<Spatiebalk>).\n"
 
 #: info/infodoc.c:55
-#, fuzzy
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "Ga naar het einde van deze pagina"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Naar het begin van deze pagina.\n"
 
 #: info/infodoc.c:56
-#, fuzzy
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "Ga naar het einde van deze pagina"
-
-#: info/infodoc.c:57
-#, fuzzy
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "Geen \"Vorige\" voor deze pagina."
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Naar het einde van deze pagina.\n"
 
 #: info/infodoc.c:58
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr "\\%-10[move-to-next-xref]  Naar de volgende koppeling springen.\n"
+
+#: info/infodoc.c:59
 msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
+"\\%-10[select-reference-this-line]  De koppeling onder de cursor volgen "
+"(<Enter>).\n"
 
 #: info/infodoc.c:60
-msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr ""
-
-#: info/infodoc.c:61
-#, fuzzy
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
-msgstr "Selecteer de laatste pagina in dit bestand"
+"\\%-10[history-node]  Terug naar de laatst geziene pagina in dit venster.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr ""
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[global-prev-node]  Naar de voorgaande pagina.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr ""
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[global-next-node]  Naar de volgende pagina.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr ""
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Naar de voorgaande pagina op dit niveau.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Naar de volgende pagina op dit niveau.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr ""
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Naar de bovenliggende pagina.\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-#, fuzzy
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"---------- Voetnoten ----------\n"
-"\n"
+#: info/infodoc.c:67
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[top-node]  Naar de eerste pagina van dit document.\n"
+
+#: info/infodoc.c:68
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[dir-node]  Naar de hoofd-inhoudspagina.\n"
 
-# kill?
 #: info/infodoc.c:70
-#, fuzzy
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "Verwijder tot aan het begin van de regel"
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr ""
+"1...9       Het eerste...negende item uit het menu op deze pagina kiezen.\n"
 
 #: info/infodoc.c:71
-#, fuzzy
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "Ga naar het einde van deze pagina"
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr ""
+"\\%-10[last-menu-item]  Het laatste item uit het menu op deze pagina "
+"kiezen.\n"
 
 #: info/infodoc.c:72
-#, fuzzy
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "Schuif terug in dit venster"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "\\%-10[menu-item]  Een menu-item kiezen door diens naam op te geven.\n"
 
 #: info/infodoc.c:73
-#, fuzzy
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "Schuif terug in dit venster"
-
-#: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
 msgstr ""
+"\\%-10[xref-item]  Een kruisverwijzing volgen door diens naam op te geven.\n"
 
-#: info/infodoc.c:75
-#, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "Schuif terug in dit venster"
-
-#: info/infodoc.c:77 info/infodoc.c:125
-#, fuzzy
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr "Waar is het commando: "
+#: info/infodoc.c:74
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "\\%-10[goto-node]  Naar een pagina gaan door diens naam op te geven.\n"
 
-#: info/infodoc.c:79
-#, fuzzy
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "Selecteer de laatste keuze in het menu van deze pagina"
+#: info/infodoc.c:76
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "\\%-10[search]  Voorwaarts zoeken naar een tekenreeks.\n"
 
-#: info/infodoc.c:80
-#, fuzzy
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "Selecteer de laatste keuze in het menu van deze pagina"
+#: info/infodoc.c:77
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[search-previous]  Vorige zoeken.\n"
 
-#: info/infodoc.c:81
-msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
-msgstr ""
+#: info/infodoc.c:78
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "\\%-10[search-next]  Volgende zoeken.\n"
 
-#: info/infodoc.c:83
+#: info/infodoc.c:79
 msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
+"\\%-10[index-search]  Naar een tekenreeks zoeken in de index van dit Info-"
+"bestand,\n"
+"              en de pagina behorend bij het eerste gevonden item "
+"selecteren.\n"
 
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
+#: info/infodoc.c:81
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "\\%-10[abort-key]  Huidige operatie annuleren of beëindigen.\n"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
+"Basiscommando's van 'info'\n"
+"==========================\n"
 
-#: info/infodoc.c:98
-#, fuzzy, c-format
+#: info/infodoc.c:92
+#, c-format
 msgid "  %-10s  Quit this help.\n"
-msgstr "Geen \"Vorige\" voor deze pagina."
+msgstr "  %-10s  Dit hulpvenster sluiten.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
-msgstr ""
+msgstr "  %-10s  Info afsluiten.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
-msgstr ""
+msgstr "  %-10s  Een korte Info-cursus oproepen.\n"
 
-#: info/infodoc.c:104
-#, fuzzy, c-format
+#: info/infodoc.c:98
+#, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
-msgstr "Ga naar het einde van deze pagina"
+msgstr "  %-10s  Naar de volgende pagina.\n"
 
-#: info/infodoc.c:105
-#, fuzzy, c-format
+#: info/infodoc.c:99
+#, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
-msgstr "Ga naar het einde van deze pagina"
+msgstr "  %-10s  Naar de voorgaande pagina.\n"
 
-#: info/infodoc.c:106
-#, fuzzy, c-format
+#: info/infodoc.c:100
+#, c-format
 msgid "  %-10s  Move `up' from this node.\n"
-msgstr "Geen \"Vorige\" voor deze pagina."
+msgstr "  %-10s  Naar de bovenliggende pagina.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:101
 #, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr ""
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr ""
+"  %-10s  Een menu-item kiezen door diens naam op te geven;\n"
+"              dit selecteert een andere pagina.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
-msgstr ""
+msgstr "  %-10s  Een kruisverwijzing volgen door diens naam op te geven.\n"
 
-#: info/infodoc.c:110
-#, fuzzy, c-format
+#: info/infodoc.c:104
+#, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
-msgstr "Selecteer de laatste pagina in dit bestand"
+msgstr "  %-10s  Terug naar de laatst geziene pagina in dit venster.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
-msgstr ""
+msgstr "  %-10s  Naar de volgende koppeling springen.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
-msgstr ""
+msgstr "  %-10s  De koppeling onder de cursor volgen.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
-msgstr ""
+msgstr "  %-10s  Naar de hoofd-inhoudspagina.\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
+msgstr "  %-10s  Naar de eerste pagina van dit document.\n"
+
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
 msgstr ""
+"Bewegen binnen een pagina:\n"
+"--------------------------\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
-msgstr ""
+msgstr "  %-10s  Eén blad verder.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
-msgstr ""
+msgstr "  %-10s  Eén blad terug.\n"
 
-# kill?
-#: info/infodoc.c:120
-#, fuzzy, c-format
+#: info/infodoc.c:114
+#, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
-msgstr "Verwijder tot aan het begin van de regel"
+msgstr "  %-10s  Naar het begin van deze pagina.\n"
 
-#: info/infodoc.c:121
-#, fuzzy, c-format
+#: info/infodoc.c:115
+#, c-format
 msgid "  %-10s  Go to the end of this node.\n"
-msgstr "Ga naar het einde van deze pagina"
+msgstr "  %-10s  Naar het einde van deze pagina.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
-msgstr ""
+msgstr "  %-10s  Eén regel omlaag.\n"
 
-#: info/infodoc.c:123
-#, fuzzy, c-format
+#: info/infodoc.c:117
+#, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
-msgstr "Schuif terug in dit venster"
+msgstr "  %-10s  Eén regel omhoog.\n"
 
-#: info/infodoc.c:127
-#, fuzzy, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
-msgstr "Selecteer de laatste keuze in het menu van deze pagina"
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Enkele andere commando's:\n"
+"-------------------------\n"
+
+#: info/infodoc.c:121
+#, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
+msgstr ""
+"  %-10s  Het eerste...negende item uit het menu op deze pagina kiezen.\n"
 
-#: info/infodoc.c:128
-#, fuzzy, c-format
+#: info/infodoc.c:122
+#, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
-msgstr "Selecteer de laatste keuze in het menu van deze pagina"
+msgstr "  %-10s  Het laatste item uit het menu op deze pagina kiezen.\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:125
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
+"  %-10s  Naar een tekenreeks zoeken in de index van dit Info-bestand,\n"
+"              en de pagina behorend bij het eerste gevonden item "
+"selecteren.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:127
 #, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr ""
-
-#: info/infodoc.c:132
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
+"  %-10s  Naar een pagina gaan door diens naam op te geven; er mag een\n"
+"              bestandsnaam meegegeven worden via (BESTANDSNAAM)PAGINANAAM.\n"
 
-#: info/infodoc.c:133
+#: info/infodoc.c:129
 #, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr ""
-
-#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
-msgstr ""
+msgstr "  %-10s  Voorwaarts zoeken naar een tekenreeks.\n"
 
-#: info/infodoc.c:135
-#, fuzzy, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "Schuif terug in dit venster"
+#: info/infodoc.c:131
+#, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr "  %-10s  Achterwaarts zoeken naar een tekenreeks.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
-msgstr ""
+msgstr "Het huidige zoekpad voor Info-bestanden is:\n"
 
-#: info/infodoc.c:320
-#, fuzzy
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
-msgstr "Basiscommando's in Info Vensters"
+msgstr ""
+"Alle beschikbare commando's in Info-vensters:\n"
+"=============================================\n"
+"\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr ""
+"Beschikbare commando's in de echoregel:\n"
+"=======================================\n"
+"\n"
 
-#: info/infodoc.c:347
-#, fuzzy, c-format
+#: info/infodoc.c:343
+#, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
 "\n"
 msgstr ""
-"De volgende commando's kunnen alleen aangeroepen worden via M-x:\n"
+"De volgende commando's kunnen alleen aangeroepen worden via %s:\n"
+"================================================================\n"
 "\n"
 
-#: info/infodoc.c:351
-#, fuzzy
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
 msgstr ""
-"De volgende commando's kunnen alleen aangeroepen worden via M-x:\n"
+"De volgende commando's kunnen helemaal niet aangeroepen worden:\n"
+"===============================================================\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-"--- Gebruik `\\[history-node]' of `\\[kill-node]' om te beëindigen ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
-msgstr "Geef een help boodschap"
+msgstr "Deze hulptekst tonen"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
-msgstr "Ga naar Info pagina `(info)Help'"
+msgstr "Naar Info-pagina '(info)Help'"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
-msgstr "Geef uitleg over KEY"
+msgstr "Uitleg geven over een toets"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
-msgstr "Omschrijf toets: %s"
+msgstr "Te beschrijven toets: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s is niet gedefinieerd."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s is niet gedefinieerd."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s is gedefinieerd als %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
-msgstr ""
+msgstr "Tonen wat ingetypt moet worden om een gegeven commando uit te voeren"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Waar is het commando: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
-msgstr "`%s' is niet toegekend aan een toets"
+msgstr "'%s' is aan geen enkele toetscombinatie toegekend"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s kan alleen aangeroepen worden via %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s kan aangeroepen worden via %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
-msgstr "Er is geen functie met de naam `%s'"
+msgstr "Er is geen functie met de naam '%s'"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Er is GEEN garantie.  Je mag deze programmatuur herdistribueren\n"
-"onder de voorwaarden van de GNU General Public License.\n"
-"Voor meer informatie hierover, zie de bestanden met de naam COPYING.\n"
+"Selecteren van andere pagina's:\n"
+"-------------------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
-msgstr ""
+msgstr "onjuist aantal argumenten"
 
 #: info/infokey.c:201
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open input file `%s'"
-msgstr "Kan pijp naar \"%s\" niet openen."
+msgstr "kan invoerbestand '%s' niet openen"
 
 #: info/infokey.c:215
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create output file `%s'"
-msgstr "Kan uitvoerbestand \"%s\" niet vinden."
+msgstr "kan uitvoerbestand '%s' niet aanmaken"
 
 #: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
-msgstr ""
+msgstr "fout bij het schrijven naar '%s'"
 
 #: info/infokey.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "error closing output file `%s'"
-msgstr "Kan uitvoerbestand \"%s\" niet vinden."
+msgstr "fout bij het sluiten van uitvoerbestand '%s'"
 
 #: info/infokey.c:450
 msgid "key sequence too long"
-msgstr ""
+msgstr "toetsenreeks is te lang"
 
 #: info/infokey.c:529
 msgid "missing key sequence"
-msgstr ""
+msgstr "ontbrekende toetsenreeks"
 
 #: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
-msgstr ""
+msgstr "NUL-teken (\\000) is niet toegestaan"
 
 #: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
-msgstr ""
+msgstr "NUL-teken (^%c) is niet toegestaan"
 
 #: info/infokey.c:665
-#, fuzzy
 msgid "missing action name"
-msgstr "%c%s ontbrekende afsluitende accolade"
+msgstr "ontbrekende actienaam"
 
 #: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
-msgstr ""
+msgstr "sectie is te lang"
 
 #: info/infokey.c:688
-#, fuzzy, c-format
+#, c-format
 msgid "unknown action `%s'"
-msgstr "Onbekend commando `%s'"
+msgstr "onbekende actie '%s'"
 
 #: info/infokey.c:698
 msgid "action name too long"
-msgstr ""
+msgstr "actienaam is te lang"
 
 #: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
-msgstr ""
+msgstr "extra tekens na actie '%s'"
 
 #: info/infokey.c:723
-#, fuzzy
 msgid "missing variable name"
-msgstr "%s: ontbrekend bestandsargument\n"
+msgstr "ontbrekende naam van variabele"
 
 #: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
-msgstr ""
+msgstr "ontbrekende '=' na naam van variabele"
 
 #: info/infokey.c:741
 msgid "variable name too long"
-msgstr ""
+msgstr "naam van variabele is te lang"
 
 #: info/infokey.c:765
 msgid "value too long"
-msgstr ""
+msgstr "waarde is te lang"
 
 #: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
-msgstr ""
+msgstr "\"%s\", regel %u: "
 
 #: info/infokey.c:906
 #, c-format
@@ -945,98 +1028,117 @@ msgid ""
 "  --help               display this help and exit.\n"
 "  --version            display version information and exit.\n"
 msgstr ""
+"Gebruik:  %s [OPTIE]... [INVOERBESTAND]\n"
+"\n"
+"Een infokey-bronbestand naar een binair infokey-bestand compileren.\n"
+"Dit leest een INVOERBESTAND (standaard $HOME/.infokey) en schrijft\n"
+"het gecompileerde infokey-bestand (standaard) naar $HOME/.info.\n"
+"\n"
+"Opties:\n"
+"  --output BESTAND     uitvoer naar dit bestand schrijven\n"
+"  --help               deze hulptekst tonen en stoppen\n"
+"  --version            versie-informatie tonen en stoppen\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
-msgstr ""
+msgstr "Infokey-bestand '%s' is te klein -- wordt genegeerd"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
-msgstr ""
+msgstr "Infokey-bestand '%s' is te groot -- wordt genegeerd"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
-msgstr ""
+msgstr "Fout bij lezen van infokey-bestand '%s' -- te weinig gelezen"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
+"Ongeldig infokey-bestand '%s' (onjuiste magische nummers) --\n"
+"voer 'infokey' uit om het op orde te brengen"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
+"Uw infokey-bestand '%s' is verouderd --\n"
+"voer 'infokey' uit om het op orde te brengen"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
+"Ongeldig infokey-bestand '%s' (onjuiste sectielengte) --\n"
+"voer 'infokey' uit om het op orde te brengen"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
+"Ongeldig infokey-bestand '%s' (onjuiste sectiecode) --\n"
+"voer 'infokey' uit om het op orde te brengen"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
+"Foute gegevens in infokey-bestand -- enkele toetstoewijzingen zijn genegeerd"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
-msgstr ""
+msgstr "Foute gegevens in infokey-bestand -- sommige definities zijn genegeerd"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
-msgstr "Lees de naam van een Info commando en geef een omschrijving"
+msgstr "De naam van een Info-commando lezen en een omschrijving ervan geven"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
-msgstr "Omschrijf commando: "
+msgstr "Te omschrijven commando: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
-msgstr "Lees de naam van een commando in de weergeefruimte en voer dat uit"
+msgstr "De naam van een commando in de echoregel lezen en deze uitvoeren"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
-msgstr "Kan hier geen `echo-area' commando uitvoeren."
+msgstr "Kan hier geen 'echoregel'-commando uitvoeren."
 
-#: info/m-x.c:154
-#, fuzzy, c-format
+#: info/m-x.c:153
+#, c-format
 msgid "Undefined command: %s"
-msgstr "Onbekend commando `%s'"
+msgstr "Onbekend commando: %s"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
-msgstr "Zet de hoogte van het weergegeven venster"
+msgstr "De hoogte van het weergavevenster instellen"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
-msgstr "Zet schermhoogte op (%d): "
+msgstr "Schermhoogte instellen op (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
-"   Bronbestanden veranderd om dit bestand in te voegen:\n"
+"   Doorzochte bronbestanden om dit bestand te maken omvatten:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
-msgstr "Kon het bestand %s niet manipuleren.\n"
+msgstr "Kan het bestand %s niet manipuleren.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1045,1284 +1147,1529 @@ msgid ""
 msgstr ""
 "\n"
 "* Menu:\n"
-"  (Bestand)Pagina                  Regels Grootte   Bevat Bestand\n"
-"  ---------------                   -----   ----   ---------------"
+"  (Bestand)Pagina                   Regels  Bytes  Volledig pad\n"
+"  ---------------                   ------  -----  ------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
 msgstr ""
-"Hier is het menu van pagina's die je recentelijk bekeken hebt.\n"
-"Selecteer er een uit dit menu, of gebruik `\\[history-node]' in een ander "
-"venster.\n"
+"Hier is een menu van pagina's die u recent bezocht hebt.\n"
+"Selecteer er een, of gebruik `\\[history-node]' in een ander venster.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
-msgstr "Maak een venster met een menu van alle bekeken pagina's"
+msgstr "Een venster openen met een menu van reeds bezochte pagina's"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
-msgstr "Selecteer een pagina die voorheen bekeken is in een zichtbaar venster"
+msgstr "Een pagina selecteren die recent bekeken werd in een zichtbaar venster"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
-msgstr "Selecteer een bezochte pagina: "
+msgstr "Te selecteren bezochte pagina: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "De verwijzing is verdwenen! (%s)."
 
-#: info/session.c:162
-#, fuzzy, c-format
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr "fout in reguliere expressie: %s"
+
+#: info/session.c:164
+#, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
 "for menu item."
 msgstr ""
-"Welkom bij Info versie %s. \"\\[get-help-window]\" voor hulp, \"\\[menu-item]"
-"\" voor een menukeuze."
+"Welkom bij Info versie %s.  Typ <\\[get-help-window]> voor hulp, "
+"<Spatiebalk> om te bladeren."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
-msgstr "Ga naar de volgende regel"
+msgstr "Naar de volgende regel"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
-msgstr "Ga naar de vorige regel"
+msgstr "Naar de vorige regel"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
-msgstr "Ga naar het einde van de regel"
+msgstr "Naar het einde van de regel"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
-msgstr "Ga naar het begin van de regel"
+msgstr "Naar het begin van de regel"
 
-#: info/session.c:860 makeinfo/node.c:1424
-#, fuzzy
+#: info/session.c:1007
 msgid "Next"
 msgstr "Volgende"
 
-#: info/session.c:863
-#, fuzzy
-msgid "Following Next node..."
-msgstr "\"Volgende\" pagina aan het volgen..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Ik selecteer de eerste keuze uit het menu..."
-
-#: info/session.c:893
-#, fuzzy
-msgid "Selecting Next node..."
-msgstr "Ik selecteer de \"Volgende\" pagina..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr ""
-
-#: info/session.c:988
-#, fuzzy
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
-msgstr "Geen verwijzingen in deze pagina."
+msgstr "Dit is de laatste pagina van dit document."
 
-#: info/session.c:1011
-#, fuzzy
+#: info/session.c:1174
 msgid "No `Prev' for this node."
-msgstr "Geen \"Vorige\" voor deze pagina."
+msgstr "Er is geen voorgaande pagina op dit niveau."
 
-#: info/session.c:1014 info/session.c:1073
-#, fuzzy
-msgid "Moving Prev in this window."
-msgstr "Ik beweeg \"Vorige\" naar dit venster."
-
-#: info/session.c:1030
-#, fuzzy
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
-msgstr "Geen \"Vorige\" of \"Omhoog\" voor deze pagina."
-
-#: info/session.c:1034
-#, fuzzy
-msgid "Moving Up in this window."
-msgstr "Ik ga \"Omhoog\" in dit venster."
-
-#: info/session.c:1084
-#, fuzzy
-msgid "Moving to `Prev's last menu item."
-msgstr "Ik ga naar de laatste keuze van het menu van \"Vorige\"."
+msgstr "Dit is de eerste pagina van dit document."
 
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
-msgstr "Beweeg naar voren of beneden door de paginastructuur"
+msgstr "Voorwaarts door alle pagina's van een document bladeren"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
-msgstr "Beweeg naar achteren of boven door de paginastructuur"
+msgstr "Achterwaarts door alle pagina's van een document bladeren"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
-msgstr "Schuif verder in dit venster"
+msgstr "Verderscrollen in dit venster"
 
-#: info/session.c:1213
-#, fuzzy
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
-msgstr "Schuif verder in dit venster"
+msgstr "Verderscrollen in dit venster en de venstergrootte instellen"
 
-#: info/session.c:1221
-#, fuzzy
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
-msgstr "Schuif verder in dit venster"
+msgstr "Binnen de pagina verderscrollen in dit venster"
 
-#: info/session.c:1229
-#, fuzzy
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
-msgstr "Schuif verder in dit venster"
+msgstr ""
+"Binnen de pagina verderscrollen in dit venster en de venstergrootte instellen"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
-msgstr "Schuif terug in dit venster"
+msgstr "Terugscrollen in dit venster"
 
-#: info/session.c:1245
-#, fuzzy
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
-msgstr "Schuif terug in dit venster"
+msgstr "Terugscrollen in dit venster en de venstergrootte instellen"
 
-#: info/session.c:1254
-#, fuzzy
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
-msgstr "Schuif terug in dit venster"
+msgstr "Binnen de pagina terugscrollen in dit venster"
 
-#: info/session.c:1262
-#, fuzzy
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
-msgstr "Schuif terug in dit venster"
+msgstr ""
+"Binnen de pagina terugscrollen in dit venster en de venstergrootte instellen"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
-msgstr "Ga naar het begin van deze pagina"
+msgstr "Naar het begin van deze pagina"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
-msgstr "Ga naar het einde van deze pagina"
+msgstr "Naar het einde van deze pagina"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
-msgstr ""
+msgstr "Een aantal regels omlaagscrollen"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
-msgstr ""
+msgstr "Een aantal regels omhoogscrollen"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
-msgstr ""
+msgstr "Een halve pagina omlaagscrollen"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
-msgstr ""
+msgstr "Een halve pagina omhoogscrollen"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
-msgstr "Selecteer het volgende venster"
+msgstr "Het volgende venster selecteren"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
-msgstr "Selecteer het vorige venster"
+msgstr "Het vorige venster selecteren"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
-msgstr "Splits het huidige venster"
+msgstr "Het huidige venster splitsen"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
-msgstr "Verwijder het huidige venster"
+msgstr "Het huidige venster sluiten"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
-msgstr "Kan een permanent venster niet verwijderen"
+msgstr "Een permanent venster kan niet gesloten worden."
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
-msgstr "Verwijder alle andere vensters"
+msgstr "Alle andere vensters sluiten"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
-msgstr "Verschuif het andere venster"
+msgstr "In het andere venster verderscrollen"
 
-#: info/session.c:1652
-#, fuzzy
+#: info/session.c:1820
 msgid "Scroll the other window backward"
-msgstr "Verschuif het andere venster"
+msgstr "In het andere venster terugscrollen"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
-msgstr "Vergroot (of verklein) dit venster"
+msgstr "Dit venster vergroten of verkleinen"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
-msgstr "Verdeel de beschikbare schermruimte tussen de zichtbare vensters"
+msgstr "De beschikbare schermruimte verdelen tussen de zichtbare vensters"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
-msgstr "Verander de status van regeldoorlopen in het huidige venster"
+msgstr "Regelafbreking in het huidige venster omschakelen"
 
-#: info/session.c:1848
-#, fuzzy
-msgid "Select the Next node"
-msgstr "Selecteer de `Volgende' pagina"
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr "Het gebruik van reguliere expressies bij zoekopdrachten aan-/uitzetten"
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr "Zoeken gebruikt reguliere expressies."
 
 #: info/session.c:1856
-#, fuzzy
+msgid "Using literal strings for searches."
+msgstr "Zoeken gebruikt letterlijke tekst."
+
+#: info/session.c:2027
+msgid "Select the Next node"
+msgstr "Naar de volgende pagina op dit niveau"
+
+#: info/session.c:2035
 msgid "Select the Prev node"
-msgstr "Selecteer de `Vorige' pagina"
+msgstr "Naar de voorgaande pagina op dit niveau"
 
-#: info/session.c:1864
-#, fuzzy
+#: info/session.c:2043
 msgid "Select the Up node"
-msgstr "Selecteer de `Omhoog' pagina"
+msgstr "Naar de bovenliggende pagina"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
-msgstr "Selecteer de laatste pagina in dit bestand"
+msgstr "Naar de laatste pagina van dit document"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
-msgstr "Dit venster heeft geen extra pagina's"
+msgstr "Dit venster heeft geen extra pagina's."
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
-msgstr "Selecteer de eerste pagina in dit bestand"
+msgstr "Naar de eerste pagina van dit document"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
-msgstr "Selecteer de laatste keuze in het menu van deze pagina"
+msgstr "Het laatste menu-item op deze pagina selecteren"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
-msgstr "Selecteer deze menukeuze"
+msgstr "Het huidige menu-item selecteren"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
-msgstr "Er zijn geen %d keuzes in dit menu."
+msgstr "Dit menu heeft minder dan %d items."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
-msgstr "Menukeuze (%s): "
+msgstr "Te kiezen menu-item (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
-msgstr "Menukeuze: "
+msgstr "Te kiezen menu-item: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
-msgstr "Volg verwijzing (%s): "
+msgstr "Te volgen verwijzing (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
-msgstr "Volg verwijzing: "
+msgstr "Te volgen kruisverwijzing: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
-msgstr "Lees een menukeuze en selecteer zijn pagina"
+msgstr "De naam van een menu-item lezen en diens pagina selecteren"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
-msgstr "Lees een voetnoot of verwijzing en selecteer zijn pagina"
+msgstr ""
+"De naam van een voetnoot of kruisverwijzing lezen en diens pagina selecteren"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
-msgstr "Ga naar het begin van het menu van deze pagina"
+msgstr "Naar het begin van het menu op deze pagina"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
-msgstr "Ga naar zo veel mogelijk menukeuzes tegelijk"
+msgstr "Zo veel mogelijk menu-items tegelijk bezoeken"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
-msgstr "Lees de naam van een pagina en selecteer die"
+msgstr "De naam van een pagina lezen en deze selecteren"
 
-#: info/session.c:2436 info/session.c:2441
-#, fuzzy
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
-msgstr "Ga naar Pagina: "
+msgstr "Te bezoeken pagina: "
 
-#: info/session.c:2505
-#, fuzzy, c-format
+#: info/session.c:2684
+#, c-format
 msgid "No menu in node `%s'."
-msgstr "Geen pagina's meer."
+msgstr "Er is geen menu in pagina '%s'."
 
-#: info/session.c:2551
-#, fuzzy, c-format
+#: info/session.c:2730
+#, c-format
 msgid "No menu item `%s' in node `%s'."
-msgstr "Er is geen menukeuze \"%s\" op deze pagina."
+msgstr "Er is geen menu-item '%s' op pagina '%s'."
 
-#: info/session.c:2581
-#, fuzzy, c-format
+#: info/session.c:2760
+#, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
-msgstr "Kon de pagina, waarnaar verwezen werd door \"%s\", niet vinden."
+msgstr "Kan de pagina waarnaar verwezen werd door '%s' niet vinden in '%s'."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
-msgstr ""
+msgstr "Een reeks menu-items lezen en deze vanaf de inhoudspagina volgen"
 
-#: info/session.c:2633
-#, fuzzy
+#: info/session.c:2812
 msgid "Follow menus: "
-msgstr "Volg verwijzing: "
+msgstr "Te volgen reeks menu-items: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
-msgstr ""
+msgstr "De pagina zoeken die de aanroepwijze van het programma beschrijft"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
-msgstr ""
+msgstr "Aanroepbeschrijving bekijken van [%s]: "
 
-# manpage?
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
-msgstr "Lees een manpagina verwijzing en selecteer die"
+msgstr "Een man-paginaverwijzing lezen en deze selecteren"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
-msgstr "Ga naar manpagina: "
+msgstr "Te bekijken man-pagina: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
-msgstr "Selecteer de `Top' pagina in dit bestand"
+msgstr "Naar de eerste pagina van dit bestand"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
-msgstr "Selecteer de pagina `(dir)'"
+msgstr "Naar de hoofd-inhoudspagina"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
-msgstr "Verwijder pagina (%s): "
+msgstr "Te sluiten pagina (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
-msgstr "Kan pagina `%s' niet verwijderen"
+msgstr "Kan pagina '%s' niet sluiten"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
-msgstr "Kan de laatste pagina niet verwijderen"
+msgstr "Kan niet verder terug dan de eerste pagina."
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
-msgstr "Selecteer de laatst geselecteerde pagina"
+msgstr "Terug naar de laatst geziene pagina"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
-msgstr "Sluit deze pagina"
+msgstr "Deze pagina sluiten"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
-msgstr "Lees de naam van een bestand en selecteer die"
+msgstr "De naam van een bestand lezen en deze selecteren"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
-msgstr "Vind bestand: "
+msgstr "Te bezoeken bestand: "
 
-#: info/session.c:3108
-#, fuzzy, c-format
+#: info/session.c:3287
+#, c-format
 msgid "Cannot find `%s'."
-msgstr "Kan \"%s\" niet vinden."
+msgstr "Kan '%s' niet vinden."
 
-#: info/session.c:3151 info/session.c:3269
-#, fuzzy, c-format
+#: info/session.c:3330 info/session.c:3448
+#, c-format
 msgid "Could not create output file `%s'."
-msgstr "Kan uitvoerbestand \"%s\" niet vinden."
+msgstr "Kan uitvoerbestand '%s' niet aanmaken."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Klaar."
 
-#: info/session.c:3220
-#, fuzzy, c-format
+#: info/session.c:3399
+#, c-format
 msgid "Writing node %s..."
-msgstr "Bezig met schrijven van pagina \"%s\"..."
+msgstr "Schrijven van pagina %s..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
-msgstr "Sluis de inhoud van deze pagina door INFO_PRINT_COMMAND"
+msgstr "De inhoud van deze pagina doorsluizen naar het INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
-#, fuzzy, c-format
+#: info/session.c:3510
+#, c-format
 msgid "Cannot open pipe to `%s'."
-msgstr "Kan pijp naar \"%s\" niet openen."
+msgstr "Kan de pijp naar '%s' niet openen."
 
-#: info/session.c:3337
-#, fuzzy, c-format
+#: info/session.c:3516
+#, c-format
 msgid "Printing node %s..."
-msgstr "Bezig met afdrukken van pagina \"%s\"..."
+msgstr "Afdrukken van pagina %s..."
 
-#: info/session.c:3567
-#, fuzzy, c-format
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr "Het zoeken is verdergegaan vanaf het einde."
+
+#: info/session.c:3738
+msgid "Search continued from the beginning of the document."
+msgstr "Het zoeken is verdergegaan vanaf het begin."
+
+#: info/session.c:3755
+#, c-format
 msgid "Searching subfile %s ..."
-msgstr "Bezig met zoeken naar sub-bestand \"%s\"..."
+msgstr "Zoeken naar subbestand %s..."
 
-#: info/session.c:3619
-#, fuzzy
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
-msgstr "Lees een tekenreeks en zoek daar naar"
+msgstr "Een tekenreeks lezen en daar hoofdlettergevoelig naar zoeken"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
-msgstr "Lees een tekenreeks en zoek daar naar"
+msgstr "Een tekenreeks lezen en daar naar zoeken"
 
-#: info/session.c:3634
-#, fuzzy
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
-msgstr "Lees een tekenreeks en zoek daar naar"
+msgstr "Een tekenreeks lezen en daar achterwaarts naar zoeken"
 
-#: info/session.c:3670 info/session.c:3677
-#, fuzzy, c-format
-msgid "%s%sfor string [%s]: "
-msgstr "%s voor tekenreeks [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, c-format
+msgid "%s%s%s [%s]: "
+msgstr "%s%s%s [\"%s\"]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
-msgstr "Achteruit zoeken"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr "Zoeken naar expressie"
 
-#: info/session.c:3672 info/session.c:3678
-msgid "Search"
-msgstr "Zoek"
+#: info/session.c:3865 info/session.c:3871
+msgid " case-sensitively"
+msgstr " (hooflettergevoelig)"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr ""
+#: info/session.c:3866 info/session.c:3872
+msgid " backward"
+msgstr " (achterwaarts)"
 
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr ""
+#: info/session.c:3870
+msgid "Search"
+msgstr "Zoeken"
 
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "Niet gevonden."
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
-msgstr ""
+msgstr "De laatste zoekopdracht in dezelfde richting herhalen"
 
-#: info/session.c:3739 info/session.c:3749
-#, fuzzy
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
-msgstr "Geen eerdere index zoek string."
+msgstr "Geen eerdere zoektekenreeks"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
-msgstr ""
+msgstr "De laatste zoekopdracht in tegenovergestelde richting herhalen"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
-msgstr "Zoek interactief naar een string als je het intypt"
+msgstr "Naar een tekenreeks zoeken terwijl u deze intypt"
+
+#: info/session.c:4044
+msgid "Regexp I-search backward: "
+msgstr "Achterwaarts typend-zoeken naar expressie: "
 
-#: info/session.c:3851
+#: info/session.c:4045
 msgid "I-search backward: "
-msgstr "Achteruit I-zoeken: "
+msgstr "Achterwaarts typend-zoeken: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+msgid "Regexp I-search: "
+msgstr "Typend-zoeken naar expressie: "
+
+#: info/session.c:4048
 msgid "I-search: "
-msgstr "I-zoeken: "
+msgstr "Typend-zoeken: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
-msgstr "Niet gelukt: "
+msgstr "*Ongevonden* "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
-msgstr "Ga naar de vorige verwijzing"
+msgstr "Naar de vorige kruisverwijzing springen"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
-msgstr "Ga naar de volgende verwijzing"
+msgstr "Naar de volgende kruisverwijzing springen"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
-msgstr "Selecteer verwijzing of menukeuze van deze regel"
+msgstr "De verwijzing of het menu-item in deze regel volgen"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
-msgstr "Annuleer huidige operatie"
+msgstr "Huidige operatie annuleren"
 
-# Zie Cancel current action
-#: info/session.c:4389
+# zie 'Cancel current action'
+#: info/session.c:4630
 msgid "Quit"
-msgstr "Afgebroken"
+msgstr "Geannuleerd"
 
-#: info/session.c:4398
-#, fuzzy
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
-msgstr "Beweeg de cursor naar een bepaalde regel van het venster"
+msgstr "De cursor op een bepaalde regel in het venster zetten"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
-msgstr "Herschrijf het venster"
+msgstr "Het venster opnieuw schrijven"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
-msgstr "Stop met Info"
+msgstr "Info afsluiten"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
+"Commando uitvoeren dat behoort bij de kleinelettervariant van deze toets"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Onbekend commando (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" is ongeldig"
 
-#: info/session.c:4495
-#, fuzzy, c-format
+#: info/session.c:4736
+#, c-format
 msgid "`%s' is invalid"
-msgstr "\"%s\" is ongeldig"
+msgstr "'%s' is ongeldig"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
-msgstr "Voeg dit cijfer toe aan het huidige numerieke argument"
+msgstr "Dit cijfer toevoegen aan het huidige numerieke argument"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
-msgstr "Begin een nieuw numeriek argument of vermenigvuldig het huidige met 4"
+msgstr ""
+"Een nieuw numeriek argument beginnen (of het huidige met 4 vermenigvuldigen)"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
-msgstr "Intern gebruikt door \\[universeel-argument]"
+msgstr "Intern gebruikt door \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
-msgstr "readline: Geen virtueel geheugen meer!\n"
+msgstr "readline: onvoldoende geheugen beschikbaar\n"
 
 #: info/variables.c:37
 msgid "When \"On\", footnotes appear and disappear automatically"
-msgstr "Indien \"Aan\", verschijnen en verdwijnen voetnoten automatisch"
+msgstr "Bij 'On' worden voetnoten automatisch getoond"
 
 #: info/variables.c:41
 msgid "When \"On\", creating or deleting a window resizes other windows"
-msgstr ""
-"Indien \"Aan\", verandert het aanmaken of verwijderen van een venster de "
-"grootte van andere vensters"
+msgstr "Bij 'On' worden venstergroottes automatisch aangepast"
 
 #: info/variables.c:45
 msgid "When \"On\", flash the screen instead of ringing the bell"
-msgstr ""
-"Indien \"Aan\", laat het scherm flikkeren in plaats van het laten horen van "
-"een piep"
+msgstr "Bij 'On' flitst het scherm in plaats van een belsignaal"
 
 #: info/variables.c:49
 msgid "When \"On\", errors cause the bell to ring"
-msgstr "Indien \"Aan\", zorgen fouten voor een belsignaal"
+msgstr "Bij 'On' geven fouten een belsignaal"
 
 #: info/variables.c:53
 msgid "When \"On\", Info garbage collects files which had to be uncompressed"
-msgstr ""
-"Indien \"Aan\", haalt Info rommel weg voor bestanden die gedecomprimeerd "
-"moesten worden"
+msgstr "Bij 'On' worden gedecomprimeerde teksten vergeten"
 
 #: info/variables.c:56
 msgid "When \"On\", the portion of the matched search string is highlighted"
-msgstr ""
-"Indien \"Aan\", wordt het overeenkomende deel van de zoek-tekenreeks "
-"opgelicht"
+msgstr "Bij 'On' staat het overeenkomende deel in hoofdletters"
 
 #: info/variables.c:60
 msgid "Controls what happens when scrolling is requested at the end of a node"
-msgstr ""
-"Stelt in wat er gebeurt als er aan het eind van een node verschoven wordt"
+msgstr "Hoe te scrollen aan het eind van een pagina"
+
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr "Hoe te scrollen aan het eind van een pagina"
 
-#: info/variables.c:64
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
-msgstr "Het aantal regels dat verschuift als de cursor uit het venster gaat"
+msgstr "Aantal te scrollen regels wanneer cursor buiten venster komt"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr "Bij 'On' werkt pijltjestoets ook op paginagrens"
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
-msgstr "Indien \"Aan\", accepteert Info ISO Latin tekens en laat ze zien"
+msgstr "Bij 'On' accepteert en toont Info ISO-Latin-tekens"
+
+#: info/variables.c:81
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "Hoe te scrollen aan het eind van de laatste pagina"
 
-#: info/variables.c:74
+#: info/variables.c:88
 msgid "Explain the use of a variable"
-msgstr "Leg het gebruik van een variabele uit"
+msgstr "De betekenis van een variabele uitleggen"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
-msgstr "Omschrijf variabele: "
+msgstr "Te omschrijven variabele: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
-msgstr "Zet de waarde van een Info variabele"
+msgstr "De waarde van een Info-variabele instellen"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
-msgstr "Stel variabele in: "
+msgstr "In te stellen variabele: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
-msgstr "Geef een waarde voor %s (%d): "
+msgstr "Variabele %s deze waarde geven (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
-msgstr "Geef een waarde voor %s (%s): "
+msgstr "Variabele %s deze waarde geven (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Tags zijn verouderd ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), regels ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d regels --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d regels --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
-msgstr "Sub-bestand: %s"
+msgstr " Subbestand: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: optie `%s' is dubbelzinnig\n"
+msgid "%s: warning: "
+msgstr "%s: waarschuwing: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: optie `--%s' staat geen argumenten toe\n"
+msgid " for %s"
+msgstr " voor %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: optie `%c%s' staat geen argumenten toe\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tTyp '%s --help' voor een volledige lijst van opties.\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:508
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: optie `%s' vereist een argument\n"
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Gebruik:  %s [OPTIE]... [INFO-BESTAND [INHOUDSBESTAND]]\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+"De items die voorkomen in INFO-BESTAND toevoegen aan of\n"
+"verwijderen uit het Info-inhoudsbestand INHOUDSBESTAND."
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+"Opties:\n"
+" --debug              tonen wat er gedaan wordt\n"
+" --delete             de items van INFO-BESTAND uit INHOUDSBESTAND "
+"verwijderen;\n"
+"                        geen nieuwe items toevoegen\n"
+" --description=TEKST  de beschrijving van een item; wanneer samen gebruikt "
+"met\n"
+"                        '--name', is dit equivalent aan '--entry'\n"
+" --dir-file=NAAM      de bestandsnaam van het Info-inhoudsbestand;\n"
+"                        equivalent aan het argument INHOUDSBESTAND\n"
+" --dry-run            hetzelfde als '--test'"
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+" --entry=TEKST        deze tekst toevoegen als een Info-inhoudsitem;\n"
+"                        de TEKST moet de vorm van een Info-menu-item "
+"hebben,\n"
+"                        met nul of meer extra regels beginnend met "
+"witruimte;\n"
+"                        indien u meer dan één item opgeeft, worden ze "
+"allemaal\n"
+"                        toegevoegd; als u geen items opgeeft, worden deze "
+"uit\n"
+"                        het gegeven Info-bestand gehaald"
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+" --help               deze hulptekst tonen en stoppen\n"
+" --info-dir=MAP       hetzelfde als '--dir-file=MAP/dir'\n"
+" --info-file=BESTAND  een Info-bestand waarvan de items opgenomen moeten "
+"worden;\n"
+"                        equivalent aan het argument INFO-BESTAND\n"
+" --item=TEKST         hetzelfde als '--entry=TEKST'\n"
+" --keep-old           geen items vervangen, en lege secties niet "
+"verwijderen\n"
+" --menuentry=TEKST    hetzelfde als '--name=TEKST'\n"
+" --no-indent          nieuwe items in het inhoudsbestand niet opmaken\n"
+" --quiet              waarschuwingen onderdrukken"
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+" --regex=EXPRESSIE    de gevonden items toevoegen aan alle secties die aan "
+"deze\n"
+"                        reguliere expressie voldoen (daarbij verschil "
+"tussen\n"
+"                        hoofd- en kleine letters negeren)\n"
+" --remove             hetzelfde als '--delete'\n"
+" --remove-exactly     alleen verwijderen als de infobestandsnaam exact "
+"klopt;\n"
+"                        achtervoegsels als .info en .gz worden genegeerd\n"
+" --section=SECTIE     de gevonden items aan deze sectie van de inhoud "
+"toevoegen;\n"
+"                        als u meer dan één sectie opgeeft, worden de items "
+"aan\n"
+"                        al die secties toegevoegd; als u geen secties "
+"opgeeft,\n"
+"                        wordt de informatie uit het Info-bestand zelf "
+"gehaald\n"
+" --section EXP SEC    hetzelfde asl '--regex=EXP --section=SEC --add-once'"
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+" --silent             waarschuwingen onderdrukken\n"
+" --test               het INHOUDSBESTAND niet bijwerken, slechts doen alsof\n"
+" --version            versie-informatie tonen en stoppen"
+
+#: install-info/install-info.c:570
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"Stuur foutrapportages naar <bug-texinfo@gnu.org>,\n"
+"algemene vragen en commentaar naar <help-texinfo@gnu.org>,\n"
+"en opmerkingen over de vertaling naar <vertaling@vrijschrift.org>.\n"
+"Texinfo-homepagina: http://www.gnu.org/software/texinfo/"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: onbekende optie `--%s'\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Dit is het bestand .../info/dir, dat de bovenste pagina van\n"
+"de Info-documentenhiërarchie bevat, genaamd '(dir)Top'.\n"
+"Info gestart zonder argumenten begint op deze pagina.\n"
+"\n"
+"%s\tDit is de top van de INFO-boom\n"
+"\n"
+"  Deze inhoudspagina toont een menu met hoofdonderwerpen.\n"
+"  Een \"q\" sluit het programma af, een \"d\" brengt u hier terug,\n"
+"  \"?\" toont een hulpvenster met alle Info-commando's,\n"
+"  \"h\" gaat naar een handleiding voor nieuwe gebruikers,\n"
+"  \"mls<Enter>\" toont u de pagina's van het 'ls'-commando, enzovoort.\n"
+"\n"
+"%s\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: onbekende optie `%c%s'\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: kan deze niet lezen (%s) en niet aanmaken (%s)\n"
 
-# Dit is de POSIX versie van de volgende melding
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ongeldige optie -- %c\n"
+msgid "%s: empty file"
+msgstr "%s: is een leeg bestand"
 
-# Dezelfde tekst als hiervoor
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY zonder bijpassende END-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY zonder bijpassende START-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ongeldige optie -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: hebben al een inhoudsbestand: %s\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: optie vereist een argument -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Geef het Info-bestand slechts één keer op.\n"
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: optie `-W %s' is dubbelzinnig\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr "Extra reguliere expressie opgegeven; '%s' wordt genegeerd"
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: optie `-W %s' staat geen argumenten toe\n"
+msgid "Error in regular expression `%s': %s"
+msgstr "Fout in reguliere expressie '%s': %s"
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
-#, fuzzy, c-format
+#: install-info/install-info.c:2129
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "commandoregel-argument '%s' is overbodig"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr "Geen invoerbestand gegeven; gebruik '--help' voor meer informatie."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr "Geen inhoudsbestand gegeven; gebruik '--help' voor meer informatie."
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "geen Info-inhoudsitem in '%s'"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "geen items voor '%s' gevonden; er is niets verwijderd"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr "ferror() op standaarduitvoer\n"
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr "fflush()-fout op standaarduitvoer\n"
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
+#, c-format
 msgid "arguments to @%s ignored"
-msgstr "Verkeerd argument voor %c%s"
+msgstr "argumenten van @%s zijn genegeerd"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
-msgstr "Januari"
+msgstr "januari"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
-msgstr "Februari"
+msgstr "februari"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
-msgstr "Maart"
+msgstr "maart"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
-msgstr "April"
+msgstr "april"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
-msgstr "Mei"
+msgstr "mei"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
-msgstr "Juni"
+msgstr "juni"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
-msgstr "Juli"
+msgstr "juli"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
-msgstr "Augustus"
+msgstr "augustus"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
-msgstr "September"
+msgstr "september"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
-msgstr "Oktober"
+msgstr "oktober"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
-msgstr "November"
+msgstr "november"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
-msgstr "December"
+msgstr "december"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
-msgstr ""
+msgstr "onwaarschijnlijk teken '%c' in @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
-msgstr ""
+msgstr "argument van @sc is in hoofdletters, heeft dus geen effect"
 
-#: makeinfo/cmds.c:1034
-#, fuzzy, c-format
+#: makeinfo/cmds.c:1229
+#, c-format
 msgid "`{' expected, but saw `%c'"
-msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien"
+msgstr "'{' werd verwacht, maar '%c' gevonden"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
-msgstr ""
+msgstr "einde van bestand in een \"verb\"-blok"
 
-#: makeinfo/cmds.c:1082
-#, fuzzy, c-format
+#: makeinfo/cmds.c:1277
+#, c-format
 msgid "`}' expected, but saw `%c'"
-msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien"
+msgstr "'}' werd verwacht, maar '%c' gevonden"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
+"@strong{Noot...} produceert een loze kruisverwijzing in Info; kies een ander "
+"woord om dat te vermijden"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s is verouderd"
 
-#: makeinfo/cmds.c:1414
-#, fuzzy, c-format
+#: makeinfo/cmds.c:1612
+#, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
-msgstr "%csp vereist een postief numeriek argument"
+msgstr "@sp vereist een postief numeriek argument, niet '%s'"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
-msgstr "Verkeerd argument voor %c%s"
+msgstr "Fout argument van %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
-msgstr "geen"
+msgstr "none"
 
-#: makeinfo/cmds.c:1789
-#, fuzzy, c-format
+#: makeinfo/cmds.c:2049
+#, c-format
 msgid "Bad argument to @%s"
-msgstr "Verkeerd argument voor %c%s"
+msgstr "Fout argument van @%s"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
-msgstr ""
-
-#: makeinfo/defun.c:84
-#, fuzzy
-msgid "Missing `}' in @def arg"
-msgstr "Ontbrekende `}' in het argument voor %cdef"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Functie"
+msgstr "invoegen"
 
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Makro"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Speciaal Formulier"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Variabele"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Gebruikersoptie"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Instantievariabele"
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Fout argument van @%s: %s"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Methode"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr "@%s 'on' of 'off' werd verwacht, niet '%s'"
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr ""
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr "Bij @%s is alleen 10 of 11 mogelijk, niet '%s'"
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-#, fuzzy
-msgid "on"
-msgstr "geen"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Ontbrekende '}' in het argument van @def"
 
-# Is die x een foutje?
 #: makeinfo/defun.c:711
-#, fuzzy, c-format
+#, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
-msgstr "Moet in een `%s' `insertion' zitten om `%s'x te gebruiken"
+msgstr "Moet in een '@%s'-omgeving zitten om '@%s' te kunnen gebruiken"
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
-msgstr ""
+msgstr "'%s' wordt weggelaten voor een uitvoerbestandsnaam"
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
-msgstr ""
+msgstr "'%s' wordt weggelaten vanwege het schrijven naar standaarduitvoer"
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
-msgstr ""
+msgstr "Uitvoerbuffer is niet leeg."
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr "Het gevraagde drijvendekommatype '%s' werd niet eerder gebruikt"
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Zie "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
-msgstr "`%c%s' heeft een argument `{...}' nodig, niet slechts `%s'"
+msgstr "'%c%s' vereist een argument '{...}', niet slechts '%s'"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
-msgstr "Geen afsluitende accolade voor voetnoot `%s'"
+msgstr "Ontbrekende sluitaccolade voor voetnoot '%s'"
 
-# mooi vertaald he?
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
-msgstr "Voetnoot gedefinieerd zonder referentie pagina"
+msgstr "Voetnoot gedefinieerd zonder referentiepagina"
 
-# mooi vertaald he?
-#: makeinfo/footnote.c:210
-#, fuzzy
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
-msgstr "Voetnoot gedefinieerd zonder referentie pagina"
+msgstr "Voetnoten binnen een voetnoot zijn niet toegestaan"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
-#, fuzzy
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
-msgstr "-Voetnoten"
+msgstr "Voetnoten"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
-msgstr ""
+msgstr "%s: kan '--css'-bestand '%s' niet openen"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
-msgstr ""
-
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr ""
+msgstr "%s:%d: '--css'-bestand eindigt in commentaar"
 
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
-msgstr ""
+msgstr "[onverwacht] geen html-tag aanwezig"
 
-#: makeinfo/html.c:752
-#, fuzzy, c-format
+#: makeinfo/html.c:764
+#, c-format
 msgid "[unexpected] invalid node name: `%s'"
-msgstr "%s: onbekende optie `--%s'\n"
+msgstr "[onverwacht] ongeldige paginanaam: '%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
-msgstr "Onbekende index `%s'"
+msgstr "Onbekende index '%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
-msgstr ""
+msgstr "Info kan ':' in indexitem '%s' niet aan"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
-msgstr "Index `%s' bestaat al"
+msgstr "Index '%s' bestaat al"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
-msgstr "Onbekende index `%s' en/of `%s' in @synindex"
+msgstr "Onbekende index '%s' en/of '%s' in @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
-msgstr ""
+msgstr "(regel )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
-msgstr ""
+msgstr "(regel %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
-msgstr "Onbekende index `%s' in @printindex"
+msgstr "Onbekende index '%s' in @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
-msgstr ""
+msgstr "Item voor index '%s' valt buiten elke pagina"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
-msgstr ""
+msgstr "(buiten alle pagina's)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr ""
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
-msgstr ""
+msgstr "@item niet toegestaan in argument van @itemize"
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
-msgstr "Verkeerd-Type in insertion_type_pname"
+msgstr ""
+"**Interne fout**: niet-bestaande uitvoersoort in insertion_type_pname()"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
-msgstr "Enumeratiestapel overloop"
+msgstr "Overloop van enumeratiestapel"
 
-# FIXME: hoe vertaal je `lettering'? tegenover enumerating
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
-msgstr "lettering overloop, start opnieuw bij %c"
+msgstr "de letters zijn op; herbegonnen bij %c"
 
 # FIXME: formatter?
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
-msgstr "%s vereist een argument: de formatteerder voor %citem"
+msgstr "%s vereist een argument: de formatteerder voor %c-item"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
-msgstr ""
+msgstr "%cfloat-omgevingen kunnen niet genest worden"
 
-#: makeinfo/insertion.c:973
-#, fuzzy, c-format
+#: makeinfo/insertion.c:981
+#, c-format
 msgid "`@end' expected `%s', but saw `%s'"
-msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien"
+msgstr "'@end' verwachtte '%s', maar vond '%s'"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
-msgstr "Geen overeenkomende `%cend %s'"
+msgstr "Geen overeenkomende '%cend %s'"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s vereist een letter of cijfer"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
-msgstr ""
+msgstr "einde van bestand binnen een verbatim blok"
 
-#: makeinfo/insertion.c:1913
-#, fuzzy, c-format
+#: makeinfo/insertion.c:1942
+#, c-format
 msgid "@%s not meaningful outside `@float' environment"
-msgstr "%citemx is zinloos in een `%s' blok"
+msgstr "@%s is niet zinvol buiten een '@float'-omgeving"
 
-#: makeinfo/insertion.c:1949
-#, fuzzy
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
-msgstr "%cmenu gezien voor de eerste pagina"
+msgstr "@menu gevonden vóór de eerste @node; aanmaken van Top-pagina"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
+"uw @top-pagina moet mogelijk ingepakt worden in @ifnottex in plaats van "
+"@ifinfo?"
 
-#: makeinfo/insertion.c:1962
-#, fuzzy
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
-msgstr "%cmenu gezien voor de eerste pagina"
+msgstr "@detailmenu gevonden voor de eerste pagina; aanmaken van Top-pagina"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
-msgstr ""
+msgstr "@%s is niet zinvol buiten '@titlepage'- en '@quotation'-omgevingen"
 
-#: makeinfo/insertion.c:2032
-#, fuzzy, c-format
+#: makeinfo/insertion.c:2061
+#, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
-msgstr "%citemx is zinloos in een `%s' blok"
+msgstr "@%s is niet zinvol buiten '@titlepage'-omgeving"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
-msgstr "Niet overeenkomende `%c%s'"
+msgstr "Ongepaarde '%c%s'"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
-msgstr "`%c%s' verwacht er iets na"
+msgstr "'%c%s' vereist een argument"
 
-#: makeinfo/insertion.c:2074
-#, fuzzy, c-format
+#: makeinfo/insertion.c:2103
+#, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
-msgstr "Verkeerd argument voor `%s', `%s', gebruik `%s'"
+msgstr "Verkeerd argument '%s' van '@%s'; '%s' wordt gebruikt"
 
-#: makeinfo/insertion.c:2171
-#, fuzzy, c-format
+#: makeinfo/insertion.c:2200
+#, c-format
 msgid "@%s not meaningful inside `@%s' block"
-msgstr "%citemx is zinloos in een `%s' blok"
+msgstr "@%s is zinloos in een '@%s'-blok"
 
-#: makeinfo/insertion.c:2180
-#, fuzzy, c-format
+#: makeinfo/insertion.c:2209
+#, c-format
 msgid "@itemx not meaningful inside `%s' block"
-msgstr "%citemx is zinloos in een `%s' blok"
+msgstr "@itemx is zinloos in een '%s'-blok"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
-msgstr "%c%s buiten een invoeg-blok gevonden"
+msgstr "%c%s gevonden buiten een invoeg-blok"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr "geen standaardterritorium bekend voor taal '%s'"
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
-msgstr ""
+msgstr "%s is geen geldige ISO 639-taalcode"
 
-#: makeinfo/lang.c:655
-#, fuzzy, c-format
+#: makeinfo/lang.c:1399
+#, c-format
 msgid "unrecognized encoding name `%s'"
-msgstr "%s: onbekende optie `--%s'\n"
+msgstr "onbekende coderingsnaam '%s'"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
-msgstr ""
+msgstr "sorry, codering '%s' wordt niet ondersteund"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
-msgstr ""
+msgstr "ongeldig gecodeerd teken '%s'"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
-msgstr "%c%s verwacht `i' of `j' als argument, niet `%c'"
+msgstr "%c%s verwacht 'i' of 'j' als argument, niet '%c'"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
-msgstr "%c%s verwacht één enkele `i' of `j' als argument"
+msgstr "%c%s verwacht één enkele 'i' of 'j' als argument"
 
 #: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
-msgstr "makro `%s' al eerder gedefinieerd"
+msgstr "macro '%s' is al eerder gedefinieerd"
 
 #: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
-msgstr "hier is de vorige definitie van `%s'"
+msgstr "hier was de eerdere definitie van '%s'"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
+"'\\' in macro-expansie werd gevolgd door '%s' in plaats van een parameternaam"
 
 #: makeinfo/macro.c:401
-#, fuzzy, c-format
+#, c-format
 msgid "Macro `%s' called on line %d with too many args"
-msgstr "Makro `%s' aangeroepen met te veel argumenten"
+msgstr "Macro '%s' in regel %d wordt aangeroepen met te veel argumenten"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
-msgstr "%cend makro niet gevonden"
+msgstr "%cend-macro niet gevonden"
 
-#: makeinfo/macro.c:624
-#, fuzzy
-msgid "@quote-arg only useful for single-argument macros"
-msgstr ""
-"%cquote-arg is allen nuttig indien de makro slechts een argument verwacht"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr "@allow-recursion is verouderd; gebruik @rmacro"
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr "@quote-arg is verouderd; argumenten hebben standaard aanhalingstekens"
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
-msgstr ""
+msgstr "@end %s komt niet overeen met @%s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
-msgstr "Te veel fouten!  Ik heb het maar opgegeven.\n"
+msgstr "Te veel fouten!  Gestopt.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: waarschuwing: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "Verkeerd geplaatste %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "Probeer `%s --help' voor meer informatie.\n"
+msgstr "Typ '%s --help' voor meer informatie.\n"
 
-#: makeinfo/makeinfo.c:343
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:347
+#, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
-msgstr "Aanroep: %s [OPTIE]... BESTAND...\n"
+msgstr "Gebruik:  %s [OPTIE]... TEXINFO-BESTAND...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
+"Texinfo-bestanden omzetten naar een bepaalde opmaak.\n"
+"Standaard worden 'Info'-bestanden aangemaakt.  Deze kunnen\n"
+"gelezen worden met 'emacs' of met het zelfstandige 'info'.\n"
 
-#: makeinfo/makeinfo.c:350
+#: makeinfo/makeinfo.c:354
 #, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
-
-#: makeinfo/makeinfo.c:364
+"Algemene opties:\n"
+"      --error-limit=AANTAL    na dit aantal fouten stoppen (standaard %d)\n"
+"      --document-language=TAALCODE  te gebruiken taalregio (standaard C) "
+"bij\n"
+"                                      het vertalen van Texinfo-"
+"sleutelwoorden\n"
+"      --force                 uitvoerbestand behouden ook bij fouten\n"
+"      --help                  deze hulptekst tonen en stoppen\n"
+"      --no-validate           controle van kruisverwijzingen onderdrukken\n"
+"      --no-warn               waarschuwingen onderdrukken (maar fouten "
+"niet)\n"
+"  -v, --verbose               tonen wat er gedaan wordt\n"
+"      --version               versie-informatie tonen en stoppen\n"
+
+#: makeinfo/makeinfo.c:369
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
-msgstr ""
-
-#: makeinfo/makeinfo.c:372
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
+msgstr ""
+"Opmaakselectie (standaard wordt Info-opmaak geproduceerd):\n"
+"      --docbook               Docbook-XML produceren\n"
+"      --html                  HTML produceren\n"
+"      --plaintext             platte tekst produceren\n"
+"      --xml                   Texinfo-XML produceren\n"
+
+#: makeinfo/makeinfo.c:377
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
-msgstr ""
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
+msgstr ""
+"Algemene uitvoeropties:\n"
+"  -E, --macro-expand=BESTAND  macro-geëxpandeerde brontekst naar dit "
+"bestand\n"
+"                                schrijven, eventuele @setfilename's negeren\n"
+"      --no-headers            kopregels en menu's weglaten, zodat Info-"
+"uitvoer\n"
+"                                platte tekst wordt en HTML-uitvoer korter;\n"
+"                                standaard naar standaarduitvoer schrijven\n"
+"      --no-split              splitsing van Info- of HTML-uitvoer "
+"onderdrukken,\n"
+"                                slechts één uitvoerbestand aanmaken\n"
+"      --number-sections       hoofdstuk- en sectienummers produceren\n"
+"  -o, --output=BESTAND        uitvoerbestand (of map indien gesplitste "
+"HTML)\n"
 
-#: makeinfo/makeinfo.c:386
+#: makeinfo/makeinfo.c:391
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
 "                                `asis', preserve existing indentation.\n"
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
+"Opties voor Info en platte tekst:\n"
+"      --disable-encoding      geen tekens met accenten in de uitvoer "
+"produceren\n"
+"      --enable-encoding       tekens met accenten toestaan (standaard)\n"
+"      --fill-column=AANTAL    regels afbreken op deze lengte (standaard %d)\n"
+"      --footnote-style=STIJL  voetnoten produceren volgens deze stijl; "
+"indien\n"
+"                                'end', dan aan het einde van de pagina "
+"waarin\n"
+"                                ze zijn gedefinieerd (standaard); indien\n"
+"                                'separate', dan in een aparte pagina\n"
+"      --paragraph-indent=XX   alinea's inspringen met XX spaties (standaard %"
+"d);\n"
+"                                indien 'none', dan niet inspringen; indien\n"
+"                                'asis', dan bestaande inspringing behouden\n"
+"      --split-size=GETAL      bestanden opsplitsen vanaf deze grootte\n"
+"                                (standaard %d bytes)\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
-msgstr ""
-
-#: makeinfo/makeinfo.c:409
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
+msgstr ""
+"Opties voor HTML:\n"
+"      --css-include=BESTAND   dit bestand in de uitvoer opnemen;\n"
+"                                als BESTAND '-' is, dan standaardinvoer "
+"lezen\n"
+"      --css-ref=URL           een referentie naar een CSS-bestand genereren\n"
+"      --transliterate-file-names\n"
+"                              bestandsnamen met alleen ASCII-tekens "
+"produceren\n"
+
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
+"Opties voor XML en Docbook:\n"
+"      --output-indent=GETAL   XML-elementen met dit aantal spaties "
+"inspringen\n"
+"                                (standaard %d); indien 0, dan witruimte die\n"
+"                                weggelaten mag worden laten vervallen\n"
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2331,8 +2678,14 @@ msgid ""
 "  -P DIR                        prepend DIR to the @include search path.\n"
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
+"Invoerbestandopties:\n"
+"      --commands-in-node-names  @-commando's in paginanamen toestaan\n"
+"  -D VAR                      de variabele VAR definiëren (als met '@set')\n"
+"  -I MAP                      MAP achteraantoevoegen aan @include-zoekpad\n"
+"  -P MAP                      MAP vooraantoevoegen aan @include-zoekpad\n"
+"  -U VAR                      variabele VAR wissen (als met '@clear')\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2351,8 +2704,23 @@ msgid ""
 "\n"
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
+"Conditionele verwerking van de invoer:\n"
+"  --ifdocbook       '@ifdocbook' en '@docbook' altijd verwerken\n"
+"  --ifhtml          '@ifhtml' en '@html' altijd verwerken\n"
+"  --ifinfo          '@ifinfo' altijd verwerken\n"
+"  --ifplaintext     '@ifplaintext' altijd verwerken\n"
+"  --iftex           '@iftex' en '@tex' verwerken; impliceert '--no-split'\n"
+"  --ifxml           '@ifxml' en '@xml' verwerken\n"
+"  --no-ifdocbook    '@ifdocbook' en '@docbook' niet verwerken\n"
+"  --no-ifhtml       '@ifhtml' en '@html' niet verwerken\n"
+"  --no-ifinfo       '@ifinfo' niet verwerken\n"
+"  --no-ifplaintext  '@ifplaintext' niet verwerken\n"
+"  --no-iftex        '@iftex' en '@tex' niet verwerken\n"
+"  --no-ifxml        '@ifxml' en '@xml' niet verwerken\n"
+"\n"
+"  Voor de '--no-ifOPMAAK'-opties geldt: '@ifnotOPMAAK' _wel_ verwerken.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2360,631 +2728,452 @@ msgid ""
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
+"  De standaarden voor de '@if...'-opdrachten hangen af van de "
+"uitvoeropmaak:\n"
+"  als HTML gemaakt wordt, staat '--ifhtml' aan en de anderen niet;\n"
+"  als Info gemaakt wordt, staat '--ifinfo' aan en de anderen niet;\n"
+"  als platte tekst gemaakt wordt, staat '--ifplaintext' aan en de anderen "
+"niet;\n"
+"  als XML gemaakt wordt, staat '--ifxml' aan en de anderen niet.\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
-msgstr ""
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
+msgstr ""
+"Voorbeelden:\n"
+"  makeinfo foo.texi                 Info schrijven (naar foo's "
+"@setfilename)\n"
+"  makeinfo --html foo.texi          HTML schrijven (naar foo's "
+"@setfilename)\n"
+"  makeinfo --xml foo.texi           Texinfo-XML schrijven (naar "
+"@setfilename)\n"
+"  makeinfo --docbook foo.texi       DocBook-XML schrijven (naar "
+"@setfilename)\n"
+"  makeinfo --no-headers foo.texi    platte tekst naar standaarduitvoer\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi  HTML zonder kopregels en menu's\n"
+"  makeinfo --number-sections foo.texi    Info met genummerde secties\n"
+"  makeinfo --no-split foo.texi           één Info-bestand ongeacht de "
+"grootte\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
-msgstr ""
+msgstr "%s: Onbekende waarde '%s' van TEXINFO_OUTPUT_FORMAT wordt genegeerd.\n"
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
-msgstr "%s: %s argument moet numeriek zijn, niet `%s'.\n"
+msgstr "%s: Argument van %s moet numeriek zijn, niet '%s'.\n"
 
-# Vanaf hier
-#: makeinfo/makeinfo.c:660
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:680
+#, c-format
 msgid "%s: could not open macro expansion output `%s'"
-msgstr "Kon uitvoer `%s' voor makro-uitbreiding niet openen"
+msgstr "%s: Kan uitvoer '%s' voor macro-expansie niet openen"
 
-# Vanaf hier
-#: makeinfo/makeinfo.c:665
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:685
+#, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
-msgstr "Kon uitvoer `%s' voor makro-uitbreiding niet openen"
+msgstr "%s: Tweede uitvoer '%s' voor macro-expansie wordt genegeerd.\n"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
-"%s: argument voor --paragraph-indent moet numeriek, `none' of `asis' zijn, "
-"niet `%s'.\n"
+"%s: Argument van --paragraph-indent moet numeriek, 'none' of 'asis' zijn, "
+"niet '%s'.\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
-"%s: argument voor --footnote-style moet `separate' of `end' zijn, niet `%"
-"s'.\n"
+"%s: Argument van --footnote-style moet 'separate' of 'end' zijn, niet '%s'.\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
-msgstr "%s: ontbrekend bestandsargument\n"
+msgstr "%s: Ontbrekend bestandsargument.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
-msgstr ""
+msgstr "Multi-regelcommando %c%s wordt onjuist gebruikt"
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
-msgstr "Verwachtte `%s'"
+msgstr "Verwachtte '%s'"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
-msgstr ""
+msgstr "Kan map '%s' niet aanmaken: %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
-msgstr "Geen `%s' gevonden in `%s'"
+msgstr "Geen '%s' gevonden in '%s'"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
-"%s: Makro uitbreiding naar de standaard uitvoer overgeslagen, want de "
-"uitvoer\n"
-"van Info gaat daar al heen.\n"
+"%s: Macro-expansie naar standaarduitvoer wordt overgeslagen,\n"
+"want de uitvoer van Info gaat daar al heen.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
-msgstr "Bezig met het maken van een %s-bestand `%s' van `%s'.\n"
-
-#: makeinfo/makeinfo.c:1673
-#, fuzzy, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "Dit is Info bestand %s, gemaakt door Makeinfo versie %d.%d"
+msgstr "Aanmaken van een %s-bestand '%s' uit '%s'.\n"
 
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
-"%s: makro uitvoer bestand `%s' weggehaald wegens fouten; gebruik --force om "
-"te bewaren.\n"
+"%s: Macro-uitvoerbestand '%s' wordt verwijderd wegens fouten;\n"
+"gebruik '--force' om het te behouden.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
-"%s: uitvoer bestand `%s' weggehaald wegens fouten; gebruik --force om te "
-"bewaren.\n"
+"%s: Uitvoerbestand '%s' wordt verwijderd wegens fouten;\n"
+"gebruik '--force' om het te behouden.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
-msgstr "Onbekend commando `%s'"
+msgstr "Onbekend commando '%s'"
 
-#: makeinfo/makeinfo.c:2056
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:2090
+#, c-format
 msgid "Use braces to give a command as an argument to @%s"
-msgstr "commandoregel-argument `%s' te veel"
+msgstr "Gebruik '{...}' om een commando als argument mee te geven aan @%s"
 
-#: makeinfo/makeinfo.c:2314
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:2349
+#, c-format
 msgid "%c%s expected braces"
-msgstr "%c%s verwachtte `{...}'"
+msgstr "%c%s verwachtte '{...}'"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
-msgstr "Niet-overeenkomende }"
+msgstr "Ongepaarde }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "GEEN_NAAM!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
-msgstr "%c%s ontbrekende afsluitende accolade"
+msgstr "%c%s ontbrekende sluitaccolade"
 
-#: makeinfo/makeinfo.c:3309
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:3434
+#, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
-msgstr "@image bestand `%s' onleesbaar: %s"
+msgstr "@image-bestand '%s' (voor HTML) is niet leesbaar: %s"
 
-#: makeinfo/makeinfo.c:3315
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:3440
+#, c-format
 msgid "No such file `%s'"
-msgstr "Geen `%s' gevonden in `%s'"
+msgstr "Geen bestand '%s' gevonden"
 
-#: makeinfo/makeinfo.c:3447
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:3576
+#, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
-msgstr "@image bestand `%s' onleesbaar: %s"
+msgstr "@image-bestand '%s' (voor tekst) is niet leesbaar: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
-msgstr "ontbrekend bestandsnaam argument voor @image"
+msgstr "ontbrekend bestandsnaamargument van @image"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
-msgstr ""
+msgstr "ongedefinieerde vlag: %s"
 
-#: makeinfo/makeinfo.c:3676
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:3804
+#, c-format
 msgid "{No value for `%s'}"
-msgstr "{Geen waarde voor \"%s\"}"
+msgstr "{Geen waarde voor '%s'}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s vereist een naam"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
-msgstr "Kwam bestandseinde tegen voor een overeenkomende @end %s"
+msgstr "Bestandseinde werd bereikt vóór een bijbehorende @end %s"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
-msgstr ""
+msgstr "'%.40s...' is te lang voor expansie; is niet geëxpandeerd"
 
 #: makeinfo/multi.c:116
-#, fuzzy
 msgid "Missing } in @multitable template"
-msgstr "Ontbrekende `}' in het argument voor %cdef"
+msgstr "Ontbrekende } in @multitable-sjabloon"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
-msgstr "onbeheerde tekst `%s' na @multitable genegeerd"
+msgstr "loze tekst '%s' na @multitable wordt genegeerd"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
-msgstr "Te veel kolommen in `multitable' item (maximaal %d)"
+msgstr "Te veel kolommen in 'multitable'-item (maximaal %d)"
 
-#: makeinfo/multi.c:555
-#, fuzzy, c-format
+#: makeinfo/multi.c:563
+#, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
-msgstr "Kan kolom #%d niet selecteren in `multitabel'"
+msgstr "[onverwacht] kan kolom #%d niet selecteren in 'multitabel'"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
-msgstr "@tab buiten een `multitable' genegeerd"
+msgstr "@tab buiten een 'multitabel' wordt genegeerd"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
-msgstr "** Multikolom uitvoer van laatste regel:\n"
+msgstr "** 'Multikolom'-uitvoer van de laatste rij:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolom #%d: uitvoer = %s\n"
 
-#: makeinfo/node.c:280
-#, fuzzy, c-format
+#: makeinfo/node.c:279
+#, c-format
 msgid "Node `%s' previously defined at line %d"
-msgstr "makro `%s' al eerder gedefinieerd"
+msgstr "macro '%s' is al eerder gedefinieerd op regel %d"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
-msgstr "Pagina %s wordt geformatteerd...\n"
+msgstr "Pagina %s wordt opgemaakt...\n"
 
-#: makeinfo/node.c:716
-#, fuzzy, c-format
+#: makeinfo/node.c:714
+#, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
-msgstr "Pagina `%s' vereist een sectiecommando (bijv. %c%s)"
+msgstr "Pagina '%s' vereist een sectiemakend commando (bijvoorbeeld %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
-msgstr ""
+msgstr "Er is geen paginanaam opgegeven voor commando '%c%s'"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
-msgstr ""
+msgstr "Het anker '%s' en pagina '%s' verwijzen naar dezelfde bestandsnaam"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
+"Dit @anchor-commando wordt genegeerd; verwijzingen ernaar zullen niet werken"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
-msgstr ""
+msgstr "Geef dit anker een andere naam of gebruik de optie '--no-split'"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
-msgstr ""
+msgstr "Onverwachte tekenreeks aan het eind van 'split-HTML'-bestand '%s'"
 
-#: makeinfo/node.c:991
-#, fuzzy
-msgid "Next:"
-msgstr "Volgende"
-
-#: makeinfo/node.c:1007
-#, fuzzy
-msgid "Previous:"
-msgstr "Vorige"
-
-#: makeinfo/node.c:1021
-#, fuzzy
-msgid "Up:"
-msgstr "Omhoog"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
-msgstr ""
+msgstr "Ankers '%s' en '%s' verwijzen naar dezelfde bestandsnaam"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
-msgstr ""
+msgstr "@anchor-commando wordt genegeerd; verwijzing ernaar werkt niet"
 
-#: makeinfo/node.c:1347
-#, fuzzy, c-format
+#: makeinfo/node.c:1359
+#, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
-msgstr "%s verwijst naar niet-bestaande pagina `%s'"
-
-#: makeinfo/node.c:1363
-#, fuzzy
-msgid "Menu"
-msgstr "* Menu:\n"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
 msgstr ""
+"%s verwijst naar niet-bestaande pagina '%s' (misschien een onjuiste "
+"sectieindeling?)"
 
-# Deze zes meldingen:
-# next, prev en up niet vertalen, dit is wat er in de broncode staat.
-# Het is duidelijker indien onvertaald.
-#: makeinfo/node.c:1447
-#, fuzzy, c-format
+# In de volgende meldingen zijn Next, Prev en Up duidelijker indien onvertaald.
+#: makeinfo/node.c:1459
+#, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
-msgstr "Het `next'-veld van pagina `%s' wijst niet terug op"
-
-#: makeinfo/node.c:1450
-#, fuzzy, c-format
-msgid "This node (%s) has the bad Prev"
-msgstr "Deze node (`%s') is degene met het foute `next'-veld"
+msgstr ""
+"Het 'Next'-veld van pagina '%s' wijst nergens naar (misschien een onjuiste "
+"sectieindeling?)"
 
 #: makeinfo/node.c:1462
-#, fuzzy
-msgid "Prev"
-msgstr "Vorige"
+#, c-format
+msgid "This node (%s) has the bad Prev"
+msgstr "Deze pagina (%s) heeft het foute 'Prev'-veld"
 
-#: makeinfo/node.c:1505
-#, fuzzy, c-format
+#: makeinfo/node.c:1517
+#, c-format
 msgid "Prev field of node `%s' not pointed to"
-msgstr "Het `prev'-veld van node (`%s') wijst niet terug op"
+msgstr "Het 'Prev'-veld van pagina '%s' wijst nergens naar"
 
-#: makeinfo/node.c:1509
-#, fuzzy, c-format
+#: makeinfo/node.c:1521
+#, c-format
 msgid "This node (%s) has the bad Next"
-msgstr "Deze node (`%s') is degene met het foute `next'-veld"
+msgstr "Deze pagina (%s) heeft het foute 'Next'-veld"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
-msgstr ""
+msgstr "'%s' heeft geen 'Up'-veld (misschien een onjuiste sectieindeling?)"
 
-#: makeinfo/node.c:1524
-#, fuzzy
-msgid "Up"
-msgstr "Omhoog"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
+"Pagina '%s' bevat geen menu-item voor '%s'\n"
+"ondanks dat de eerste het 'Up'-doel van de laatste is"
 
-# Eigenlijk zouden hier de %s en de %d omgedraaid moeten worden:
-# `Er wordt %d keer naar %s verwezen'
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "er wordt naar pagina `%s' %d keer verwezen"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
-msgstr "naar pagina `%s' wordt niet verwezen"
+msgstr "naar pagina '%s' wordt niet verwezen"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
-msgstr ""
+msgstr "Verwijderen van %s\n"
 
-#: makeinfo/node.c:1727
-#, fuzzy, c-format
+#: makeinfo/node.c:1728
+#, c-format
 msgid "Can't remove file `%s': %s"
-msgstr "Kan uitvoerbestand \"%s\" niet vinden."
+msgstr "Kan bestand '%s' niet verwijderen: %s"
 
 #: makeinfo/sectioning.c:122
 #, c-format
 msgid "Appendix %c"
-msgstr ""
+msgstr "Appendix %c"
 
 #: makeinfo/sectioning.c:467
 #, c-format
 msgid "Internal error (search_sectioning) `%s'!"
-msgstr ""
+msgstr "**Interne fout**: search_sectioning('%s')!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
-msgstr ""
+msgstr "**Interne fout**: search_sectioning('%s')!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s is verouderd; gebruik in plaats daarvan %c%s"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Pagina met %ctop als sectie bestaat al"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
-msgstr "Hier is de %ctop pagina"
+msgstr "Hier is de %ctop-pagina"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
-msgstr "%ctop wordt voor %cnode gebruikt, neem standaard %s aan"
-
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr ""
+msgstr "%ctop wordt vóór %cnode gebruikt; de standaard %s wordt nu gebruikt"
 
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr ""
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
-msgstr "@image bestand `%s' onleesbaar: %s"
+msgstr "@image-bestand '%s' is onleesbaar: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
+"@headitem als laatste item in @multitable produceert foutieve Docbook-"
+"documenten"
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: waarschuwing: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " voor %s"
-
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\tProbeer `%s --help' voor een volledige lijst van opties.\n"
-
-#: util/install-info.c:434
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"%s [OPTIE]... [INFO-BESTAND [INHOUD-BESTAND]]\n"
-"\n"
-"Installeer INFO-BESTAND in het Info inhoudbestand INHOUD-BESTAND.\n"
-"\n"
-"Opties:\n"
-"--delete          Verwijder bestaande ingangen in INFO-BESTAND;\n"
-"                    voeg geen nieuwe ingangen toe.\n"
-"--dir-file=NAAM   Geef bestandsnaam van het Info inhoudbestand.\n"
-"                    Dit is equivalent aan het argument INDEX-BESTAND.\n"
-"--entry=TEKST      Voeg TEKST in als een Info inhoudsingang.\n"
-"                    TEKST moet het uiterlijk hebben van een Info menukeuze\n"
-"                    regel met nul of meer extra regels beginnend met een\n"
-"                    leeg teken. Als je meer dan een ingang geeft, worden ze\n"
-"                    allemaal toegevoegd. Als je geen ingangen geeft, worden\n"
-"                    ze uit de informatie uit het Info bestand zelf "
-"opgemaakt.\n"
-"--help            Geef deze hulp en beëindig.\n"
-"--info-file=BEST  Geef een Info bestand om in de inhoud in op te nemen.\n"
-"                    Dit is gelijkwaardig aan het argument INFO-BESTAND.\n"
-"--info-dir=MAP    Zelfde als --dir-file=MAP/dir.\n"
-"--item=TEKST      Zelfde als --entry TEKST.\n"
-"                    Een Info inhoudsingang is eigenlijk een menukeuze.\n"
-"--quiet           Onderdruk waarschuwingen.\n"
-"--remove          Zelfde als --delete.\n"
-"--section=SEC     Zet deze ingangen in sectie SEC van de index.\n"
-"                    Als je meer dan een sectie geeft, worden alle ingangen\n"
-"                    aan alle secties toegevoegd.\n"
-"                    Als je geen ingangen geeft, worden ze uit de informatie\n"
-"                    uit het Info bestand zelf opgemaakt.\n"
-"--version         Geef versie-informatie en beëindig.\n"
-"\n"
-"Meld fouten in het programma aan bug-texinfo@gno.org;\n"
-"meld onjuistheden in de vertaling aan nl@li.org.\n"
-
-#: util/install-info.c:488
-#, fuzzy, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
-msgstr ""
-"Dit is het bestand .../info/dir, dat de bovenste pagina van de Info\n"
-"structuur bevat, genaamd (dir)Top. De eerste keer dat je Info start,\n"
-"begin je deze pagina te lezen.\n"
-"\n"
-"Bestand: dir       Pagina: Top       Dit is de bovenste pagina van de INFO "
-"structuur\n"
-"\n"
-"  Deze (Inhoud) pagina geeft een menu van hoofdonderwerpen.\n"
-"  \"q\" beëindigt, \"?\" geeft een lijst met allen Info commando's, \"d\"\n"
-"  brengt je hier terug, \"h\" geeft een inleiding voor de eerste keer,\n"
-"  \"mEmacs<Return>\" gaat naar de Emacs pagina's, etc.\n"
-"\n"
-"  Binnen Emacs kun je met muisknop 2 op een item of verwijzing klikken\n"
-"  om er heen te gaan.\n"
-"\n"
-"* Menu:\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: niet leesbaar (%s) en het kon ook niet aanmaken (%s)\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr ""
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY zonder overeenkomende END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY zonder overeenkomende START-INFO-DIR-ENTRY"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "van"
 
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr ""
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "aan"
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Geef het Info bestand slechts een keer.\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "Het eerste argument in een kruisverwijzing mag niet leeg zijn"
 
-#: util/install-info.c:1284
+#: makeinfo/xref.c:252
 #, c-format
-msgid "excess command line argument `%s'"
-msgstr "commandoregel-argument `%s' te veel"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
-msgstr "Geen invoerbestand gegeven; probeer --help voor meer informatie."
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr "Lege bestandsnaam voor HTML-kruisverwijzing in '%s'"
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr "Geen inhoudbestand gegeven; probeer --help voor meer informatie."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr "Einde van bestand werd bereikt tijdens zoeken naar '.' of ','"
 
-#: util/install-info.c:1313
+#: makeinfo/xref.c:390
 #, c-format
-msgid "no info dir entry in `%s'"
-msgstr "geen info inhoudsingang in `%s'"
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "'.' of ',' moet volgen op @%s, niet '%c'"
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "menukeuze `%s' bestaat al, voor bestand `%s'"
+#: makeinfo/xref.c:392
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "Gebruik @pxref voor kruisverwijzingen tussen haakjes"
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "geen ingangen voor `%s' gevonden; niets verwijderd"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "Het eerste argument van @inforef mag niet leeg zijn"
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
-msgstr "geef deze hulp en beëindig"
+msgstr "deze hulptekst tonen en stoppen"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "behoud tijdelijke bestanden na verwerking"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "behoud de tijdelijke bestanden na verwerking niet (standaard)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
-msgstr "stuur uitvoor naar BESTAND"
+msgstr "de uitvoer naar BESTAND sturen"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
-msgstr "geef versie informatie en beëindig"
+msgstr "versie-informatie tonen en stoppen"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
-msgstr "Aanroep: %s [OPTIE]... BESTAND...\n"
+msgstr "Gebruik:  %s [OPTIE]... BESTAND...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
-msgstr "Maak een gesorteerde index voor elk TeX uitvoer BESTAND.\n"
+msgstr "Een gesorteerde index maken voor elk TeX-uitvoerbestand.\n"
 
-#: util/texindex.c:274
-#, fuzzy, c-format
+#: util/texindex.c:241
+#, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
-"Normaal gesproken is BESTAND... `foo.??' voor een dokument `foo.texi'.\n"
+"Voor een document 'foo.texi' wordt het BESTAND gewoonlijk opgegeven als 'foo."
+"%c%c'.\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -2993,281 +3182,22 @@ msgstr ""
 "\n"
 "Opties:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: geen texinfo inhoudbestand"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "fout bij het heropenen van %s"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: is geen Texinfo-inhoudsbestand"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
-msgstr ""
+msgstr "Geen paginanummer in %s"
 
-# FIXME: secondary
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
-msgstr "ingang %s volgt op een ingang met een alternatieve naam"
-
-#~ msgid "%s: Specify the Info directory only once.\n"
-#~ msgstr "%s: Geef de Info inhoud slechts een keer.\n"
-
-#~ msgid "\"\" is invalid"
-#~ msgstr "\"\" is ongeldig"
-
-#~ msgid "Cannot specify more than one macro expansion output"
-#~ msgstr "Je kunt niet meer dan een uitvoer voor makro-uitbreiding geven"
-
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "`.' of `,' moeten op een verwijzing volgen, niet %c"
-
-#, fuzzy
-#~ msgid "Node:"
-#~ msgstr "Volgende"
-
-#~ msgid "virtual memory exhausted"
-#~ msgstr "virtuele geheugen vol"
-
-#~ msgid "%s; for file `%s'.\n"
-#~ msgstr "%s; voor bestand `%s'.\n"
-
-#, fuzzy
-#~ msgid "`%s' has no Up field"
-#~ msgstr "Node `%s' heeft geen `up'-veld"
-
-#, fuzzy
-#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-#~ msgstr "Schuif terug in dit venster"
-
-#, fuzzy
-#~ msgid "----------------------\n"
-#~ msgstr ""
-#~ "---------- Voetnoten ----------\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "---------------\n"
-#~ msgstr ""
-#~ "---------- Voetnoten ----------\n"
-#~ "\n"
-
-# tot hier (half af)
-#, fuzzy
-#~ msgid ""
-#~ "Usage: %s [OPTION]... TEXINFO-FILE...\n"
-#~ "\n"
-#~ "Translate Texinfo source documentation to various other formats:\n"
-#~ "Info files suitable for reading online with Emacs or standalone GNU Info\n"
-#~ "(by default); plain text (with --no-headers); or HTML (with --html).\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " --commands-in-node-names  allow @ commands in node names.\n"
-#~ " -D VAR                    define a variable, as with @set.\n"
-#~ "--docbook                  output DocBook rather than Info format.\n"
-#~ " -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-#~ " --error-limit=NUM         quit after NUM errors (default %d).\n"
-#~ " --fill-column=NUM         break Info lines at NUM characters (default %"
-#~ "d).\n"
-#~ " --footnote-style=STYLE    output footnotes according to STYLE:\n"
-#~ "                            `separate' to place footnotes in their own "
-#~ "node,\n"
-#~ "                            `end' to place the footnotes at the end of "
-#~ "the\n"
-#~ "                             node in which they are defined (the "
-#~ "default).\n"
-#~ " --force                   preserve output even if errors.\n"
-#~ " --help                    display this help and exit.\n"
-#~ " --html                    output HTML rather than Info format.\n"
-#~ " -I DIR                    append DIR to the @include search path.\n"
-#~ " --ifhtml                  process @ifhtml and @html text even when not\n"
-#~ "                            generating HTML.\n"
-#~ " --ifinfo                  process @ifinfo text even when generating "
-#~ "HTML.\n"
-#~ " --iftex                   process @iftex and @tex text.\n"
-#~ "                            implies --no-split.\n"
-#~ msgstr ""
-#~ "Aanroep: %s [OPTIE]... TEXINFO-BESTAND...\n"
-#~ "\n"
-#~ "Vertaal Texinfo brondocumentatie naar een formaat dat geschikt is om "
-#~ "gelezen\n"
-#~ "te worden met GNU Info.\n"
-#~ "\n"
-#~ "Opties:\n"
-#~ "-D VAR                 definieer een variabele, zoals met @set.\n"
-#~ "-E MACRO-OFILE         behandel alleen makro's, schrijf texinfo "
-#~ "broncode.\n"
-#~ "-I MAP                 voeg MAP toe achter het @include mappenzoekpad.\n"
-#~ "-P MAP                 voeg MAP toe voor het @include mappenzoekpad.\n"
-#~ "-U VAR                 ondefinieer een variabele, zoals met @clear.\n"
-#~ "--error-limit NUM      beëindig na een NUM aantal fouten (standaard %d).\n"
-#~ "--fill-column POS      breek regels af op positie POS (standaard %d).\n"
-#~ "--footnote-style STIJL schrijf voetnoten volgens STIJL:\n"
-#~ "                         `separate' om voetnoten in een eigen pagina te "
-#~ "plaatsen,\n"
-#~ "                         `end' om voetnoten aan het einde van de pagina "
-#~ "te plaatsen\n"
-#~ "                         waarin ze gedefinieerd zijn (standaard).\n"
-#~ "--force                bewaar de uitvoer ook bij fouten.\n"
-#~ "--help                 laat deze hulp zien en beëindig.\n"
-#~ "--no-validate          onderdruk validatie van referenties.\n"
-#~ "--no-warn              onderdruk waarschuwingen (maar fouten niet).\n"
-#~ "--no-split             onderdruk het splitsen van grote bestanden.\n"
-#~ "--no-headers           onderdruk paginascheidingen en Pagina: Foo "
-#~ "koppen.\n"
-#~ "--output BEST, -o BEST schrijf naar BEST, en negeer een @setfilename.\n"
-#~ "--paragraph-indent VAL spring alinea's in met VAL spaties (standaard %"
-#~ "d).\n"
-#~ "                         spring niet in indien VAL `none' is; behoud "
-#~ "bestaande\n"
-#~ "                         inspringing indien VAL `asis' is.\n"
-#~ "--reference-limit NUM  klaag over hoogstens NUM verwijzingen (standaard %"
-#~ "d).\n"
-#~ "--verbose              meld wat gedaan wordt.\n"
-#~ "--version              geef versie-informatie en beëindig.\n"
-#~ "\n"
-#~ "Meld fouten in het programma aan bug-texinfo@gnu.org;\n"
-#~ "meld onjuistheden in de vertaling aan nl@li.org.\n"
-
-# tot hier (half af)
-#, fuzzy
-#~ msgid ""
-#~ " --no-headers              suppress Info node separators and Node: "
-#~ "lines;\n"
-#~ "                            write to standard output without --output.\n"
-#~ " --no-ifhtml               do not process @ifhtml and @html text.\n"
-#~ " --no-ifinfo               do not process @ifinfo text.\n"
-#~ " --no-iftex                do not process @iftex and @tex text.\n"
-#~ " --no-split                suppress splitting of Info or HTML output,\n"
-#~ "                            generate only one output file.\n"
-#~ " --no-validate             suppress node cross-reference validation.\n"
-#~ " --no-warn                 suppress warnings (but not errors).\n"
-#~ " --number-sections         include chapter, section, etc. numbers in "
-#~ "output.\n"
-#~ " -o, --output=FILE         output to FILE (directory if split HTML),\n"
-#~ "                            ignoring any @setfilename.\n"
-#~ " -P DIR                    prepend DIR to the @include search path.\n"
-#~ " --paragraph-indent=VAL    indent Info paragraphs by VAL spaces (default %"
-#~ "d).\n"
-#~ "                            if VAL is `none', do not indent;\n"
-#~ "                            if VAL is `asis', preserve existing "
-#~ "indentation.\n"
-#~ " --reference-limit=NUM     warn about at most NUM references (default %"
-#~ "d).\n"
-#~ " --split-size=NUM          split into files at NUM size. (default %d).\n"
-#~ " -U VAR                    undefine a variable, as with @clear.\n"
-#~ " -v, --verbose             explain what is being done.\n"
-#~ " --version                 display version information and exit.\n"
-#~ " --xml                     output XML (TexinfoML) rather than Info "
-#~ "format.\n"
-#~ msgstr ""
-#~ "Aanroep: %s [OPTIE]... TEXINFO-BESTAND...\n"
-#~ "\n"
-#~ "Vertaal Texinfo brondocumentatie naar een formaat dat geschikt is om "
-#~ "gelezen\n"
-#~ "te worden met GNU Info.\n"
-#~ "\n"
-#~ "Opties:\n"
-#~ "-D VAR                 definieer een variabele, zoals met @set.\n"
-#~ "-E MACRO-OFILE         behandel alleen makro's, schrijf texinfo "
-#~ "broncode.\n"
-#~ "-I MAP                 voeg MAP toe achter het @include mappenzoekpad.\n"
-#~ "-P MAP                 voeg MAP toe voor het @include mappenzoekpad.\n"
-#~ "-U VAR                 ondefinieer een variabele, zoals met @clear.\n"
-#~ "--error-limit NUM      beëindig na een NUM aantal fouten (standaard %d).\n"
-#~ "--fill-column POS      breek regels af op positie POS (standaard %d).\n"
-#~ "--footnote-style STIJL schrijf voetnoten volgens STIJL:\n"
-#~ "                         `separate' om voetnoten in een eigen pagina te "
-#~ "plaatsen,\n"
-#~ "                         `end' om voetnoten aan het einde van de pagina "
-#~ "te plaatsen\n"
-#~ "                         waarin ze gedefinieerd zijn (standaard).\n"
-#~ "--force                bewaar de uitvoer ook bij fouten.\n"
-#~ "--help                 laat deze hulp zien en beëindig.\n"
-#~ "--no-validate          onderdruk validatie van referenties.\n"
-#~ "--no-warn              onderdruk waarschuwingen (maar fouten niet).\n"
-#~ "--no-split             onderdruk het splitsen van grote bestanden.\n"
-#~ "--no-headers           onderdruk paginascheidingen en Pagina: Foo "
-#~ "koppen.\n"
-#~ "--output BEST, -o BEST schrijf naar BEST, en negeer een @setfilename.\n"
-#~ "--paragraph-indent VAL spring alinea's in met VAL spaties (standaard %"
-#~ "d).\n"
-#~ "                         spring niet in indien VAL `none' is; behoud "
-#~ "bestaande\n"
-#~ "                         inspringing indien VAL `asis' is.\n"
-#~ "--reference-limit NUM  klaag over hoogstens NUM verwijzingen (standaard %"
-#~ "d).\n"
-#~ "--verbose              meld wat gedaan wordt.\n"
-#~ "--version              geef versie-informatie en beëindig.\n"
-#~ "\n"
-#~ "Meld fouten in het programma aan bug-texinfo@gnu.org;\n"
-#~ "meld onjuistheden in de vertaling aan nl@li.org.\n"
-
-#~ msgid "The `%c%s' command is meaningless within a `@%s' block"
-#~ msgstr "Het `%c%s' commando is zinloos in een `@%s' blok"
-
-#~ msgid "Virtual memory exhausted in %s ()!  Needed %d bytes."
-#~ msgstr "Virtueel geheugen vol in %s ()!  Had %d bytes nodig."
-
-#~ msgid "How did @%s end up in cm_special_char?\n"
-#~ msgstr "Hoe kwam @%s in cm_special_char terecht?\n"
-
-#~ msgid "multitable item not in active multitable"
-#~ msgstr "`multitable' item niet in een aktieve `multitable'"
-
-#, fuzzy
-#~ msgid "Up field for `%s' is `%s', but `%s' lacks menu item for `%s'"
-#~ msgstr ""
-#~ "`%s' heeft `%s' als `up'-veld, maar `%s' heeft geen menukeuze voor `%s'"
-
-#~ msgid " times"
-#~ msgstr " keer"
-
-#~ msgid "%d times"
-#~ msgstr "%d keer"
-
-#~ msgid "Top"
-#~ msgstr "Top"
-
-#~ msgid "Writing node \"(%s)%s\"..."
-#~ msgstr "Bezig met schrijven van pagina \"(%s)%s\"..."
-
-#~ msgid "Printing node \"(%s)%s\"..."
-#~ msgstr "Bezig met afdrukken van pagina \"(%s)%s\"..."
-
-#~ msgid " from the input file %s.\n"
-#~ msgstr " uit het invoerbestand %s.\n"
-
-#~ msgid "%c%s expects a single character as an argument"
-#~ msgstr "%c%s verwacht één enkel teken als argument"
-
-#~ msgid "Node `%s' multiply defined (line %d is first definition at)"
-#~ msgstr ""
-#~ "Pagina `%s' meerdere keren gedefinieerd (de eerste definitie is op regel %"
-#~ "d)"
-
-#~ msgid "This node (`%s') is the one with the bad `Prev'"
-#~ msgstr "Deze node (`%s') is degene met het foute `prev'-veld"
-
-#~ msgid "creating `Top' node"
-#~ msgstr "`Top' pagina wordt aangemaakt"
-
-#~ msgid ""
-#~ "* Menu:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "* Menu:\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Email bug reports to bug-texinfo@gnu.org."
-#~ msgstr ""
-#~ "\n"
-#~ "Meld fouten in het programma aan bug-texinfo@gnu.org;\n"
-#~ "meld onjuistheden in de vertaling aan nl@li.org."
+msgstr "item %s volgt op een item met een alternatieve naam"
diff --git a/Build/source/utils/texinfo/po/pl.gmo b/Build/source/utils/texinfo/po/pl.gmo
index a09723256aa..b85c559d502 100644
--- a/Build/source/utils/texinfo/po/pl.gmo
+++ b/Build/source/utils/texinfo/po/pl.gmo
diff --git a/Build/source/utils/texinfo/po/pl.po b/Build/source/utils/texinfo/po/pl.po
index 60f787a0f62..b423b107b8f 100644
--- a/Build/source/utils/texinfo/po/pl.po
+++ b/Build/source/utils/texinfo/po/pl.po
@@ -1,146 +1,212 @@
 # Polish translation for texinfo.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the texinfo package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2004.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.7.90\n"
+"Project-Id-Version: texinfo 4.11.93\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
-"PO-Revision-Date: 2004-12-05 12:24+0100\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2008-03-09 13:15+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr "Nieznany b³±d systemowy"
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opcja `%s' jest niejednoznaczna\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opcja `--%s' nie mo¿e mieæ argumentów\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opcja `%c%s' nie mo¿e mieæ argumentów\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opcja `%s' musi mieæ argument\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: nieznana opcja `--%s'\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: nieznana opcja `%c%s'\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: niew³a¶ciwa opcja -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: b³êdna opcja -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opcja musi mieæ argument -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentów\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "pamiêæ wyczerpana"
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "Przesuniêcie do przodu o znak"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "Przesuniêcie do ty³u o znak"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "Przej¶cie na pocz±tek tej linii"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "Przej¶cie na koniec tej linii"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "Przesuniêcie do przodu o s³owo"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "Przesuniêcie do ty³u o s³owo"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Usuniêcie znaku pod kursorem"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "Usuniêcie znaku za kursorem"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Anulowanie lub rezygnacja z operacji"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Przyjêcie (lub wymuszenie dokoñczenia) tej linii"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Wstawienie nastêpnego znaku dos³ownie"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Wstawienie tego znaku"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Wstawienie znaku TAB"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Przestawienie znaków w miejscu"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Wstawienie zawarto¶ci ostatniego wyciêcia"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "Zakres wyciêcia jest pusty"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Wstawienie poprzedniego wyciêcia"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "Wyciêcie na koniec linii"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "Wyciêcie na pocz±tek linii"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "Wyciêcie s³owa za kursorem"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "Wyciêcie s³owa przed kursorem"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Brak uzupe³nieñ"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Nie dokoñczono"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "Wypisanie mo¿liwych uzupe³nieñ"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "Jedyne uzupe³nienie"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "Jedno uzupe³nienie:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d uzupe³nieñ:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "Wstawienie uzupe³nienia"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "Tworzenie uzupe³nieñ..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "Przewijanie okna uzupe³nieñ"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "Przypisy nie mog± byæ wy¶wietlone"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr "Pokazanie przypisów zwi±zanych z tym wêz³em w innym oknie"
 
@@ -148,74 +214,74 @@ msgstr "Pokazanie przypisów zwi±zanych z tym wêz³em w innym oknie"
 msgid "---------- Footnotes ----------"
 msgstr "---------- Przypisy -----------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "Szukanie ³añcucha w indeksie tego pliku"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "Szukanie wpisów w indeksie..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "Nie znaleziono indeksów."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Wpis indeksu: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Przej¶cie do nastêpnego pasuj±cego elementu z ostatniego `\\[index-search]'"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "Brak poprzedniego ³añcucha szukanego w indeksie."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Brak wpisów w indeksie."
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "Nie ma %swpisów w indeksie zawieraj±cych `%s'."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "wiêcej "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "NIE MO¯NA TEGO ZOBACZYÆ"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "Znaleziono `%s' w %s. (`\\[next-index-match]' próbuje znale¼æ nastêpne.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "Przeszukiwanie indeksów `%s'..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "¯aden z dostêpnych plików info nie zawiera `%s' w swoich indeksach."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr "Szukanie ³añcucha w znanych indeksach plików info i zbudowanie menu"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Indeks dla ³añcucha: "
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, c-format
 msgid ""
 "\n"
@@ -224,107 +290,135 @@ msgstr ""
 "\n"
 "* Menu: Wêz³y, których indeksy zawieraj± `%s':\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Wiêcej informacji mo¿na uzyskaæ przez --help.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
 #, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Autorzy nie daj± ¯ADNYCH gwarancji. Ten program mo¿na rozprowadzaæ\n"
-"zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n"
-"License).\n"
-"Wiêcej informacji na ten temat mo¿na znale¼æ w plikach o nazwie COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licencja GPLv3+: GNU GPL wersja 3 lub pó¼niejsza <http://www.gnu.org/"
+"licenses/gpl.html>\n"
+"To jest oprogramowanie wolnodostêpne: mo¿na je modyfikowaæ i "
+"rozpowszechniaæ.\n"
+"Nie ma ¯ADNEJ GWARANCJI w zakresie dopuszczalnym przez prawo.\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "nie znaleziono wpisów w indeksie dla `%s'\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr "  -b, --speech-friendly        tryb przyjazny dla syntezatorów mowy.\n"
-
-#: info/info.c:597
+#: info/info.c:598
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
+msgstr ""
+"Sk³adnia: %s [OPCJA]... [ELEMENT-MENU...]\n"
 "\n"
+"Przegl±danie dokumentacji w formacie Info.\n"
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
-"  -h, --help                   display this help and exit.\n"
-"      --index-search=STRING    go to node pointed by index entry STRING.\n"
-"  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
-"      --no-raw-escapes         output escapes as literal text.\n"
-"      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
-"      --vi-keys                use vi-like and less-like key bindings.\n"
-"      --version                display version information and exit.\n"
-"\n"
-"The first non-option argument, if present, is the menu entry to start from;\n"
-"it is searched for in all `dir' files along INFOPATH.\n"
-"If it is not present, info merges all `dir' files and shows the result.\n"
-"Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
-"\n"
-"Examples:\n"
-"  info                       show top-level dir menu\n"
-"  info emacs                 start at emacs node from top-level dir\n"
-"  info emacs buffers         start at buffers node within emacs manual\n"
-"  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  -f, --file=FILENAME          specify Info file to visit."
 msgstr ""
-"Sk³adnia: %s [OPCJA]... [ELEMENT-MENU...]\n"
-"\n"
-"Przegl±danie dokumentacji w formacie Info.\n"
-"\n"
 "Opcje:\n"
 "      --apropos=£AÑCUCH        szukanie £AÑCUCHA we wszystkich indeksach\n"
 "                                 wszystkich podrêczników.\n"
-"  -d, --directory=KATALOG      dodanie katalogu do INFOPATH.\n"
+"  -d, --directory=KATALOG      dodanie KATALOGU do INFOPATH.\n"
 "      --dribble=PLIK           zapamiêtanie sekwencji klawiszy w PLIKU.\n"
-"  -f, --file=PLIK              podanie pliku Info do odwiedzenia.\n"
-"  -h, --help                   wy¶wietlenie tego opisu i zakoñczenie pracy.\n"
+"  -f, --file=PLIK              podanie pliku Info do odwiedzenia."
+
+#: info/info.c:611
+msgid ""
+"  -h, --help                   display this help and exit.\n"
+"      --index-search=STRING    go to node pointed by index entry STRING.\n"
+"  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+"  -h, --help                   wy¶wietlenie tego opisu i zakoñczenie "
+"dzia³ania.\n"
 "      --index-search=£AÑCUCH   przej¶cie do wêz³a za £AÑCUCHEM w indeksie.\n"
 "  -n, --node=WÊZE£             podanie wêz³a w pierwszym odwiedzanym pliku.\n"
-"  -o, --output=PLIK            zapis wybranych wêz³ów do PLIKU.\n"
+"  -o, --output=PLIK            zapis wybranych wêz³ów do PLIKU."
+
+#: info/info.c:617
+msgid ""
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
+"      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
 "  -R, --raw-escapes            wypisywanie sekwencji ANSI (domy¶lne).\n"
 "      --no-raw-escapes         wypisywanie sekwencji jako dos³ownego "
 "tekstu.\n"
 "      --restore=PLIK           czytanie pocz±tkowej sekwencji klawiszy z "
 "PLIKU.\n"
-"  -O, --show-options, --usage  przej¶cie do wêz³a z opcjami linii poleceñ.\n"
-"%s      --subnodes               rekurencyjne wypisanie elementów menu.\n"
-"  -w, --where, --location      wy¶wietlenie fizycznego po³o¿enia pliku "
-"Info.\n"
+"  -O, --show-options, --usage  przej¶cie do wêz³a z opcjami linii poleceñ."
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr "  -b, --speech-friendly        tryb przyjazny dla syntezatorów mowy."
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
+"      --vi-keys                use vi-like and less-like key bindings.\n"
+"      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+"      --subnodes               rekurencyjne wypisanie elementów menu.\n"
 "      --vi-keys                u¿ywanie klawiszy w stylu programów vi i "
 "less.\n"
 "      --version                wy¶wietlenie informacji o wersji i "
 "zakoñczenie.\n"
+"  -w, --where, --location      wy¶wietlenie fizycznego po³o¿enia pliku Info."
+
+#: info/info.c:634
+msgid ""
+"\n"
+"The first non-option argument, if present, is the menu entry to start from;\n"
+"it is searched for in all `dir' files along INFOPATH.\n"
+"If it is not present, info merges all `dir' files and shows the result.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items relative to the initial node visited."
+msgstr ""
 "\n"
 "Pierwszy argument nie bêd±cy opcj±, je¶li jest obecny, jest wpisem menu, od\n"
-"którego program ma zacz±æ pracê;\n"
-"jest poszukiwany we wszystkich plikach `dir' le¿±cych w INFOPATH.\n"
+"którego program ma zacz±æ pracê; jest poszukiwany we wszystkich plikach "
+"`dir'\n"
+"le¿±cych w INFOPATH.\n"
 "Je¶li nie jest obecny, info ³±czy wszystkie pliki `dir' i pokazuje wynik.\n"
 "Wszystkie pozosta³e argumenty s± traktowane jako nazwy elementów menu "
 "wzglêdem\n"
-"pocz±tkowo odwiedzonego wêz³a.\n"
+"pocz±tkowo odwiedzonego wêz³a."
+
+#: info/info.c:641
+msgid ""
+"\n"
+"Examples:\n"
+"  info                       show top-level dir menu\n"
+"  info emacs                 start at emacs node from top-level dir\n"
+"  info emacs buffers         start at buffers node within emacs manual\n"
+"  info --show-options emacs  start at node with emacs' command line options\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
+msgstr ""
 "\n"
 "Przyk³ady:\n"
 "  info                       pokazanie menu katalogów g³ównego poziomu\n"
@@ -333,11 +427,12 @@ msgstr ""
 "emacsa\n"
 "  info --show-options emacs  rozpoczêcie od wêz³a z opisem linii poleceñ "
 "emacsa\n"
-"  info -f ./foo.info         pokazanie pliku ./foo.info, z pominiêciem "
-"katalogu\n"
+"  info --subnodes -o out.txt emacs  zapisanie ca³ego podrêcznika do out.txt\n"
+"  info -f ./foo.info         pokazanie pliku ./foo.info bez szukania w "
+"katalogu"
 
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -346,417 +441,388 @@ msgid ""
 msgstr ""
 "\n"
 "Raporty o b³êdach prosimy wysy³aæ poczt± elektroniczn± na adres\n"
-"bug-texinfo@gnu.org, ogólne pytania i dyskusjê na help-texinfo@gnu.org.\n"
+"bug-texinfo@gnu.org, a ogólne pytania i dyskusjê na help-texinfo@gnu.org.\n"
 "Strona domowa texinfo: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Nie mo¿na znale¼æ wêz³a `%s'."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Nie mo¿na znale¼æ wêz³a `(%s)%s'."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "Nie mo¿na znale¼æ okna!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "Kropka nie wystêpuje w wê¼le z tego okna!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "Nie mo¿na usun±æ ostatniego okna."
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "Brak menu w tym wê¼le."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "Brak przypisów w tym wê¼le."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "Brak odsy³aczy w tym wê¼le."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Brak wska¼nika `%s' dla tego wêz³a."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Nieznane polecenie Info `%c'; `?' przywo³uje pomoc."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Typ terminala `%s' nie jest wystarczaj±cy do uruchomienia Info."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "To ju¿ jest ostatnia strona tego wêz³a."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "To ju¿ jest pierwsza strona tego wêz³a."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "Tylko jedno okno."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "Wynikowe okno by³oby zbyt ma³e."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Za ma³o miejsca na okno pomocy, proszê usun±æ okno."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
-msgstr ""
-"Podstawowe polecenia w oknach Info\n"
-"**********************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
+msgstr "Podstawowe klawisze poleceñ Info\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
-msgstr "\\%-10[quit-help]  Opuszczenie tej pomocy.\n"
+#: info/infodoc.c:47
+msgid "\\%-10[quit-help]  Close this help window.\n"
+msgstr "\\%-10[quit-help]  Opuszczenie tego okna pomocy.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Opuszczenie ca³ego Info.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Uruchomienie tutoriala Info.\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"Wybór innych wêz³ów:\n"
-"--------------------\n"
+#: info/infodoc.c:51
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-line]  Przej¶cie w górê o jedn± liniê.\n"
+
+#: info/infodoc.c:52
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  Przewiniêcie w dó³ o jedn± liniê.\n"
+
+#: info/infodoc.c:53
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Przewiniêcie do ty³u o stronê ekranu.\n"
+
+#: info/infodoc.c:54
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Przewiniêcie do przodu o stronê ekranu.\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  Przej¶cie do wêz³a \"nastêpny\" tego wêz³a.\n"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Przej¶cie na pocz±tek tego wêz³a.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  Przej¶cie do wêz³a \"poprzedni\" tego wêz³a.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Przej¶cie do wêz³a \"w górê\" tego wêz³a.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Przej¶cie na koniec tego wêz³a.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
-"\\%-10[menu-item]  Wybranie elementu menu zadanego nazw±.\n"
-"              Wybranie elementu menu powoduje wybranie innego wêz³a.\n"
+"\\%-10[move-to-next-xref]  Przej¶cie do nastêpnego odno¶nika "
+"hipertekstowego.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
-"\\%-10[xref-item]  Przej¶cie za odsy³aczem. Odczytuje nazwê odsy³acza.\n"
+"\\%-10[select-reference-this-line]  Przej¶cie za odno¶nikiem hipertekstowym "
+"pod kursorem.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr ""
 "\\%-10[history-node]  Przej¶cie do ostatniego wêz³a widocznego w tym oknie.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr ""
-"\\%-10[move-to-next-xref]  Przej¶cie do nastêpnego odno¶nika hipertekstowego "
-"w tym wê¼le.\n"
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[global-prev-node]  Przej¶cie do poprzeniego wêz³a dokumentu.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr ""
-"\\%-10[move-to-prev-xref]  Przej¶cie do poprzedniego odno¶nika "
-"hipertekstowego w tym wê¼le.\n"
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[global-next-node]  Przej¶cie do nastêpnego wêz³a dokumentu.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr ""
-"\\%-10[select-reference-this-line]  Przej¶cie za odno¶nikiem hipertekstowym "
-"pod kursorem.\n"
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Przej¶cie do poprzedniego wêz³a danego poziomu.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
-"\\%-10[dir-node]  Przej¶cie do wêz³a `directory' (katalog). Równoznaczne `"
-"\\[goto-node] (DIR)'.\n"
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Przej¶cie do nastêpnego wêz³a danego poziomu.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr ""
-"\\%-10[top-node]  Przej¶cie do wêz³a Szczytowy. Równoznaczne `\\[goto-node] "
-"Top'.\n"
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Przej¶cie o jeden poziom w górê.\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"Poruszanie siê w ramach wêz³a:\n"
-"------------------------------\n"
+#: info/infodoc.c:67
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[top-node]  Przej¶cie do g³ównego wêz³a dokumentu.\n"
+
+#: info/infodoc.c:68
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[dir-node]  Przej¶cie do wêz³a g³ównego katalogu.\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Przej¶cie na pocz±tek tego wêz³a.\n"
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr ""
+"1...9       Wybranie pierwszego ... dziewi±tego elementu z menu wêz³a.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Przej¶cie na koniec tego wêz³a.\n"
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Wybranie ostatniego elementu z menu wêz³a.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "\\%-10[next-line]  Przewiniêcie do przodu o 1 liniê.\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "\\%-10[menu-item]  Wybranie elementu menu zadanego nazw±.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "\\%-10[prev-line]  Przewiniêcie do ty³u o 1 liniê.\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "\\%-10[xref-item]  Przej¶cie za odsy³aczem zadanym nazw±.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Przewiniêcie do przodu o stronê.\n"
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "\\%-10[goto-node]  Przej¶cie do wêz³a zadanego nazw±.\n"
 
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Przewiniêcie do ty³u o stronê.\n"
-
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr ""
-"Inne polecenia:\n"
-"---------------\n"
+#: info/infodoc.c:76
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "\\%-10[search]  Szukanie podanego ³añcucha w przód\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr ""
-"\\%-10[menu-digit]  Wybranie pierwszego ... dziewi±tego elementu z menu "
-"wêz³a.\n"
+#: info/infodoc.c:77
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[search-previous]  Szukanie poprzedniego wyst±pienia.\n"
 
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "\\%-10[last-menu-item]  Wybranie ostatniego elementu z menu wêz³a.\n"
+#: info/infodoc.c:78
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "\\%-10[search-next]  Szukanie nastêpnego wyst±pienia.\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 "\\%-10[index-search]  Szukanie podanego ³añcucha we wpisach indeksu tego "
 "pliku Info\n"
 "              i wybranie wêz³a wskazywanego przez pierwszy znaleziony wpis.\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  Przej¶cie do wêz³a zadanego nazw±.\n"
-"              Mo¿na do³±czyæ tak¿e nazwê pliku w postaci (PLIK)WÊZE£.\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  Szukanie podanego ³añcucha w przód\n"
-"              i wybranie wêz³a, w którym znaleziono nastêpne wyst±pienie.\n"
+#: info/infodoc.c:81
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "\\%-10[abort-key]  Anulowanie bie¿±cej operacji.\n"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  Szukanie podanego ³añcucha w ty³\n"
-"              i wybranie wêz³a, w którym znaleziono poprzednie wyst±pienie.\n"
+"Podstawowe polecenia w oknach Info\n"
+"**********************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Opuszczenie tej pomocy.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Opuszczenie ca³ego Info.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Uruchomienie tutoriala Info.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Przej¶cie do wêz³a `nastêpny' tego wêz³a.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Przej¶cie do wêz³a `poprzedni' tego wêz³a.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Przej¶cie do wêz³a `w górê' tego wêz³a.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:101
 #, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Wybranie elementu menu zadanego nazw±.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
-msgstr "              Wybranie elementu menu powoduje wybranie innego wêz³a.\n"
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"  %-10s  Wybranie elementu menu zadanego nazw±.\n"
+"              Wybranie elementu menu powoduje wybranie innego wêz³a.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Przej¶cie za odsy³aczem. Odczytuje nazwê odsy³acza.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Przej¶cie do ostatniego wêz³a widocznego w tym oknie.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr ""
 "  %-10s  Przej¶cie do nastêpnego odno¶nika hipertekstowego w tym wê¼le.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Przej¶cie za odno¶nikiem hipertekstowym pod kursorem.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr ""
 "  %-10s  Przej¶cie do wêz³a `directory' (katalog). Równoznaczne `g (DIR)'.\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Przej¶cie do wêz³a Szczytowy. Równoznaczne `g Top'.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Poruszanie siê w ramach wêz³a:\n"
+"------------------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Przewiniêcie do przodu o stronê.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Przewiniêcie do ty³u o stronê.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Przej¶cie na pocz±tek tego wêz³a.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Przej¶cie na koniec tego wêz³a.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Przewiniêcie do przodu o 1 liniê.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Przewiniêcie do ty³u o 1 liniê.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Inne polecenia:\n"
+"---------------\n"
+
+#: info/infodoc.c:121
 #, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  Wybranie pierwszego ... dziewi±tego elementu z menu wêz³a.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Wybranie ostatniego elementu z menu wêz³a.\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:125
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-"  %-10s  Szukanie podanego ³añcucha we wpisach indeksu tego pliku Info\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
+"  %-10s  Szukanie podanego ³añcucha we wpisach indeksu tego pliku Info\n"
 "              i wybranie wêz³a wskazywanego przez pierwszy znaleziony wpis.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:127
 #, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Przej¶cie do wêz³a zadanego nazw±.\n"
-
-#: info/infodoc.c:132
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
+"  %-10s  Przej¶cie do wêz³a zadanego nazw±.\n"
 "              Mo¿na do³±czyæ tak¿e nazwê pliku w postaci (PLIK)WÊZE£.\n"
 
-#: info/infodoc.c:133
+#: info/infodoc.c:129
 #, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Szukanie podanego ³añcucha w przód\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
+"  %-10s  Szukanie podanego ³añcucha w przód\n"
 "              i wybranie wêz³a, w którym znaleziono nastêpne wyst±pienie.\n"
 
-#: info/infodoc.c:135
+#: info/infodoc.c:131
 #, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Szukanie podanego ³añcucha w ty³\n"
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"  %-10s  Szukanie podanego ³añcucha w ty³\n"
+"              i wybranie wêz³a, w którym znaleziono nastêpne wyst±pienie.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "Aktualna ¶cie¿ka poszukiwania to:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -764,7 +830,7 @@ msgstr ""
 "Polecenia dostêpne w oknach Info:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -772,7 +838,7 @@ msgstr ""
 "Polecenia dostêpne w obszarze echo:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -781,7 +847,7 @@ msgstr ""
 "Nastêpuj±ce polecenia mo¿na wywo³aæ tylko przez %s:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -789,83 +855,73 @@ msgstr ""
 "Nastêpuj±cych poleceñ nie mo¿na w ogóle wywo³aæ:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr "--- Wyj¶æ mo¿na u¿ywaj±c `\\[history-node]' lub `\\[kill-node]' ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "Wy¶wietlenie pomocy"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "Odwiedzenie wêz³a Info `(info)Help'"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "Wy¶wietlenie dokumentacji dla KLAWISZA"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Opis klawisza: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s jest niezdefiniowany."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s jest niezdefiniowany."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s jest zdefiniowany na %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Pokazanie co nacisn±æ, aby wykonaæ zadane polecenie"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Polecenie do znalezienia: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' nie ma pod ¿adnym klawiszem"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s mo¿na wywo³aæ tylko przez %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s mo¿na wywo³aæ przez %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Nie ma funkcji o nazwie `%s'"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Autorzy nie daj± ¯ADNYCH gwarancji. Ten program mo¿na rozprowadzaæ\n"
-"zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n"
-"License).\n"
-"Wiêcej informacji na ten temat mo¿na znale¼æ w plikach o nazwie COPYING.\n"
+"Wybór innych wêz³ów:\n"
+"--------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -975,87 +1031,87 @@ msgstr ""
 "  --help               wy¶wietlenie tej pomocy i zakoñczenie.\n"
 "  --version            wy¶wietlenie informacji o wersji i zakoñczenie.\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Zignorowany b³êdny plik infokey `%s' - zbyt ma³y"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Zignorowany b³êdny plik infokey `%s' - zbyt du¿y"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "B³±d podczas czytania pliku infokey `%s' - skrócony odczyt"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 "B³êdny plik infokey `%s' (z³e liczby magiczne) - mo¿na go uaktualniæ infokey"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 "Plik infokey `%s' jest przestarza³y - mo¿na go uaktualniæ poleceniem infokey"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 "B³êdny plik infokey `%s' (z³a d³ugo¶æ sekcji) - mo¿na go uaktualniæ infokey"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
 "B³êdny plik infokey `%s' (z³y kod sekcji) - mo¿na go uaktualniæ przez infokey"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "B³êdne dane w pliku infokey - czê¶æ przypisañ klawiszy zignorowana"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr "B³êdne dane w pliku infokey - czê¶æ ustawieñ zmiennych zignorowana"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "Odczytanie nazwy polecenia Info i opisanie go"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Opis polecenia: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "Odczytanie nazwy polecenia w obszarze echo i wykonanie go"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Nie mo¿na tutaj wykonaæ polecenia `echo-area'."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, c-format
 msgid "Undefined command: %s"
 msgstr "Niezdefiniowane polecenie: %s"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "Ustawienie wysoko¶ci wy¶wietlanego okna"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Ustawienie wysoko¶ci ekranu na (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1064,12 +1120,12 @@ msgstr ""
 "   Pliki ¼ród³owe przeszukane, aby ten plik zawiera³:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Nie mo¿na obrabiaæ pliku %s.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1081,7 +1137,7 @@ msgstr ""
 "  (Plik)Wêze³                       Linie  Rozmiar Zawiera plik\n"
 "  -----------                       -----  ------- ------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1089,25 +1145,30 @@ msgstr ""
 "Oto jest menu ostatnio odwiedzonych wêz³ów.\n"
 "Mo¿na wybraæ jeden z tego menu lub u¿yæ `\\[history-node]' w innym oknie.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr ""
 "Utworzenie okna zawieraj±cego menu wszystkich aktualnie odwiedzanych wêz³ów"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Wybranie wêz³a, który by³ poprzednio odwiedzony w widocznym oknie"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Wybranie widocznego wêz³a: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Odsy³acz znikn±³! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr "b³±d wyra¿enia regularnego: %s"
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1116,506 +1177,505 @@ msgstr ""
 "Witamy w Info w wersji %s. \\[get-help-window] pokazuje pomoc, \\[menu-item] "
 "wybiera element menu."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "Przej¶cie w dó³ do nastêpnej linii"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "Przej¶cie w górê do poprzedniej linii"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "Przej¶cie na koniec linii"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "Przej¶cie na pocz±tek linii"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "Nastêpny"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Przej¶cie do wêz³a Nastêpny..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Wybranie pierwszego elementu menu..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Wybranie wêz³a Nastêpny..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "Przej¶cie W górê %d raz(y), potem Nastêpny."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "Nie ma wiêcej wêz³ów w tym dokumencie."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "Nie ma wêz³a `Poprzedni' dla tego wêz³a."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Przej¶cie do wêz³a Poprzedni w tym oknie."
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr ""
 "Nie ma wêz³ów `Poprzedni' ani `W górê' dla tego wêz³a w tym dokumencie."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Przej¶cie do wêz³a W górê w tym oknie."
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Przej¶cie do ostatniego elementu menu wêz³a Poprzedni."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "Przej¶cie do przodu lub w dó³ struktury wêz³a"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "Przej¶cie do ty³u lub w górê struktury wêz³a"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "Przewijanie do przodu w tym oknie"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 "Przewijanie do przodu w tym oknie i ustawienie domy¶lnego rozmiaru okna"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr "Przewijanie do przodu w tym oknie pozostaj±c wewn±trz wêz³a"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "Przewijanie do przodu w tym oknie wewn. wêz³a i ust. domy¶lnego rozmiaru okna"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "Przewijanie do ty³u w tym oknie"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr "Przewijanie do ty³u w tym oknie i ustawienie domy¶lnego rozmiaru okna"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr "Przewijanie do ty³u w tym oknie pozostaj±c wewn±trz wêz³a"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
 "Przewijanie do ty³u w tym oknie wewn. wêz³a i ust. domy¶lnego rozmiaru okna"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "Przej¶cie na pocz±tek tego wêz³a"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "Przej¶cie na koniec tego wêz³a"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "Przewijanie w dó³ po linii"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "Przewijanie w górê po linii"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "Przewijanie w dó³ po po³owie rozmiaru ekranu"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "Przewijanie w górê po po³owie rozmiaru ekranu"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "Wybranie nastêpnego okna"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "Wybranie poprzedniego okna"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "Podzielenie aktualnego okna"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "Usuniêcie aktualnego okna"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "Nie mo¿na usun±æ sta³ego okna"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "Usuniêcie wszystkich innych okien"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "Przewijanie innego okna"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "Przewijanie innego okna do ty³u"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "Powiêkszenie (lub zmniejszenie) tego okna"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "Podzielenie dostêpnego miejsca na ekranie miêdzy widoczne okna"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Zmiana stanu zawijania linii w aktualnym oknie"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr "Prze³±czenie u¿ywania wyra¿eñ regularnych przy wyszukiwaniu"
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr "U¿ywanie wyra¿eñ regularnych przy wyszukiwaniu."
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr "U¿ywanie dos³ownego tekstu przy wyszukiwaniu."
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "Wybranie wêz³a Nastêpny"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "Wybranie wêz³a Poprzedni"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "Wybranie wêz³a W górê"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "Wybranie ostatniego wêz³a w tym pliku"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "To okno nie ma dodatkowych wêz³ów"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "Wybranie pierwszego wêz³a w tym pliku"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "Wybranie ostatniego elementu w menu tego wêz³a"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "Wybranie tego elementu menu"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Nie ma %d elementów w tym menu."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Element menu (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Element menu: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Przej¶cie za odno¶nikiem (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "Przej¶cie za odno¶nikiem: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "Odczytanie elementu menu i wybranie jego wêz³a"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Odczytanie przypisu lub odsy³acza i wybranie jego wêz³a"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "Przej¶cie na pocz±tek menu tego wêz³a"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "Odwiedzenie jednocze¶nie jak najwiêkszej liczby elementów menu"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "Odczytanie nazwy wêz³a i wybranie go"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "Przej¶cie do wêz³a: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Brak menu w wê¼le `%s'."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Brak elementu menu `%s' w wê¼le `%s'."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Nie mo¿na znale¼æ wêz³a wskazywanego przez `%s' w `%s'."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Odczytanie listy menu pocz±wszy od katalogu i pod±¿anie za ni±"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "Pod±¿anie za menu: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Szukanie wêz³a opisuj±cego wywo³anie programu"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Szukanie wêz³a Invocation dla [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "Odczytanie odno¶nika do strony podrêcznika i wybranie go"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "Pobranie strony podrêcznika: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "Wybranie wêz³a `Szczytowy' w tym pliku"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "Wybranie wêz³a `(dir)'"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Zabicie wêz³a (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Nie mo¿na zabiæ wêz³a `%s'"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "Nie mo¿na zabiæ ostatniego wêz³a"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "Wybranie ostatnio wybranego wêz³a"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "Zabicie tego wêz³a"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "Odczytanie nazwy pliku i wybranie go"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Szukanie pliku: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Nie mo¿na znale¼æ `%s'."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Nie mo¿na utworzyæ pliku wyj¶ciowego `%s'."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Gotowe."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "Zapisywanie wêz³a %s..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "Przepuszczenie zawarto¶ci tego pliku przez INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Nie mo¿na otworzyæ potoku do `%s'."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "Drukowanie wêz³a %s..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr "Kontynuacja szukania od koñca dokumentu."
+
+#: info/session.c:3738
+msgid "Search continued from the beginning of the document."
+msgstr "Kontynuacja szukania od pocz±tku dokumentu."
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Szukanie podpliku %s ..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr "Odczytanie ³añcucha i poszukiwanie go uwzglêdniaj±c wielko¶æ liter"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "Odczytanie ³añcucha i poszukiwanie go"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "Odczytanie ³añcucha i poszukiwanie go w ty³"
 
-#: info/session.c:3670 info/session.c:3677
+#: info/session.c:3863 info/session.c:3869
 #, c-format
-msgid "%s%sfor string [%s]: "
-msgstr "%s%s³añcucha [%s]: "
+msgid "%s%s%s [%s]: "
+msgstr "%s%s%s [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
-msgstr "Poszukiwanie w ty³"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr "Szukanie wyr.reg."
 
-#: info/session.c:3672 info/session.c:3678
-msgid "Search"
-msgstr "Poszukiwanie"
+#: info/session.c:3865 info/session.c:3871
+msgid " case-sensitively"
+msgstr " uwzgl. wielko¶æ liter"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " uwzglêdniaj±c wielko¶æ liter "
+#: info/session.c:3866 info/session.c:3872
+msgid " backward"
+msgstr " wstecz"
 
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
+#: info/session.c:3870
+msgid "Search"
+msgstr "Szukanie"
 
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
-msgstr "Poszukiwanie nie powiod³o siê."
+msgstr "Wyszukiwanie nie powiod³o siê."
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "Powtórzenie ostatniego poszukiwania w tym samym kierunku"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "Brak poprzedniego szukanego ³añcucha"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "Powtórzenie ostatniego poszukiwania w odwrotnym kierunku"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "Interaktywne poszukiwanie ³añcucha w trakcie wpisywania go"
 
-#: info/session.c:3851
+#: info/session.c:4044
+msgid "Regexp I-search backward: "
+msgstr "Interaktywne szukanie wyr.reg. wstecz: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
-msgstr "Interaktywne poszukiwanie wstecz: "
+msgstr "Interaktywne szukanie wstecz: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+msgid "Regexp I-search: "
+msgstr "Interaktywne szukanie wyr.reg.: "
+
+#: info/session.c:4048
 msgid "I-search: "
-msgstr "Interaktywne poszukiwanie: "
+msgstr "Interaktywne szukanie: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "Bez powodzenia "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "Przej¶cie do poprzedniego odsy³acza"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "Przej¶cie do nastêpnego odsy³acza"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "Wybranie odsy³acza lub elementu menu wystêpuj±cego w tej linii"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "Anulowanie bie¿±cej operacji"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Wyj¶cie"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "Przesuniêcie kursora do podanej linii w oknie"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "Odrysowanie ekranu"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Wyj¶cie z Info"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr "Uruchomienie polecenia przypisanego do wariantu klawisza z ma³± liter±"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Nieznane polecenie (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" jest niepoprawne"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, c-format
 msgid "`%s' is invalid"
 msgstr "`%s' jest niepoprawne"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "Dodanie tej cyfry do aktualnego argumentu liczbowego"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Rozpoczêcie (lub pomno¿enie przez 4) aktualnego argumentu liczbowego"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "Wewnêtrznie u¿ywane przez \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Zabrak³o pamiêci wirtualnej!\n"
@@ -1648,195 +1708,415 @@ msgstr "Je¶li \"On\", dopasowana czê¶æ szukanego ³añcucha jest pod¶wietlana"
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "Kontrola, co dzieje siê przy próbie przewijania na koñcu wêz³a"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr "To samo co scroll-behaviour"
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "Liczba linii do przewiniêcia kiedy kursor wychodzi za okno"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr "Kontrola, czy scroll-behaviour dotyczy poleceñ przesuwaj±cych kursor"
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "Je¶li \"On\", Info przyjmuje i wy¶wietla znaki ISO Latin"
 
-#: info/variables.c:74
+#: info/variables.c:81
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "Co robiæ kiedy polecenie przewijania wydano na koñcu ostatniego wêz³a"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "Wyja¶nienie u¿ycia zmiennej"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Opisanie zmiennej: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Ustawienie warto¶ci zmiennej Info"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Ustawienie zmiennej: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "Ustawienie %s na warto¶æ (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "Ustawienie %s na warto¶æ (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Znaczniki s± nieaktualne ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), linii ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d linii --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d linii --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Podplik: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opcja `%s' jest niejednoznaczna\n"
+msgid "%s: warning: "
+msgstr "%s: uwaga: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opcja `--%s' nie przyjmuje argumentów\n"
+msgid " for %s"
+msgstr " dla %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opcja `%c%s' nie przyjmuje argumentów\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\t`%s --help' poda pe³n± listê opcji.\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:508
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opcja `%s' wymaga argumentu\n"
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Sk³adnia: %s [OPCJA]... [PLIK-INFO [PLIK-DIR]]\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+"Dodanie lub usuniêcie wpisów dla PLIKU-INFO w pliku katalogu PLIK-KATALOGU."
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+" --debug              informowanie o wykonywanych dzia³aniach.\n"
+" --delete             usuniêcie istniej±cych wpisów dla PLIKU-INFO\n"
+"                        z PLIKU-KATALOGU; nie wstawianie nowych wpisów.\n"
+" --description=TEKST  opis wpisu to TEKST; u¿ywane z opcj± --name jest\n"
+"                        odpowiednikiem opcji --entry.\n"
+" --dir-file=NAZWA     podanie nazwy pliku z katalogiem Info;\n"
+"                        odpowiednik u¿ycia argumentu PLIK-KATALOGU.\n"
+" --dry-run            to samo co --test."
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+" --entry=TEKST        wstawienie TEKSTU jako wpisu katalogu Info.\n"
+"                        TEKST powinien mieæ formê linii elementu menu Info\n"
+"                        z zerem lub wiêcej linii zaczynaj±cymi siê od "
+"spacji.\n"
+"                      Je¶li podano wiêcej ni¿ jeden wpis, wszystkie s± "
+"dodawane.\n"
+"                      Je¶li nie podano ¿adnego wpisu, s± okre¶lane na "
+"podstawie\n"
+"                        informacji w samym pliku Info.\n"
+"                      Przy usuwaniu TEKST okre¶la wpis do usuniêcia.\n"
+"                      TEKST jest usuwany tylko w ostateczno¶ci, je¶li nie "
+"ma\n"
+"                        wpisu okre¶lonego przez plik Info ani nazwy pliku "
+"Info."
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+" --help               wy¶wietlenie tego opisu i zakoñczenie.\n"
+" --info-dir=KATALOG   to samo co --dir-file=KATALOG/dir.\n"
+" --info-file=PLIK     podanie pliku Info do zainstalowania w katalogu;\n"
+"                        odpowiednik u¿ycia argumentu PLIK-INFO.\n"
+" --item=TEKST         to samo co --entry=TEKST.\n"
+" --keep-old           nie zastêpowanie wpisów, nie usuwanie pustych sekcji.\n"
+" --menuentry=TEKST    to samo co --name=TEKST.\n"
+" --name=TEKST         nazwa wpisu to TEKST; u¿ywane wraz z --description "
+"jest\n"
+"                        odpowiednikiem opcji --entry.\n"
+" --no-indent          nie formatowanie nowych wpisów w pliku DIR.\n"
+" --quiet              pominiêcie ostrze¿eñ."
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+" --regex=WYRA¯ENIE    umieszczenie wpisów tego pliku we wszystkich sekcjach\n"
+"                        pasuj±cych do WYRA¯ENIA regularnego (bez "
+"uwzglêdnienia\n"
+"                        wielko¶ci liter).\n"
+" --remove             to samo co --delete.\n"
+" --remove-exactly     usuniêcie tylko je¶li nazwa pliku info pasuje "
+"dok³adnie;\n"
+"                        przyrostki takie jak .info i .gz nie s± ignorowane.\n"
+" --section=SEKCJA     umieszczenie wpisów dla tego pliku w danej SEKCJI\n"
+"                        katalogu.\n"
+"                      Je¶li podano wiêcej ni¿ jedn± sekcjê, wszystkie wpisy "
+"s±\n"
+"                        dodawane do ka¿dej z sekcji.\n"
+"                      Je¶li nie podano ¿adnej sekcji, s± okre¶lane na "
+"podstawie\n"
+"                        informacji w samym pliku Info.\n"
+" --section WYR SEK    odpowiednik --regex=WYR --section=SEK --add-once."
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+" --silent             pominiêcie ostrze¿eñ.\n"
+" --test               pominiêcie uaktualniania PLIKU-KATALOGU.\n"
+" --version            wy¶wietlenie informacji o wersji i zakoñczenie."
+
+#: install-info/install-info.c:570
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"Raporty o b³êdach prosimy wysy³aæ poczt± elektroniczn± na adres\n"
+"bug-texinfo@gnu.org, a ogólne pytania i dyskusjê na help-texinfo@gnu.org.\n"
+"Strona domowa texinfo: http://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nierozpoznana opcja `--%s'\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"To jest plik .../info/dir, zawieraj±cy najwy¿szy\n"
+"wêze³ hierarchii Info, o nazwie (dir)Top.\n"
+"Przy pierwszym uruchomieniu Info zaczyna siê od tego wêz³a.\n"
+"\n"
+"%s\tOto wierzcho³ek drzewa INFO\n"
+"\n"
+"  To (wêze³ Katalog) zawiera menu dla g³ównych tematów.\n"
+"  Naci¶niêcie \"q\" koñczy przegl±danie, \"?\" wy¶wietla wszystkie "
+"polecenia\n"
+"  Info, \"d\" wraca tutaj, \"h\" pokazuje wprowadzenie dla nowicjuszy,\n"
+"  \"mEmacs<Return>\" odwiedza podrêcznik Emacsa itd.\n"
+"\n"
+"  W Emacsie mo¿na klikn±æ drugim przyciskiem myszy na elemencie menu lub\n"
+"  odsy³aczu, aby go wybraæ.\n"
+"\n"
+"%s\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nierozpoznana opcja `%c%s'\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: nie mo¿na odczytaæ (%s) ani utworzyæ (%s)\n"
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: nieprawid³owa opcja -- %c\n"
+msgid "%s: empty file"
+msgstr "%s: pusty plik"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY bez odpowiadaj±cego END-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY bez odpowiadaj±cego START-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: b³êdna opcja -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: plik katalogu ju¿ istnieje: %s\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opcja wymaga argumentu -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Nale¿y podaæ plik Info tylko raz.\n"
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr "Podano dodatkowe wyra¿enie regularne, zignorowano `%s'"
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opcja `-W %s' nie przyjmuje argumentu\n"
+msgid "Error in regular expression `%s': %s"
+msgstr "B³±d w wyra¿eniu regularnym `%s': %s"
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: install-info/install-info.c:2129
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "nadmiarowy argument linii poleceñ `%s'"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr "Nie podano pliku wej¶ciowego; --help mo¿e podaæ wiêcej informacji."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr "Nie podano pliku katalogu; --help mo¿e podaæ wiêcej informacji."
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "brak wpisu do katalogu info w `%s'"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "nie znaleziono wpisów dla `%s'; nic nie usuniêto"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr "ferror dla standardowego wyj¶cia\n"
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr "b³±d fflush dla standardowego wyj¶cia\n"
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "zignorowano argumenty dla @%s"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "stycznia"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "lutego"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "marca"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "kwietnia"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "maja"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "czerwca"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "lipca"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "sierpnia"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "wrze¶nia"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "pa¼dziernika"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "listopada"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "grudnia"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "niechciany znak %c w @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "argument @sc zawiera same wielkie litery, wiêc brak efektu"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "oczekiwano `{', ale napotkano `%c'"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "koniec pliku wewn±trz bloku verb"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "oczekiwano `}', ale napotkano `%c'"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1844,326 +2124,310 @@ msgstr ""
 "@string{Note...} tworzy nieprawdziwe odniesienia w Info; nale¿y "
 "przeredagowaæ aby zapobiec temu"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s jest przestarza³e"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp wymaga argumentu bêd±cego liczb± dodatni±, a nie `%s'"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Z³y argument dla %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "zachowaj"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "brak"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Z³y argument dla @%s"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr "wstaw"
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "Brakuje `}' w argumencie @def"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Funkcja"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Makro"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Forma specjalna"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Zmienna"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Opcja u¿ytkownika"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Instancja zmiennej"
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Z³y argument dla @%s: %s"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Metoda"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr "Oczekiwano @%s on lub off, a nie `%s'"
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "typu"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr "Obs³ugiwane s± tylko @%s 10 lub 11, a nie `%s'"
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "na"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Brakuje `}' w argumencie @def"
 
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "Trzeba byæ w ¶rodowisku `@%s', aby u¿yæ `@%s'"
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr "Pominiêto `%s' przed nazw± pliku wyj¶ciowego"
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr "Pominiêto `%s' przy zapisie na standardowe wyj¶cie"
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr "Bufor wyj¶ciowy niepusty."
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr "¯±dany rodzaj ¶rodowiska float `%s' nie by³ wcze¶niej u¿yty"
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Patrz "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "`%c%s' wymaga argumentu `{...}', a nie tylko `%s'"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "Nie zamkniêty nawias dla przypisu `%s'"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "Zdefiniowano przypis bez wêz³a nadrzêdnego"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Przypisy wewn±trz przypisów nie s± dozwolone"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "Przypisy"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: nie mo¿na otworzyæ pliku css: %s"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: plik css zakoñczy³ siê wewn±trz komentarza"
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "Bez tytu³u"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr "[nieoczekiwane] brak znacznika html do zdjêcia"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[nieoczekiwane] b³êdna nazwa wêz³a: `%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Nieznany indeks `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info nie mo¿e obs³u¿yæ `:' we wpisie indeksu `%s'"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indeks `%s' ju¿ istnieje"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Nieznany indeks `%s' i/lub `%s' w @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr "(linia )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr "(linia %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Nieznany indeks `%s' w @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Wpis dla indeksu `%s' poza jakimkolwiek wêz³em"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(poza jakimkolwiek wêz³em)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "Patrz "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr "@item nie jest dozwolone w argumencie @itemize"
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Broken-Type w insertion_type_pname"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "Przepe³nienie stosu numerowania"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "przepe³nienie, restart od %c"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s wymaga argumentu: formatowania dla %citem"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr "¦rodowiska %cfloat nie mog± byæ zagnie¿d¿one"
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "`@end' oczekiwa³o `%s', ale napotkano `%s'"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Brak pasuj±cego `%cend %s'"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s wymaga litery lub cyfry"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "koniec pliku wewn±trz bloku dos³ownego"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "@%s nic nie znaczy poza ¶rodowiskiem `@float'"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "napotkano @menu przed pierwszym @node, tworzenie wêz³a `Top'"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "mo¿e wêze³ @top powinien byæ otoczony @ifnottex, a nie @ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "napotkano @detailmenu przed pierwszym wêz³em, tworzenie wêz³a `Top'"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr "@%s nic nie znaczy poza ¶rodowiskami `@titlepage' i `@quotation'"
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "@%s nic nie znaczy poza ¶rodowiskiem `@titlepage'"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Niedopasowane `%c%s'"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "`%c%s' wymaga czego¶ po sobie"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Z³y argument `%s' dla `@%s', u¿ycie `%s'"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s nic nie znaczy wewn±trz bloku `@%s'"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx nic nie znaczy wewn±trz bloku `%s'"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "znaleziono %c%s na zewn±trz bloku wstawki"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr "nieznane domy¶lne terytorium dla jêzyka `%s'"
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s nie jest poprawnym kodem jêzyka zgodnym z ISO 639"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "nierozpoznana nazwa kodowania `%s'"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "niestety kodowanie `%s' nie jest obs³ugiwane"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "b³êdnie zakodowany znak `%s'"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s oczekuje `i' lub `j' jako argumentu, a nie `%c'"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s oczekuje pojedynczego znaku `i' lub `j' jako argumentu"
@@ -2178,7 +2442,7 @@ msgstr "makro `%s' ju¿ zosta³o zdefiniowane"
 msgid "here is the previous definition of `%s'"
 msgstr "oto poprzednia definicja `%s'"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "po \\ w rozwiniêciu makra wystêpuje `%s' zamiast nazwy parametru"
@@ -2188,46 +2452,50 @@ msgstr "po \\ w rozwiniêciu makra wystêpuje `%s' zamiast nazwy parametru"
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makro `%s' wywo³ane w linii %d ze zbyt du¿± liczb± argumentów"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "nie znaleziono makra %cend"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg jest u¿yteczne tylko do makr jednoargumentowych"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr "@allow-recursion jest przestarza³e; proszê u¿ywaæ zamiast tego @rmacro"
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr "@quote-arg jest przestarza³e; argumenty s± domy¶lnie cytowane"
+
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "niedopasowane @end %s do @%s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Zbyt du¿o b³êdów! Poddajê siê.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: uwaga: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "¬le umieszczone %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Polecenie `%s --help' poda wiêcej informacji.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Sk³adnia: %s [OPCJA]... PLIK-TEXINFO...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2237,89 +2505,98 @@ msgstr ""
 "samodzielnym\n"
 "GNU Info.\n"
 
-#: makeinfo/makeinfo.c:350
+#: makeinfo/makeinfo.c:354
 #, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
 "Opcje ogólne:\n"
 "      --error-limit=ILE       zakoñczenie po ILU b³êdach (domy¶lnie %d).\n"
+"      --document-language=£AÑC lokalizacja u¿ywana przy t³umaczeniu s³ów\n"
+"                                kluczowych Texinfo dla dokumentu "
+"wyj¶ciowego\n"
+"                                (domy¶lnie C).\n"
 "      --force                 zachowanie wyj¶cia nawet w przypadku b³êdów.\n"
 "      --help                  wy¶wietlenie tego opisu i zakoñczenie.\n"
 "      --no-validate           pominiêcie kontroli odsy³aczy miêdzy wêz³ami.\n"
 "      --no-warn               pominiêcie ostrze¿eñ (ale nie b³êdów).\n"
-"      --reference-limit=ILE   ostrze¿enie o najwy¿ej ILU odsy³aczach\n"
-"                                (domy¶lnie %d).\n"
 "  -v, --verbose               wyja¶nianie co siê dzieje.\n"
 "      --version               wy¶wietlenie informacji o wersji i "
 "zakoñczenie.\n"
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 "Wybór formatu wyj¶ciowego (domy¶lnym jest info):\n"
-"      --docbook             wyprodukowanie DocBook XML zamiast Info.\n"
-"      --html                wyprodukowanie HTML zamiast Info.\n"
-"      --xml                 wyprodukowanie Texinfo XML zamiast Info.\n"
-"      --plaintext           wyprodukowanie czystego tekstu zamiast Info.\n"
+"      --docbook               wyprodukowanie DocBook XML zamiast Info.\n"
+"      --html                  wyprodukowanie HTML zamiast Info.\n"
+"      --xml                   wyprodukowanie Texinfo XML zamiast Info.\n"
+"      --plaintext             wyprodukowanie czystego tekstu zamiast Info.\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 "Ogólne opcje dotycz±ce wyj¶cia:\n"
-"  -E, --macro-expand PLIK   zapis ¼róde³ z rozwiniêtymi makrami do PLIKU.\n"
-"      --no-headers          pominiêcie separatorów wêz³ów, linii Node, oraz\n"
-"                              menu z wyj¶cia Info (zapisanie czystego "
+"  -E, --macro-expand=PLIK     zapis ¼róde³ z rozwiniêtymi makrami do PLIKU.\n"
+"      --no-headers            pominiêcie separatorów wêz³ów, linii Node "
+"oraz\n"
+"                                menu z wyj¶cia Info (zapisanie czystego "
 "tekstu)\n"
-"                              lub z HTML (zapisanie krótszego pliku);\n"
-"                              tak¿e pisanie domy¶lnie na standardowe "
+"                                lub z HTML (zapisanie krótszego pliku);\n"
+"                                tak¿e pisanie domy¶lnie na standardowe "
 "wyj¶cie.\n"
-"      --no-split            pominiêcie dzielenia Info lub HTML, generowanie\n"
-"                              tylko jednego pliku wyj¶ciowego.\n"
-"      --number-sections     zapisywanie numerów rozdzia³ów i sekcji.\n"
-"  -o, --output=PLIK         zapisanie do PLIKU (katalogu w przypadku "
-"dzielonego\n"
-"                              HTML), ignoruj±c wszelkie @setfilename.\n"
+"      --no-split              pominiêcie dzielenia Info lub HTML, "
+"generowanie\n"
+"                                tylko jednego pliku wyj¶ciowego.\n"
+"      --number-sections       zapisywanie numerów rozdzia³ów i sekcji.\n"
+"  -o, --output=PLIK           zapisanie do PLIKU (lub katalogu w przypadku\n"
+"                                dzielonego HTML),\n"
 
-#: makeinfo/makeinfo.c:386
+#: makeinfo/makeinfo.c:391
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2327,9 +2604,10 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 "Opcje dla Info i czystego tekstu:\n"
-"      --enable-encoding       zapis znaków z akcentami i specjalnych w "
-"pliku\n"
-"                                Info w zale¿no¶ci od @documentencoding.\n"
+"      --disable-encoding      bez zapisu znaków z akcentami i specjalnych "
+"do\n"
+"                                pliku Info w zale¿no¶ci od "
+"@documentencoding.\n"
 "      --fill-column=ILE       ³amanie linii Info po ILU znakach (domy¶lnie %"
 "d).\n"
 "      --footnote-style=STYL   zapis stopek w Info zgodnie ze STYLEM:\n"
@@ -2347,34 +2625,38 @@ msgstr ""
 "      --split-size=ROZMIAR    podzia³ Info na pliki o ROZMIARZE (domy¶lnie %"
 "d).\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 "Opcje dla HTML:\n"
-"      --css-include=PLIK        do³±czenie PLIKU w wyj¶ciu HTML <style>;\n"
-"                                  je¶li PLIK to -, czytane jest standardowe\n"
-"                                  wej¶cie\n"
+"      --css-include=PLIK      do³±czenie PLIKU w wyj¶ciu HTML <style>;\n"
+"                                je¶li PLIK to -, czytane jest standardowe\n"
+"                                wej¶cie\n"
+"      --css-ref=URL           wygenerowanie odniesienia do pliku CSS.\n"
+"      --transliterate-file-names\n"
+"                              tworzenie nazw plików w transliteracji ASCII.\n"
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 "Opcje dla XML i Docbooka:\n"
-"      --output-indent=ILE       wciêcia elementów XML o ILE spacji "
-"(domy¶lnie\n"
-"                                  %d). Je¶li ILE jest 0, pomijalne spacje "
-"s±\n"
-"                                  usuwane.\n"
+"      --output-indent=ILE     wciêcia elementów XML o ILE spacji (domy¶lnie\n"
+"                                %d). Je¶li ILE jest 0, pomijalne spacje s±\n"
+"                                usuwane.\n"
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2393,7 +2675,7 @@ msgstr ""
 "  -U ZMIENNA                    usuniêcie definicji ZMIENNEJ, tak jak "
 "@clear.\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2434,7 +2716,7 @@ msgstr ""
 "\n"
 "  Ponadto opcje --no-ifFORMAT powoduj± przetwarzanie tekstu @ifnotFORMAT.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2449,113 +2731,109 @@ msgstr ""
 "wy³±czone;\n"
 "  je¶li generowany jest XML, --ifxml jest w³±czone, a reszta wy³±czona.\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "Przyk³ady:\n"
-"  makeinfo foo.texi                     zapisanie Info do @setfilename z "
+"  makeinfo foo.texi                       zapisanie Info do @setfilename z "
 "foo\n"
-"  makeinfo --html foo.texi              zapisanie HTML do @setfilename\n"
-"  makeinfo --xml foo.texi               zapisanie Texinfo XML do "
+"  makeinfo --html foo.texi                zapisanie HTML do @setfilename\n"
+"  makeinfo --xml foo.texi                 zapisanie Texinfo XML do "
 "@setfilename\n"
-"  makeinfo --docbook foo.texi           zapisanie DocBook XML do "
+"  makeinfo --docbook foo.texi             zapisanie DocBook XML do "
 "@setfilename\n"
-"  makeinfo --no-headers foo.texi        zapisanie czystego tekstu na\n"
-"                                          standardowe wyj¶cie\n"
+"  makeinfo --no-headers foo.texi          zapisanie czystego tekstu na\n"
+"                                            standardowe wyj¶cie\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi zapisanie HTML bez linii wêz³ów i "
+"  makeinfo --html --no-headers foo.texi   zapisanie HTML bez linii wêz³ów i "
 "menu\n"
-"  makeinfo --number-sections foo.texi   zapisanie Info z numerowanymi "
+"  makeinfo --number-sections foo.texi     zapisanie Info z numerowanymi "
 "sekcjami\n"
-"  makeinfo --no-split foo.texi          zapisanie jednego wielkiego pliku "
+"  makeinfo --no-split foo.texi            zapisanie jednego wielkiego pliku "
 "Info\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr "%s: Zignorowano nierozpoznan± warto¶æ TEXINFO_OUTPUT_FORMAT `%s'.\n"
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: argument %s musi byæ liczb±, a nie `%s'.\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s: nie mo¿na otworzyæ wyj¶cia `%s' do zapisu rozwiniêæ makr"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s: zignorowano drugie wyj¶cie `%s' do zapisu rozwiniêæ makr.\n"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: argument --paragraph-indent musi byæ liczb±/`none'/`asis', a nie `%s'.\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: argumentem --footnote-style musi byæ `separate' lub `end', a nie `%s'.\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: brakuj±cy argument plikowy.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Niew³a¶ciwie u¿yte wieloliniowe polecenie %c%s"
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "Oczekiwano `%s'"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Nie mo¿na utworzyæ katalogu `%s': %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Nie znaleziono `%s' w `%s'"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: nie zapisywanie rozwiniêæ makr na stdout, bo tam zapisywane jest Info.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Tworzenie pliku %s `%s' z `%s'.\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "To jest %s, wyprodukowany przez makeinfo w wersji %s z %s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2563,82 +2841,82 @@ msgstr ""
 "%s: Usuwanie pliku wyj¶cia makr `%s' z powodu b³êdów; --force pozwoli "
 "zachowaæ.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: Usuwanie pliku wyj¶ciowego `%s' z powodu b³êdów; --force pozwoli "
 "zachowaæ.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Nieznane polecenie `%s'"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 "Nale¿y u¿yæ nawiasów klamrowych, aby podaæ polecenie jako argument dla @%s"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s oczekiwa³o nawiasów klamrowych"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "Niedopasowany }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "BEZ_NAZWY!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "w %c%s brakuje klamry zamykaj±cej"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "Plik @image `%s' (dla HTML) nieczytelny: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, c-format
 msgid "No such file `%s'"
 msgstr "Nie ma pliku `%s'"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "Plik @image `%s' (dla tekstu) nieczytelny: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "Po @image brakuje argumentu plikowego"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr "niezdefiniowana flaga: %s"
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Brak warto¶ci dla `%s'}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s wymaga nazwy"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Osi±gniêto koniec pliku przed znalezieniem @end %s"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' jest zbyt d³ugie do rozwiniêcia; nie rozwiniêto"
@@ -2647,164 +2925,131 @@ msgstr "`%.40s...' jest zbyt d³ugie do rozwiniêcia; nie rozwiniêto"
 msgid "Missing } in @multitable template"
 msgstr "Brakuj±cy } we wzorcu @multitable"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "zignorowano zab³±kany tekst `%s' po @multitable"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Zbyt du¿o kolumn w elemencie multitable (maksymalnie %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[nieoczekiwane] nie mo¿na wybraæ kolumny #%d w multitable"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "zignorowano @tab poza multitable"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Wielokolumnowe wyj¶cie z ostatniego wiersza:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolumna #%d: wyj¶cie = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Wêze³ `%s' poprzednio zdefiniowany w linii %d"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Formatowanie wêz³a %s...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Wêze³ `%s' wymaga polecenia wybieraj±cego (np. %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Nie podano nazwy wêz³a dla polecenia `%c%s'"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Znacznik `%s' i wêze³ `%s' odwzorowuj± siê na t± sam± nazwê pliku"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "Zignorowano to polecenie @anchor; wskazania na nie nie bêd± dzia³a³y"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Nale¿y zmieniæ ten znacznik lub u¿yæ opcji `--no-split'"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "Nieoczekiwany ³añcuch na koñcu pliku dzielonego HTML `%s'"
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "Nastêpny:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Poprzedni:"
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "W górê:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Znaczniki `%s' i `%s' odwzorowuj± siê na t± sam± nazwê pliku"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr "zignorowano polecenie @anchor; wskazania na nie nie bêd± dzia³a³y"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 "%s wskazuje na nieistniej±cy wêze³ `%s' (mo¿e b³êdny podzia³ na sekcje?)"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "Menu"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Odsy³acz"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 "Pole Nastêpny wêz³a `%s' nie wskazywane (mo¿e b³êdny podzia³ na sekcje?)"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Ten wêze³ (%s) ma z³e pole Poprzedni"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "Poprzedni"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Pole Poprzedni wêz³a `%s' nie wskazywane"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Ten wêze³ (%s) ma z³e pole Nastêpny"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "`%s' nie ma pola W górê (mo¿e b³êdny podzia³ na sekcje?)"
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "W górê"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 "Wêze³ `%s' nie ma elementu menu dla `%s' pomimo bycia jego celem W górê"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "wêze³ `%s' by³ wskazywany %d razy"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "nie wskazywany wêze³ `%s'"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr "Usuwanie %s\n"
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Nie mo¿na usun±æ pliku `%s': %s"
@@ -2819,268 +3064,107 @@ msgstr "Za³±cznik %c"
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "B³±d wewnêtrzny (search_sectioning) `%s'!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "B³±d wewnêtrzny (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s jest przestarza³e; nale¿y u¿yæ %c%s"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Wêze³ z %ctop jako sekcj± ju¿ istnieje"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Tutaj jest wêze³ %ctop"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop u¿yty przed %cnode, u¿ycie domy¶lnego %s"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Spis tre¶ci"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Skrót tre¶ci"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "Plik @image `%s' nieczytelny: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 "@headitem jako ostatni element @multitable tworzy niepoprawne dokumenty "
 "Docbook"
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: uwaga: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " dla %s"
-
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\t`%s --help' poda pe³n± listê opcji.\n"
-
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Sk³adnia: %s [OPCJA]... [PLIK-INFO [PLIK-KATALOGU]]\n"
-"\n"
-"Instalacja lub usuniêcie wpisów katalogu dla PLIKU-INFO w pliku katalogu\n"
-"Info PLIK-KATALOGU.\n"
-"\n"
-"Opcje:\n"
-" --delete          usuniêcie istniej±cych wpisów dla PLIKU-INFO\n"
-"                     z PLIKU-KATALOGU; nie wstawianie nowych wpisów.\n"
-" --dir-file=NAZWA  podanie nazwy pliku z katalogiem Info.\n"
-"                     Jest to odpowiednik u¿ycia argumentu PLIK-KATALOGU.\n"
-" --entry=TEKST     wstawienie TEKSTU jako wpisu katalogu Info.\n"
-"                     TEKST powinien mieæ formê linii elementu menu Info\n"
-"                     z zerem lub wiêcej linii zaczynaj±cymi siê od spacji.\n"
-"                     Je¶li podano wiêcej ni¿ jeden wpis, wszystkie s± "
-"dodawane.\n"
-"                     Je¶li nie podano ¿adnego wpisu, s± okre¶lane na "
-"podstawie\n"
-"                     informacji w samym pliku Info.\n"
-" --help            wy¶wietlenie tego opisu i zakoñczenie.\n"
-" --info-file=PLIK  podanie pliku Info do zainstalowania w katalogu.\n"
-"                     Jest to odpowiednik u¿ycia argumentu PLIK-INFO.\n"
-" --info-dir=KAT    to samo co --dir-file=KAT/dir.\n"
-" --item=TEKST      to samo co --entry TEKST.\n"
-"                     Wpis w katalogu Info jest elementem menu.\n"
-" --quiet           pominiêcie ostrze¿eñ.\n"
-" --remove          to samo co --delete.\n"
-" --section=SEKCJA  umieszczenie wpisów dla tego pliku w danej SEKCJI "
-"katalogu.\n"
-"                     Je¶li podano wiêcej ni¿ jedn± sekcjê, wszystkie wpisy "
-"s±\n"
-"                     dodawane do ka¿dej z sekcji.\n"
-"                     Je¶li nie podano ¿adnej sekcji, s± okre¶lane na "
-"podstawie\n"
-"                     informacji w samym pliku Info.\n"
-" --version         wy¶wietlenie informacji o wersji i zakoñczenie.\n"
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
-msgstr ""
-"To jest plik .../info/dir, zawieraj±cy najwy¿szy\n"
-"wêze³ hierarchii Info, o nazwie (dir)Top.\n"
-"Przy pierwszym uruchomieniu Info zaczyna siê od tego wêz³a.\n"
-"\n"
-"%s\tOto wierzcho³ek drzewa INFO\n"
-"\n"
-"  To (wêze³ Katalog) zawiera menu dla g³ównych tematów.\n"
-"  Naci¶niêcie \"q\" koñczy przegl±danie, \"?\" wy¶wietla wszystkie "
-"polecenia\n"
-"  Info, \"d\" wraca tutaj, \"h\" pokazuje wprowadzenie dla nowicjuszy,\n"
-"  \"mEmacs<Return>\" odwiedza podrêcznik Emacsa itd.\n"
-"\n"
-"  W Emacsie mo¿na klikn±æ drugim przyciskiem myszy na elemencie menu lub\n"
-"  odsy³aczu, aby go wybraæ.\n"
-"\n"
-"%s\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: nie mo¿na odczytaæ (%s) ani utworzyæ (%s)\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: pusty plik"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY bez odpowiadaj±cego END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY bez odpowiadaj±cego START-INFO-DIR-ENTRY"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "typu"
 
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr "%s: plik katalogu ju¿ istnieje: %s\n"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "na"
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Nale¿y podaæ plik Info tylko raz.\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "Pierwszy argument odsy³acza nie mo¿e byæ pusty"
 
-#: util/install-info.c:1284
+#: makeinfo/xref.c:252
 #, c-format
-msgid "excess command line argument `%s'"
-msgstr "nadmiarowy argument linii poleceñ `%s'"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
-msgstr "Nie podano pliku wej¶ciowego; --help mo¿e podaæ wiêcej informacji."
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr "Pusta nazwa pliku dla odsy³acza HTML w `%s'"
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr "Nie podano pliku katalogu; --help mo¿e podaæ wiêcej informacji."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr "Osi±gniêto koniec pliku podczas szukania `.' lub `,'"
 
-#: util/install-info.c:1313
+#: makeinfo/xref.c:390
 #, c-format
-msgid "no info dir entry in `%s'"
-msgstr "brak wpisu do katalogu info w `%s'"
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "Po @%s musi wyst±piæ `.' lub `,', a nie `%c'"
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "element menu `%s' ju¿ istnieje, dla pliku `%s'"
+#: makeinfo/xref.c:392
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "dla odsy³aczy w nawiasach nale¿y u¿yæ @pxref"
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "nie znaleziono wpisów dla `%s'; nic nie usuniêto"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "Pierwszy argument @inforef nie mo¿e byæ pusty"
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "wy¶wietlenie tego opisu i zakoñczenie"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "zachowanie plików tymczasowych po przetwarzaniu"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "nie zachowywanie plików tymczasowych po przetwarzaniu (domy¶lne)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "zapisanie wyj¶cia do PLIKU"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "wy¶wietlenie informacji o wersji i zakoñczenie"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Sk³adnia: %s [OPCJA]... PLIK...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 "Generowanie posortowanego indeksu dla ka¿dego PLIKU wyj¶ciowego w TeXu.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 "Zazwyczaj PLIK... podaje siê jako `foo.%c%c' dla dokumentu `foo.texi'.\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3089,23 +3173,22 @@ msgstr ""
 "\n"
 "Opcje:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: nie jest plikiem indeksu texinfo"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "b³±d podczas ponownego otwierania %s"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: nie jest plikiem indeksu texinfo"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "Brak numeru strony w %s"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "wpis %s wyst±pi³ po wpisie z dodatkow± nazw±"
diff --git a/Build/source/utils/texinfo/po/ro.gmo b/Build/source/utils/texinfo/po/ro.gmo
index 3a4129a8a99..268fee18ba8 100644
--- a/Build/source/utils/texinfo/po/ro.gmo
+++ b/Build/source/utils/texinfo/po/ro.gmo
diff --git a/Build/source/utils/texinfo/po/ro.po b/Build/source/utils/texinfo/po/ro.po
index 7979e8f3ff2..ba415acda8a 100644
--- a/Build/source/utils/texinfo/po/ro.po
+++ b/Build/source/utils/texinfo/po/ro.po
@@ -1,15 +1,15 @@
 # Mesajele în limba românã pentru texinfo.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # Acest fiºier este distribuit sub aceeaºi licenþã ca ºi pachetul texinfo.
-# Laurentiu Buzdugan <lbuz@rolix.org>, 2003, 2004.
+# Laurentiu Buzdugan <lbuz@rolix.org>, 2003, 2004, 2005.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.7.90\n"
+"Project-Id-Version: texinfo 4.7.94\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
-"PO-Revision-Date: 2004-12-04 12:00+05\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2005-05-03 12:00+05\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -17,132 +17,198 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opþiunea `%s' este ambiguã\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opþiunea `--%s' nu permite un argument\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opþiunea `%c%s' nu permite un argument\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opþiunea `%s' necesitã un argument\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opþiune nerecunoscutã `--%s'\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opþiune nerecunoscutã `%c%s'\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opþiune ilegalã -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opþiune invalidã -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opþiunea necesitã un argument -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opþiunea `-W %s' este ambiguã\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opþiunea `-W %s' nu permite un argument\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr ""
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "Mergi înainte un caracter"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "Mergi înapoi un caracter"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "Mergi la începutul acestei linii"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "Mergi la sfârºitul acestei linii"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "Mergi înainte un cuvânt"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "Mergi înapoi un cuvânt"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "ªterge caracterul de sub cursor"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "ªterge caracterul din stânga cursorului"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Renunþã sau terminã operaþiunea"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Acceptã (sau forþeazã completarea) acestei linii"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Insereazã urmãtorul caracter identic (verbatim)"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Insereazã acest caracter"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Insereazã un caracter TAB"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Transpune caracterele la acest punct"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Extrage înapoi conþinutul ultimei ºtergeri (kill)"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "Inelul de ºtergeri (kill) e gol"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Extrage înapoi o ºtergere (kill) anterioarã"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "ªterge (kill) pânã la sfârºitul liniei"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "ªterge (kill) pânã la începutul liniei"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "ªterge (kill) cuvântul din dreapta cursorului"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "ªterge (kill) cuvãntul din stânga cursorului"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Nici o completare"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Nu e completat"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "Enumerã completãrile posibile"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "O singurã completare"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "O completare:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d completãri:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "Insereazã completarea"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "Construim completãrile..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "Scroll fereastra de completãri"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "Notele de subsol nu pot fi afiºate"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr "Aratã notele de subsol asociate cu acest nod în aceastã fereastrã"
 
@@ -150,76 +216,76 @@ msgstr "Aratã notele de subsol asociate cu acest nod în aceastã fereastrã"
 msgid "---------- Footnotes ----------"
 msgstr "------- Note de subsol  -------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "Cautã un ºir în indexul acestui fiºier"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "Cãutãm intrãri în index..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "Nici am gãsit nici un index."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Intrare în index: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Mergi la urmãtorul articol de index ce se potriveºte ultimei comenzi `"
 "\\[index-search]'"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "Nu existã nici un ºir cãutat anterior."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Nici o intrare în index."
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "Nici o intrare în %sindex conþinând `%s'."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "mai mult"
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "NU POT VEDEA ACEASTA"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "Am gãsit `%s' în %s. (`\\[next-index-match]' încearcã sã gãseascã urmãtorul.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "Scanãm indexurile pentru `%s'..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "Nici un fiºier info nu are `%s' în indexurile lor."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Cautã în toþi indexurile fiºierului pentru un ºir ºi contruieºte un meniu"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Index apropos: "
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, c-format
 msgid ""
 "\n"
@@ -228,120 +294,100 @@ msgstr ""
 "\n"
 "* Meniu: Noduri a cãror indexurile conþin `%s':\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Încercaþi --help pentru informaþii suplimentare.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
 #, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Nu existã NICI o garanþie.  Puteþi redistribui acest software conform\n"
-"termenilor Licenþei Publice Generale GNU (GNU GPL). Pentru informaþii\n"
-"suplimentare despre aceste chestiuni, vedeþi fiºierul numit COPYING.\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "nici o intrare de index a fost gãsitã pentru `%s'\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-"  -b, --speech-friendly        fii prietenos cu sintetizatoarele de "
-"vorbire.\n"
-
-#: info/info.c:597
+#: info/info.c:598
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+#, fuzzy
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+"  -b, --speech-friendly        fii prietenos cu sintetizatoarele de "
+"vorbire.\n"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Folosire: %s [OPÞIUNE]... [ARTICOL-MENIU...]\n"
-"\n"
-"Citeºte documentaþie în formatul Info.\n"
-"\n"
-"Opþiuni:\n"
-"      --apropos=ªIR            cautã ªIR în toþi indexurile tuturor "
-"manualelor.\n"
-"  -d, --directory=DIR          adaugã DIR la INFOPATH.\n"
-"      --dribble=NUMEFIªIER     aminteºte ce tasteazã utilizatorul în "
-"NUMEFIªIER.\n"
-"  -f, --file=NUMEFIªIER        specificã fiºierul Info de vizitat.\n"
-"  -h, --help                   afiºeazã acest mesaj ºi terminã.\n"
-"      --index-search=STRING    mergi la nodul referit de intrarea indexului "
-"ªIR.\n"
-"  -n, --node=NUMENOD           specificã nodurile în primul fiºier Info "
-"vizitat.\n"
-"  -o, --output=NUMEFIªIER      scrie nodurile selectate în NUMEFIªIER.\n"
-"  -R, --raw-escapes            scrie \"raw\" escape-uri ANSI (implicit).\n"
-"      --no-raw-escapes         scrie escape-urile ca text normal.\n"
-"      --restore=NUMEFIªIER     citeºte apãsãrile de teste iniþiale din "
-"NUMEFIªIER.\n"
-"  -O, --show-options, --usage  mergi la nodul cu opþiunile liniei de "
-"comandã.\n"
-"%s      --subnodes             afiºeazã recursiv articolele de meniu.\n"
-"  -w, --where, --location      afiºeazã locaþia fizicã a fiºierului Info.\n"
-"      --vi-keys                foloseºte key bindings similare cu cele din "
-"vi ºi less.\n"
-"      --version                afiºeazã informaþii versiune ºi terminã.\n"
-"\n"
-"Primul argument ce nu e o opþiune, dacã e prezent, este articolul de meniu\n"
-"de la care se începe; acesta este cãutat în toate fiºierele `dir' din\n"
-"INFOPATH. Dacã acesta nu este prezent, info combinã toate fiºierele `dir'\n"
-"ºi aratã rezultatul. Restul argumentelor sunt tratate ca nume de articole\n"
-"de meniu relative la nodul vizitat iniþial.\n"
-"\n"
-"Exemple:\n"
-"  info                      aratã conþinutul dir-ectorului din meniul\n"
-"                              nivelului de vârf\n"
-"  info emacs                începe la nodul emacs din dir-ectorul nivelului\n"
-"                              de vârf\n"
-"  info emacs buffers        începe la nodul buffere din manualul emacs\n"
-"  info --show-options emacs începe la nodul cu opþiunile liniei de\n"
-"                               comandã pentru emacs\n"
-"  info -f ./foo.info        aratã fiºierul ./foo.info, nu cãuta dir\n"
-
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -353,413 +399,414 @@ msgstr ""
 "întrebãri generale ºi discuþii la help-texinfo@gnu.org.\n"
 "Texinfo homepage: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Nu pot gãsi nodul `%s'."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Nu pot gãsi nodul `(%s)%s'."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "Nu pot gãsi o fereastrã!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "Punctul nu apare în interiorul nodului acestei ferestre!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "Nu pot ºterge ultima fereastrã."
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "Nici un meniu în acest nod"
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "Nici o notã de subsol în acest nod."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "Nici o referinþã la acelaºi pasaj în acest nod."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Nici un pointer `%s' pentru acest nod."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Comandã Info necunoscutã `%c';încercaþi `?' pentru ajutor."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Terminalul de tip `%s' nu e destul de deºtept sã ruleze Info."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "Sunteþi deja la ultima paginã a acestui nod."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "Sunteþi deja la prima paginã a acestui nod."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "O singurã fereastrã."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "Fereastra rezultantã ar fi prea micã."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Nu e destul spaþiu pentru o fereastrã de ajutor, ºtergeþi o fereastrã."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
-"Comenzi de bazã în Fereastra Info\n"
-"*********************************\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "\\%-10[quit-help]  Terminã acest ajutor.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Terminã Info complet.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Invocaþi tutorialul Info.\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"Selectaþi alte noduri:\n"
-"----------------------\n"
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-line]  Scroll înapoi 1 linie.\n"
+
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  Scroll înainte 1 linie.\n"
+
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Scroll înapoi o paginã.\n"
+
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Scroll înainte o paginã.\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  Mergi la \"urmãtorul\" nod al acestui nod.\n"
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Mergi la începutul acestui nod.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  Mergi la nodul \"precedent\" al acestui nod.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Mergi în \"sus\" de la acest nod.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Mergi la sfârºitul acestui nod.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
-"\\%-10[menu-item]  Alege articol meniu specificat prin nume.\n"
-"              Alegând un articol de meniu face ca alt nod sã fie selectat.\n"
+"\\%-10[move-to-next-xref]  Sari la urmãtoarea legãturã hypertext din acest "
+"nod.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
+#, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
-"\\%-10[xref-item]  Urmeazã o referinþã încruciºatã. Citeºte numele "
-"referinþei.\n"
+"\\%-10[select-reference-this-line]  Urmeazã legãtura hypertext de sub "
+"cursor.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr ""
 "\\%-10[history-node]  Mergi la ultimul nod vãzut în aceastã fereastrã.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr ""
-"\\%-10[move-to-next-xref]  Sãri la urmãtoarea legãturã hypertext din acest "
-"nod.\n"
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[prev-node]  Mergi la nodul \"precedent\" al acestui nod.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr ""
-"\\%-10[move-to-prev-xref]  Sãri la legãtura hypertext precedentã din acest "
-"nod.\n"
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[next-node]  Mergi la \"urmãtorul\" nod al acestui nod.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr ""
-"\\%-10[select-reference-this-line]  Urmeazã legãtura hypertext de sub "
-"cursor.\n"
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Mergi la nodul \"precedent\" al acestui nod.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
-"\\%-10[dir-node]  Mergi la nodul `director'.  Echivalent cu `\\[goto-node] "
-"(DIR)'.\n"
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Mergi la \"urmãtorul\" nod al acestui nod.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr ""
-"\\%-10[top-node]  Mergi la nodul Vârf.  Echivalent cu `\\[goto-node] Top'.\n"
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Mergi în \"sus\" de la acest nod.\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"Mergi în interiorul nodului:\n"
-"----------------------------\n"
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[end-of-node]  Mergi la sfârºitul acestui nod.\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[end-of-node]  Mergi la sfârºitul acestui nod.\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Mergi la începutul acestui nod.\n"
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "  %-10s  Alege primul ... al nouãlea articol în meniul nodului.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Mergi la sfârºitul acestui nod.\n"
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Alege ultimul articol în meniul nodului.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "\\%-10[next-line]  Scroll înainte 1 linie.\n"
+#, fuzzy
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  Alege articolul de meniu specificat prin nume.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "\\%-10[prev-line]  Scroll înapoi 1 linie.\n"
+#, fuzzy
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr ""
+"\\%-10[xref-item]  Urmeazã o referinþã încruciºatã. Citeºte numele "
+"referinþei.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Scroll înainte o paginã.\n"
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  Mergi la nodul specificat prin nume.\n"
 
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Scroll înapoi o paginã.\n"
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  Cautã înainte un ºir specificat,\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr ""
-"Alte comenzi:\n"
-"-------------\n"
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[prev-node]  Mergi la nodul \"precedent\" al acestui nod.\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
 msgstr ""
-"\\%-10[menu-digit]  Alege primul ... al nouãlea articol în meniul nodului.\n"
-
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "\\%-10[last-menu-item]  Alege ultimul articol în meniul nodului.\n"
+"  %-10s  Cautã ºirul specificat în intrãrile indexului acestui fiºier Info\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
+#, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 "\\%-10[index-search]  Cautã ºirul specificat în intrãrile indexului acestui\n"
 "            fiºier Info ºi selecteazã nodul referit de prima intrare "
 "gãsitã.\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  Mergi la nodul specificat prin nume.\n"
-"             Puteþi include ºi un nume de fiºier, ca în (NUMEFIªIER)"
-"NUMENOD.\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  Cautã înainte un ºir specificat\n"
-"              ºi selecteazã nodul în care acesta este gãsit.\n"
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "Renunþã la operaþia curentã"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  Cautã înapoi un ºir specificat\n"
-"              ºi selecteazã nodul în care acesta este gãsit.\n"
+"Comenzi de bazã în Fereastra Info\n"
+"*********************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Terminã acest ajutor.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Terminã Info complet.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Invocã tuturialul Info.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Mergi la nodul `urmãtor' acestui nod.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Mergi la nodul `precedent' acestui nod.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Mergi în `sus' de la acest nod.\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Alege articolul de meniu specificat prin nume.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr ""
+"\\%-10[menu-item]  Alege articol meniu specificat prin nume.\n"
 "              Alegând un articol de meniu face ca alt nod sã fie selectat.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 "  %-10s  Urmeazã referinþã la acelaºi pasaj. Citeºte numele referinþei.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Mergi la ultimul nod vãzut în aceastã fereastrã.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
-msgstr "  %-10s  Sãri la urmãtoarea legãturã hypertext din acest nod.\n"
+msgstr "  %-10s  Sari la urmãtoarea legãturã hypertext din acest nod.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
-msgstr "  %-10s  Sãri la legãtura hypertext de sub cursor.\n"
+msgstr "  %-10s  Sari la legãtura hypertext de sub cursor.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Mergi la nodul `director'.  Echivalent cu `g (DIR)'.\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Mergi la nodul Vârf.  Echivalent cu `g Top'.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Mergi în interiorul nodului:\n"
+"----------------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Scroll înainte o paginã.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Scroll înapoi o paginã.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Mergi la începutul acestui nod.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Mergi la sfârºitul acestui nod.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Scroll înainte 1 linie.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Scroll înapoi 1 linie.\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Alte comenzi:\n"
+"-------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  Alege primul ... al nouãlea articol în meniul nodului.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Alege ultimul articol în meniul nodului.\n"
 
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-"  %-10s  Cautã ºirul specificat în intrãrile indexului acestui fiºier Info\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
-msgstr "              ºi selecteazã nodul referit de prima intrare gãsitã.\n"
-
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Mergi la nodul specificat prin nume.\n"
+msgstr ""
+"\\%-10[index-search]  Cautã ºirul specificat în intrãrile indexului acestui\n"
+"            fiºier Info ºi selecteazã nodul referit de prima intrare "
+"gãsitã.\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
-"              Puteþi include ºi un nume de fiºier, ca în (NUMEFIªIER)"
+"\\%-10[goto-node]  Mergi la nodul specificat prin nume.\n"
+"             Puteþi include ºi un nume de fiºier, ca în (NUMEFIªIER)"
 "NUMENOD.\n"
 
-#: info/infodoc.c:133
-#, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Cautã înainte un ºir specificat,\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
+#: info/infodoc.c:129
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
-msgstr "              ºi selecteazã nodul în care acesta este gãsit.\n"
+msgstr ""
+"\\%-10[search]  Cautã înainte un ºir specificat\n"
+"              ºi selecteazã nodul în care acesta este gãsit.\n"
 
-#: info/infodoc.c:135
-#, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Cautã înapoi un ºir specificat\n"
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  Cautã înainte un ºir specificat\n"
+"              ºi selecteazã nodul în care acesta este gãsit.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "Calea curentã de cãutare este:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -767,7 +814,7 @@ msgstr ""
 "Comenzile disponibile în fereastra Info:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -775,7 +822,7 @@ msgstr ""
 "Comenzile disponibile în zona de ecou:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -784,7 +831,7 @@ msgstr ""
 "Urmãtoarele comenzi pot fi invocate via %s\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -792,83 +839,73 @@ msgstr ""
 "Urmãtoarele comenzi nu pot fi deloc invocate:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-"--- Folosiþi `\\[history-node]' sau `\\[kill-node]' pentru a termina ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "Afiºeazã mesaj de ajutor"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "Viziteazã nodul Info `(info)Ajutor'"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "Tipãreºte documentaþie pentru tastã (KEY)"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Descrie tastã (key): %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s nu este definit(ã)."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s nu este definit(ã)."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s este definit(ã) ca %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Aratã ce trebuie tasta pentru a executa o anumitã comandã"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Unde este comanda: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' nu este pe nici o tastã"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s poate fi invocat doar via %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s poate fi invocat via %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Nu existã nii o funcþie numitã `%s'"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Nu existã NICI o garanþie.  Puteþi redistribui acest software conform\n"
-"termenilor Licenþei Publice Generale GNU (GNU GPL). Pentru informaþii\n"
-"suplimentare despre aceste chestiuni, vedeþi fiºierul numit COPYING.\n"
+"Selectaþi alte noduri:\n"
+"----------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -978,22 +1015,22 @@ msgstr ""
 "  --help\t\tafiºeazã acest ajutor ºi terminã.\n"
 "  --version\t\tafiºeazã informaþii versiune ºi terminã.\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Ignorãm fiºier infokey incorect `%s' - prea mic"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Ignorãm fiºier infokey incorect `%s' - prea mare"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "Eroare la citirea fiºierului infokey `%s' - citit scurt"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -1001,14 +1038,14 @@ msgstr ""
 "Fiºier infokey incorect `%s' (bad magic numbers) -- rulaþi infokey pentru a-"
 "l actualiza"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 "Fiºierul d-voastrã infokey `%s' este vechi - rulaþi infokey pentru a-l "
 "actualiza"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -1016,7 +1053,7 @@ msgstr ""
 "Fiºier infokey incorect `%s' (bad section length) -- rulaþi infokey pentru a-"
 "l actualiza"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -1024,46 +1061,46 @@ msgstr ""
 "Fiºier infokey incorect `%s' (bad section code) -- rulaþi infokey pentru a-l "
 "actualiza"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "Date incorecte în fiºierul infokey -- unele legãturi de taste ignorate"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "Date incorecte în fiºierul infokey -- unele setãri de variabile ignorate"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "citeºte numele unei comenzi Info ºi descrie-o"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Descrie comanda: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "Citeºte un nume de comandã în zona ecou ºi executã-o"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Nu pot executa o comandã `zonã ecou' aici."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, c-format
 msgid "Undefined command: %s"
 msgstr "Comandã nedefinitã: %s"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "Seteazã înãlþimea ferestrei de afiºare"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Seteazã înãlþimea ecranului ls (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1072,12 +1109,12 @@ msgstr ""
 "   Fiºierele sursã (groveled) pentru a include acest fiºier:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Nu ap putut manipula fiºierul %s.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1089,7 +1126,7 @@ msgstr ""
 "  (Fiºier)Nod                        Linii   Mãrime   Conþine fiºier\n"
 "  -----------                        -----   ------   --------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1098,26 +1135,31 @@ msgstr ""
 "Selectaþi un nod din acest meniu, sau folosiþi `\\[history-node]' în altã "
 "fereastrã\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr ""
 "Creazã o fereastrã care conþine un meniu cu toate nodurile vizitate recent"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr ""
 "Selecteazã un nod care a fost vizitat anterior într-o fereastrã vizibilã"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Selecteazã nodul vizitat: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Referinþa a dispãrut! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1126,111 +1168,82 @@ msgstr ""
 "Bine aþi venit la Info versiunea %s. Tastaþi \\[get-help-window] pentru "
 "ajutor, \\[menu-item] pentru un articol din meniu."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "Mergi la linia urmãtoare"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "Mergi la linia precedentã"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "Mergi la sfârºitul liniei"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "Mergi la începutul liniei"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "Urmãtor"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Urmeazã nodul Urmãtor..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Selectare primul articol din meniu..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Selectare nod Urmãtor..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "Merg în Sus %d ori, apoi Urmãtor."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "Nu mai sunt alte noduri în acest document."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "Nici un `Prec' pentru acest nod."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Mut Prec în aceatã fereastã"
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "Nici un `Prec' sau `Sus' pentru acest nod în acest document."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Merg în Sus în aceastã fe"
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Merg la ultimul articol din meniul `Prec'"
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "Mergi înainte sau jos prin structura de noduri"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "Mergi înapoi sau sus prin structura de noduri"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "Scroll înainte în aceastã fereastrã"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 "Scroll înainte în aceastã fereastrã ºi seteazã dimensiunea implicitã a "
 "ferestrei"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr "Scroll înainte în aceastã fereastrã, rãmâi în nod"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "Scroll înainte în aceastã fereastrã, rãmâi în nod ºi seteazã dimensiunea "
 "implicitã a ferestrei"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "Scroll înapoi în acestã fereastrã"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
 "Scroll înapoi în acestã fereastrã ºi seteazã dimensiunea implicitã a "
 "ferestrei"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr "Scroll înapoi în aceastã fereastrã, rãmâi în nod"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1238,398 +1251,431 @@ msgstr ""
 "Scroll înapoi în aceastã fereastrã, rãmâi în nod ºi seteazã dimensiunea "
 "implicitã a ferestrei"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "Mergi la începutul acestui nod"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "Mergi la sfârºitul acestui nod"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "Scroll jos pe linii"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "Scroll sus pe linii"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "Scroll jos jumãtate de ecran"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "Scroll sus jumãtate de ecran"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "Selecteazã fereastra urmãtoare"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "Selecteazã fereastra precedentã"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "Împarte fereastra curentã"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "ªterge fereastra curentã"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "Nu pot ºterge o fereastrã permanentã"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "ªterge toate celelalte ferestre"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "Scroll-eazã cealaltã fereastrã"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "Scroll-eazã cealaltã fereastrã înapoi"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "Creºte sau micºoreazã aceastã fereastrã"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "Împarte spaþiul de ecran disponibil între ferestrele vizibile"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Comutã starea reformatãrii de linie (wrapping) în fereastra curentã"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "Selecteazã nodul Urmãtor"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "Selectezã nodul Prec"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "Selecteazã nodul Sus"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "Selecteazã ultimul nod din acest fiºier"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "Acestã fereastrã nu mai are nici un nod"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "Selecteazã primul nod din acest fiºier"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "Selecteazã ultimul articol din meniul acestui nod"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "Selecteazã acest articol de meniu"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Nu existã %d articole în acest meniu"
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Articol meniu (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Articol meniu: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Urmeazã ref (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "Urmeazã ref: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "Citeºte un articol de meniu ºi selecteazã nodul sãu"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Citeºte o notã de subsol sau referinþã ºi selecteazã nodul sãu"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "Mergi la începutul meniului acestui nod"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "Viziteazã cât mai multe articole de meniu posibile deodatã"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "Citeºte numele unui nod ºi selecteazã-l"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "Du-te la nod: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Nici un meniu în nod `%s'."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Nici un articol de meniu `%s' în nod `%s'."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Nu pot gãsi nodul referit de `%s' în `%s'."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Citeºte o listã de meniuri pornind din dir ºi urmãreºte-le"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "Urmeazã meniurile: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Gãseºte nodul ce descrie invocarea programului"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Gãseºte nodul Invocare pentru [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "Citeºte o referinþã de paginã de manul ºi selecteazã-o"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "Obþine paginã manual (manpage): "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "Selecteazã nodul `Vârf' în acest fiºier"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "Selecteazã nodul `(dir)'"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Distruge nodul (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Nu pot distruge nodul `%s'"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "Nu pot distruge ultimul nod"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "Selecteazã cel mai recent nod selectat"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "Distruge acest nod"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "Citeºte numele unui fiºier ºi selecteazã-l"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Gãseºte fiºier: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Nu pot gãsi `%s'."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Nu am putut crea fiºier ieºire `%s'."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Terminat."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "Scriu nod %s..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "Conectez (pipe) conþinutul acestui nod prin INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Nu pot deschide conexiune (pipe) cãtre `%s'."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "Tipãresc nod %s..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "ªterge (kill) pânã la începutul liniei"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Caut subfiºier %s ..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr "Citeºte un ºir ºi cautã-l þinând cont de litere mari/mici"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "Citeºte un ºir ºi cautã-l"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "Citeºte un ºir ºi cautã-l înapoi"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "%s%s pentru ºir [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr " þinând cont de litere mari/mici"
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "Cautã înapoi"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "Cautã"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " þinând cont de litere mari/mici"
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "Cãutare eºuatã."
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "Repetã ultima cãutare în aceeaºi direcþie"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "Nici un ºir cãutat anterior"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "Repetã ultima cãutare în direcþie opusã"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "Cautã interactiv pentru un ºir pe mãsurã ce este introdus"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "I-cautã înapoi: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "I-cautã înapoi: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "I-cautã: "
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "I-cautã: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "Eºuez "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "Mergi la referinþa precedentã"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "Mergi la referinþa urmãtoare"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "Selecteazã referinþa sau articolul de meniu ce apare pe acestã linie"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "Renunþã la operaþia curentã"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Ieºi"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "Mutã cursorul la o anumitã linie din fereastrã"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "Redeseneazã ecranul"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Ieºi din Info"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr "Ruleazã comanda legatã de litera micã de pe tastã"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Comandã necunoscutã (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" este invalid"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, c-format
 msgid "`%s' is invalid"
 msgstr "`%s' este invalid"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "Adaugã aceastã cifrã la argumentul numeric curent"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Începe (sau înmulþeºte cu 4) argumentul numeric curent"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "Folosit intern de \\[argument-universal]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Nu mai am memorie virtualã!\n"
@@ -1667,196 +1713,370 @@ msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr ""
 "Controleazã ce se întâmplã când este cerut scroll la sfârºitul unui nod"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr ""
 "Numãrul de linii pentru scroll când cursorul se mutã în afara ferestrei"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "Când \"Activ\", Info acceptã ºi afiºeazã caractere ISO Latin"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr ""
+"Controleazã ce se întâmplã când este cerut scroll la sfârºitul unui nod"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "Explicã folosirea unei variabile"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Descrie variabila: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Seteazã valoarea unei variabile Info"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Seteazã variabilã: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "Seteazã %s cu valoarea (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "Seteazã %s cu valoarea (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Tag-uri Vechi ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), linii ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d linii --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d linii --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Subfiºier: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opþiunea `%s' este ambiguã\n"
+msgid "%s: warning: "
+msgstr "%s: avertisment: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opþiunea `--%s' nu permite un argument\n"
+msgid " for %s"
+msgstr " pentru %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opþiunea `%c%s' nu permite un argument\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tÎncercaþi `%s --help' pentru o lipsã completã de opþiuni.\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Folosire: %s [OPÞIUNE]... FIªIER-TEXINFO...\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Trimiteþi emailuri raportând bug-uri la bug-texinfo@gnu.org,\n"
+"întrebãri generale ºi discuþii la help-texinfo@gnu.org.\n"
+"Texinfo homepage: http://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opþiunea `%s' necesitã un argument\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Acesta este fiºierul .../info/dir, care conþine nodul\n"
+"cel mai de sus din ierarhia Info, numit (dir)Top.\n"
+"Prima datã când porniþi Info veþi vedea acest nod.\n"
+"\n"
+"%s\tAcesta este vârful arborelui INFO\n"
+"\n"
+"  Acesta (nodul Director) furnizeazã un meniu cu subiecte majore.\n"
+"  Apãsând \"q\" terminã, \"?\" enumerã toate comenzile Info, \"d\" vã aduce "
+"aici,\n"
+"  \"h\" furnizeazã un tutorial pentru începãtori,\n"
+"  \"mEmacs<Return>\" viziteazã manualul Emacs, etc.\n"
+"\n"
+"  În Emacs, puteþi face clic cu butonul 2 al mausului pe un articol de "
+"meniu\n"
+"  sau o referinþã pentru a o selecta.\n"
+"\n"
+"%s\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opþiune nerecunoscutã `--%s'\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: nu am putut citi (%s) ºi nu am putut crea (%s)\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opþiune nerecunoscutã `%c%s'\n"
+msgid "%s: empty file"
+msgstr "%s: fiºier gol"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY fãrã un END-INFO-DIR-ENTRY corespunzãtor"
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY fãrã un  START-INFO-DIR-ENTRY corespunzãtor"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opþiune ilegalã -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: are deja fiºier dir: %s\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opþiune invalidã -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Specificã fiºierul Info o singurã datã.\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opþiunea necesitã un argument -- %c\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opþiunea `-W %s' este ambiguã\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opþiunea `-W %s' nu permite un argument\n"
+msgid "excess command line argument `%s'"
+msgstr "argument suplimentar în linia de comandã `%s'"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ""
+"Nici un fiºier de intrare specificat; încercaþi --help pentru informaþii "
+"suplimentare."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+"Nici un fiºier dir specificat; încercaþi --help pentru informaþii "
+"suplimentare."
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "nici o intrare dir info în `%s'"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "nici o intrare gãsitã pentru `%s'; n-am ºters nimic"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "argumentele pentru @%s ignorate"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "Ianuarie"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "Februarie"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "Martie"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "Aprilie"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "Mai"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "Iunie"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "Iulie"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "August"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "Septembrie"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "Octombrie"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "Noiembrie"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "Decembrie"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "caracter neverosimil %c în @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "argumentul @sc în litere mari, prin urmare fãrã efect"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`{' aºteptat, dar am vãzut `%c'"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "sfârºit de fiºier în interiorul blocului de verb"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`}' aºteptat, dar am vãzut `%c'"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1864,328 +2084,312 @@ msgstr ""
 "@strong{Notã...] produce o referinþã încruciºatã falsã în Info; reformulaþi "
 "pentru a o evita"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s este depãsit"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp necesitã un argument numeric pozitiv, nu `%s'"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Argument nepotrivit pentru %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "aºacume"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "nimic"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Argument nepotrivit pentru @%s"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr "insereazã"
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "Lipseºte `}' în @def arg"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Funcþie"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Macro"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Formã Specialº"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Variabilã"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Opþiune Utilizator"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Instanþiere Variabilã"
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Argument nepotrivit pentru @%s"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Metodã"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "din"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "pe"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Lipseºte `}' în @def arg"
 
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "Trebuie sã fiþi în mediul `@%s' pentru a folosi `@%s'"
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr "`%s' omis înainte de numele fiºierului de ieºire"
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr "`%s' omis întrucât scriu la ieºirea standard (stdout)"
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr "Buffer-ul de ieºire nu este gol."
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Vezi "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "`%c%s' necesitã un argument `{...}', nu numai `%s'"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "Nici o parantezã de închidere pentru nota de subsol `%s'"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "Nota de subsol definitã fãrã nod pãrinte"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Nu sun permise note de subsol în note de subsol"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "Note de subsol"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: --css-file s-a terminat cu un comentariu"
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "Fãrã titlu"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr "[neaºteptat] nici un tag html de ridicat"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[neaºteptat] nume de nod invalid: `%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Index necunoscut `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info nu poate folosi `:' în intrarea de index `%s'"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indez-ul `%s' existã deja"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Index-ul necunoscut `%s' ºi/sau `%s' în @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr "(linie )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr "(linia %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Index necunoscut `%s' în @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Intrarea pentru index-ul `%s' în afara oricãrui nod"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(în afara oricãrui nod)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "Vezi "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr "@item nu este permis în argument la @itemize"
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Tip-Greºit în insertion_type_pname"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "Stivã de enumerare inundatã (overflow)"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "inundate (overflow) la tipãrire, reîncep la %c"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s necesitã un argument: formatatorul pentru %citem"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr "mediile %cfloat nu pot fi încuibãrite"
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "`@end' a aºteptat `%s', dar a vãzut `%s'"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Nici o potrivire %cend %s'"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s necesitã litere sau cifre"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "sfârºit de fiºier în interiorul blocului neformatat (verbatim)"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "@%s nu are sens în exteriorul mediului `@float'"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "probabil cã nodul d-voastrã @top ar trebui împachetat în @ifnottex în loc de "
 "@ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu vãzut înainte de primul nod, creez nodul `Vârf'"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr "@%s nu are sens în exteriorul mediilor `@titlepage' ºi `@quotation'"
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "@%s nu are sens în exteriorul mediului `@titlepage'"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "`%c%s' fãrã pereche"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "`%c%s' necesitã ceva dupã el"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Argument greºit `%s' pentru `@%s', folosesc `%s'"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s nu are sens în interiorul blocului `@%s'"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx nu are sens în interiorul blocului `%s'"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s gãsit în afara unui bloc de inserare"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s nu este un cod de limbã valid conform ISO 639"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "nume de codare nerecunoscut `%s'"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "ne pare rãu, codarea `%s' nu este suportatã"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "caracter codat invalid `%s'"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s aºteaptã `i' sau `j' ca argument, nu `%c'"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s aºteaptã un singur caracter `i' sau `j' ca argument"
@@ -2200,7 +2404,7 @@ msgstr "macro-ul `%s' definit anterior"
 msgid "here is the previous definition of `%s'"
 msgstr "aici este definiþia anterioarã a lui `%s'"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "\\ in expansiunea macro urmatã de `%s' în loc de nume parametru"
@@ -2210,46 +2414,50 @@ msgstr "\\ in expansiunea macro urmatã de `%s' în loc de nume parametru"
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Macro `%s' chemat pe linia %d cu prea multe argumente"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend macro nu a fost gãsit"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg folositor numai pentru macro-uri cu un singur argument"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "nepotrivire @end %s cu @%s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Prea multe erori!  Am renunþat.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: avertisment: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "%c nelalocul lui"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Încercaþi `%s --help' pentru informaþii suplimentare.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Folosire: %s [OPÞIUNE]... FIªIER-TEXINFO...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2257,17 +2465,17 @@ msgstr ""
 "Translateazã documentaþia sursã Texinfo în diferite alte formate, implicit\n"
 "fiºiere Info potrivite pentru citit online cu Emacs sau GNU Info.\n"
 
-#: makeinfo/makeinfo.c:350
-#, c-format
+#: makeinfo/makeinfo.c:354
+#, fuzzy, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
@@ -2283,14 +2491,14 @@ msgstr ""
 "      --version               afiºeazã informaþii despre versiune ºi "
 "terminã.\n"
 
-#: makeinfo/makeinfo.c:364
-#, no-wrap
+#: makeinfo/makeinfo.c:369
+#, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 "Selecþia formatului de ieºire (implicit este sã creeze Info):\n"
 "      --docbook             ieºire DocBook XML în loc de Info.\n"
@@ -2298,20 +2506,24 @@ msgstr ""
 "      --xml                 ieºire Texinfo XML în loc de Info.\n"
 "      --plaintext           ieºire text simplu în loc de Info.\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
+#, fuzzy
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 "Opþiuni de ieºire generale:\n"
 "  -E, --macro-expand FIªIER ieºire macro-expandatã în FIªIER.\n"
@@ -2327,18 +2539,21 @@ msgstr ""
 "      --number-sections     scrie numere de capitole ºi secþiuni.\n"
 "  -o, --output=FIªIER       scrie în FIªIER (director dacã multiple HTML),\n"
 
-#: makeinfo/makeinfo.c:386
-#, c-format
+#: makeinfo/makeinfo.c:391
+#, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2364,23 +2579,27 @@ msgstr ""
 "      --split-size=NUM        împarte fiºierele Info de dimens. NUM "
 "(implicit %d).\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
+#, fuzzy
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 "Opþiuni pentru HTML:\n"
 "      --css-include=FIªIER      include FIªIER în HTML <stil> ieºire;\n"
 "                                  citeºte stdin dacã FIªIER este -.\n"
 
-#: makeinfo/makeinfo.c:409
-#, c-format
+#: makeinfo/makeinfo.c:418
+#, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 "Opþiuni pentru HTML:\n"
@@ -2389,7 +2608,7 @@ msgstr ""
 "                                  dacã VAL e 0, spaþiile goale ce pot fi "
 "ignorate nu sunt afiºate.\n"
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2405,7 +2624,7 @@ msgstr ""
 "  -P DIR                        prepend DIR la calea de cãutare @include.\n"
 "  -U VAR                        nedefineºte variabila VAR, ca ºi @clear.\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2444,7 +2663,7 @@ msgstr ""
 "  De asemenea, pentru opþiunile --no-ifFORMAT, proceseazã text "
 "@ifnotFORMAT.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2459,19 +2678,21 @@ msgstr ""
 "  dacã generaþi text simplu, --ifplaintext este selectat iar restul sunt "
 "deselectate;\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
+#, fuzzy
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "Exemple:\n"
 "  makeinfo foo.texi                     scrie Info în @setfilename-ul lui "
@@ -2488,81 +2709,76 @@ msgstr ""
 "  makeinfo --no-split foo.texi          scrie un singur fiºier Info "
 "indiferent cât de mare\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr "%s: Ignor valoare nerecunoscutã TEXINFO_OUTPUT_FORMAT `%s'.\n"
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'.\n"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: lipseºte fiºierul argument.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Comandã pe multiple linii %c%s folositã incorect"
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "Am aºteptat `%s'"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Nu pot crea directorul `%s': %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Nici un `%s' nu a fost gãsit în `%s'"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Omite expasiunea macro la ieºire întrucât ieºirea Info merge acolo.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Creez fiºierul %s `%s' din `%s'.\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "Acesta este %s, produs de makeinfo versiunea %s din %s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2570,81 +2786,81 @@ msgstr ""
 "%s: ªterg fiºierul de ieºire macro `%s' din cauza erorilor; folosiþi --force "
 "pentru a-l pãstra.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: fiºierul de ieºire `%s' din cauza erorilor; folosiþi --force pentru a-l "
 "pãstra.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Comandã necunoscutã `%s'"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s am aºteptat paranteze"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "} fãrã pereche"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "NICI_UN_NUME!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s lipseºte paranteza de închidere"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "Fiºierul @image `%s' (pentru HTML) nu poate fi citit: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, c-format
 msgid "No such file `%s'"
 msgstr "Nici un fiºier `%s'"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "Fiºierul @image `%s' (pentru text) nu poate fi citit: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "@image lipseºte fiºierul argument."
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr "marcaj nedefinit: %s"
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Nici o valoare pentru `%s'}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s necesitã un nume"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Am ajuns la eof înainte de a potrivi @end %s"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' este prea lung pentru expansiune; nu a fost expandat"
@@ -2653,164 +2869,131 @@ msgstr "`%.40s...' este prea lung pentru expansiune; nu a fost expandat"
 msgid "Missing } in @multitable template"
 msgstr "} lipsã în ºablonul @multitable"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignor text aiurea `%s' dupã @multitable"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Prea multe coloane în articol multitabel (max %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[neaºteptat] nu pot selecta coloana #%d în multitabel"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "ignor @tab în afara multitabelului"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Ieºirea multitabel din ultimul rând:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* coloana #%d: ieºire = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Nodul `%s' definit anterior la linia %d"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Formatez nodul %s...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Nodul `%s' cere o comandã de secþionare (ex., %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Nici un nume specificat pentru comanda `%c%s'"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Ancoraj `%s' ºi nodul `%s' aratã cãtre acelaºi nume de fiºier"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 "Aceastã comandã @anchor ignoratã; referinþele cãtre acesta nu vor merge"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Redenumeºte acest ancoraj sau foloseºte opþiunea `--no-split'"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "ªir neaºteptat la sfârºitul fiºierului HTML spart `%s'"
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "Urmãtor:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Precedent:"
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "Sus:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Ancoraj `%s' ºi `%s' aratã cãtre acelaºi nume de fiºier"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr "Comandã @anchor ignoratã; referinþele cãtre acesta nu vor merge"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 "referinþa %s cãtre nodul inexistent `%s' (probabil secþionare incorectã?)"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "Meniu"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Traverseazã"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 "Urmãtorul câmp de nod `%s' nu este referit (probabil secþionare incorectã?)"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Acest nod (%s) are un Prec incorect"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "Prec"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Câmpul Prec al nodului `%s' nu este referit"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Acest nod (%s) are referinþa Urmãtor incorectã"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "`%s' nu are nici un câmp Sus (probabil secþionare incorectã?)"
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "Sus"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "Nodului `%s' îi lipseºte articolul pentru `%s' deºi îi este þinta Sus"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "nodul `%s' a fost referit de %d ori"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "nod nereferit `%s'"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr "ªterg %s\n"
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Nu pot ºterge fisierul `%s': %s"
@@ -2825,273 +3008,108 @@ msgstr "Anexã %c"
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "Eroare internã (search_sectioning) `%s'!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Eroare internã (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s este depãºitã; foloseºte %c%s în schimb"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Nodul cu %ctop ca ºi secþiune existã deja"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Aici este nodul %ctop"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop folosit înaintea lui %cnode, implicit cãtre %s"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Cuprins"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Rezumate"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 "@headitem ca ultimul articol din @multitable produce documenteDocbook "
 "invalide"
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: avertisment: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " pentru %s"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "din"
 
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\tÎncercaþi `%s --help' pentru o lipsã completã de opþiuni.\n"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "pe"
 
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Usage: %s [OPÞIUNE]... [FIªIER-INFO [FIªIER-DIR]]\n"
-"\n"
-"Instaleazã sau ºterge intrãri dir din FIªIER-INFO în fiºier director Info \n"
-"FIªIER-DIR.\n"
-"\n"
-"Opþiuni:\n"
-" --delete          ºterge intrãri existente pentru FIªIER-INFO din FIªIER-"
-"DIR;\n"
-"                     nu insera nici o nouã intrare.\n"
-" --dir-file=NUME   specificã nume fiºier pentru fiºierul director Info.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insereazã TEXT ca o intrare de director Info.\n"
-"                     TEXT ar trebui sã aibã forma unei linii articol meniu "
-"Info \n"
-"                     plus zero sau mai multe extra linii începând cu "
-"spaþiu.\n"
-"                     Dacã precizaþi mai mult de o intrare, toate sunt "
-"adãugate.\n"
-"                     Dacã nu precizaþi nici o intrare, ele sunt determinate\n"
-"                     din informaþiile din fiºierul Info.\n"
-" --help            afiºeazã acest mesaj ºi terminã.\n"
-" --info-file=FIªIER  specificã fiºierul Info de instalat în director.\n"
-"                     Acesta este echivalent cu folosirea argumentului FIªIER-"
-"INFO.\n"
-" --info-dir=DIR    acelaºi efect ca --dir-file=DIR/dir.\n"
-" --item=TEXT       acelaºi efect ca --entry TEXT.\n"
-"                     O intrare director Info este de fapt un articol de "
-"meniu.\n"
-" --quiet           suprimã avertismentele.\n"
-" --remove          acelaºi efect ca --delete.\n"
-" --section=SEC     pune intrãrile acestui fiºier în secþiunea SEC, toate\n"
-"                     intrãrile sunt adãugate în fiecare dintre secþiuni.\n"
-"                     Dacã nu specificaþi nici o secþiune, acestea sunt\n"
-"                     determinate din informaþiile din fiºierul Info.\n"
-" --version         afiºeazã informaþii depre versiune ºi terminã.\n"
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
 msgstr ""
-"Acesta este fiºierul .../info/dir, care conþine nodul\n"
-"cel mai de sus din ierarhia Info, numit (dir)Top.\n"
-"Prima datã când porniþi Info veþi vedea acest nod.\n"
-"\n"
-"%s\tAcesta este vârful arborelui INFO\n"
-"\n"
-"  Acesta (nodul Director) furnizeazã un meniu cu subiecte majore.\n"
-"  Apãsând \"q\" terminã, \"?\" enumerã toate comenzile Info, \"d\" vã aduce "
-"aici,\n"
-"  \"h\" furnizeazã un tutorial pentru începãtori,\n"
-"  \"mEmacs<Return>\" viziteazã manualul Emacs, etc.\n"
-"\n"
-"  În Emacs, puteþi face clic cu butonul 2 al mausului pe un articol de "
-"meniu\n"
-"  sau o referinþã pentru a o selecta.\n"
-"\n"
-"%s\n"
 
-#: util/install-info.c:513
+#: makeinfo/xref.c:252
 #, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: nu am putut citi (%s) ºi nu am putut crea (%s)\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: fiºier gol"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY fãrã un END-INFO-DIR-ENTRY corespunzãtor"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY fãrã un  START-INFO-DIR-ENTRY corespunzãtor"
-
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr "%s: are deja fiºier dir: %s\n"
-
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Specificã fiºierul Info o singurã datã.\n"
-
-#: util/install-info.c:1284
-#, c-format
-msgid "excess command line argument `%s'"
-msgstr "argument suplimentar în linia de comandã `%s'"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
-"Nici un fiºier de intrare specificat; încercaþi --help pentru informaþii "
-"suplimentare."
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
 msgstr ""
-"Nici un fiºier dir specificat; încercaþi --help pentru informaþii "
-"suplimentare."
 
-#: util/install-info.c:1313
+#: makeinfo/xref.c:390
 #, c-format
-msgid "no info dir entry in `%s'"
-msgstr "nici o intrare dir info în `%s'"
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr ""
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "articol meniu `%s' existã deja, pentru fiºier `%s'"
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "Nici o referinþã la acelaºi pasaj în acest nod."
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "nici o intrare gãsitã pentru `%s'; n-am ºters nimic"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr ""
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "afiºeazã acest mesaj ºi terminã"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "pãstreazã fiºierele temporare dupã procesare"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "nu pãstra fiºierele temporare dupã procesare (implicit)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "trimite ieºire în FIªIER"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "afiºeazã informaþii despre versiune ºi terminã"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Folosire: %s [OPÞIUNI]... FIªIER...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Genereazã un index sortat pentru fiecare FIªIER de ieºire TeX.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 "De obicei FIªIER... este specificat ca `foo.%c%c' pentru un document 'foo."
 "texi'.\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3100,26 +3118,401 @@ msgstr ""
 "\n"
 "Opþiuni:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: nu este un fiºier index texinfo"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "am eºuat sã redeschid %s"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: nu este un fiºier index texinfo"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "Nici un numãr de paginã în %s"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "intrarea %s urmeazã o intrare cu nume secundar"
 
-#~ msgid "%s: Specify the Info directory only once.\n"
-#~ msgstr "%s: Specificã directorul Info o singurã datã.\n"
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10[search]  Cautã înainte un ºir specificat\n"
+#~ "              ºi selecteazã nodul în care acesta este gãsit.\n"
+
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10[goto-node]  Mergi la nodul specificat prin nume.\n"
+#~ "             Puteþi include ºi un nume de fiºier, ca în (NUMEFIªIER)"
+#~ "NUMENOD.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "\\%-10[next-node]  Mergi la \"urmãtorul\" nod al acestui nod.\n"
+
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr ""
+#~ "\\%-10[dir-node]  Mergi la nodul `director'.  Echivalent cu `\\[goto-"
+#~ "node] (DIR)'.\n"
+
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr ""
+#~ "\\%-10[top-node]  Mergi la nodul Vârf.  Echivalent cu `\\[goto-node] "
+#~ "Top'.\n"
+
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10[search-backward]  Cautã înapoi un ºir specificat\n"
+#~ "              ºi selecteazã nodul în care acesta este gãsit.\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr ""
+#~ "--- Folosiþi `\\[history-node]' sau `\\[kill-node]' pentru a termina ---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr ""
+#~ "\\%-10[move-to-prev-xref]  Sari la legãtura hypertext precedentã din "
+#~ "acest nod.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "Folosire: %s [OPÞIUNE]... [ARTICOL-MENIU...]\n"
+#~ "\n"
+#~ "Citeºte documentaþie în formatul Info.\n"
+#~ "\n"
+#~ "Opþiuni:\n"
+#~ "      --apropos=ªIR            cautã ªIR în toþi indexurile tuturor "
+#~ "manualelor.\n"
+#~ "  -d, --directory=DIR          adaugã DIR la INFOPATH.\n"
+#~ "      --dribble=NUMEFIªIER     aminteºte ce tasteazã utilizatorul în "
+#~ "NUMEFIªIER.\n"
+#~ "  -f, --file=NUMEFIªIER        specificã fiºierul Info de vizitat.\n"
+#~ "  -h, --help                   afiºeazã acest mesaj ºi terminã.\n"
+#~ "      --index-search=STRING    mergi la nodul referit de intrarea "
+#~ "indexului ªIR.\n"
+#~ "  -n, --node=NUMENOD           specificã nodurile în primul fiºier Info "
+#~ "vizitat.\n"
+#~ "  -o, --output=NUMEFIªIER      scrie nodurile selectate în NUMEFIªIER.\n"
+#~ "  -R, --raw-escapes            scrie \"raw\" escape-uri ANSI (implicit).\n"
+#~ "      --no-raw-escapes         scrie escape-urile ca text normal.\n"
+#~ "      --restore=NUMEFIªIER     citeºte apãsãrile de teste iniþiale din "
+#~ "NUMEFIªIER.\n"
+#~ "  -O, --show-options, --usage  mergi la nodul cu opþiunile liniei de "
+#~ "comandã.\n"
+#~ "%s      --subnodes             afiºeazã recursiv articolele de meniu.\n"
+#~ "  -w, --where, --location      afiºeazã locaþia fizicã a fiºierului "
+#~ "Info.\n"
+#~ "      --vi-keys                foloseºte key bindings similare cu cele "
+#~ "din vi ºi less.\n"
+#~ "      --version                afiºeazã informaþii versiune ºi terminã.\n"
+#~ "\n"
+#~ "Primul argument ce nu e o opþiune, dacã e prezent, este articolul de "
+#~ "meniu\n"
+#~ "de la care se începe; acesta este cãutat în toate fiºierele `dir' din\n"
+#~ "INFOPATH. Dacã acesta nu este prezent, info combinã toate fiºierele "
+#~ "`dir'\n"
+#~ "ºi aratã rezultatul. Restul argumentelor sunt tratate ca nume de "
+#~ "articole\n"
+#~ "de meniu relative la nodul vizitat iniþial.\n"
+#~ "\n"
+#~ "Exemple:\n"
+#~ "  info                      aratã conþinutul dir-ectorului din meniul\n"
+#~ "                              nivelului de vârf\n"
+#~ "  info emacs                începe la nodul emacs din dir-ectorul "
+#~ "nivelului\n"
+#~ "                              de vârf\n"
+#~ "  info emacs buffers        începe la nodul buffere din manualul emacs\n"
+#~ "  info --show-options emacs începe la nodul cu opþiunile liniei de\n"
+#~ "                               comandã pentru emacs\n"
+#~ "  info -f ./foo.info        aratã fiºierul ./foo.info, nu cãuta dir\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr ""
+#~ "              Alegând un articol de meniu face ca alt nod sã fie "
+#~ "selectat.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "              Puteþi include ºi un nume de fiºier, ca în (NUMEFIªIER)"
+#~ "NUMENOD.\n"
+
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr "  %-10s  Cautã înapoi un ºir specificat\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "              ºi selecteazã nodul în care acesta este gãsit.\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "Urmeazã nodul Urmãtor..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "Selectare primul articol din meniu..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "Selectare nod Urmãtor..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "Merg în Sus %d ori, apoi Urmãtor."
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "Mut Prec în aceatã fereastã"
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "Merg în Sus în aceastã fe"
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "Merg la ultimul articol din meniul `Prec'"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "Funcþie"
+
+#~ msgid "Macro"
+#~ msgstr "Macro"
+
+#~ msgid "Special Form"
+#~ msgstr "Formã Specialº"
+
+#~ msgid "Variable"
+#~ msgstr "Variabilã"
+
+#~ msgid "User Option"
+#~ msgstr "Opþiune Utilizator"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Instanþiere Variabilã"
+
+#~ msgid "Method"
+#~ msgstr "Metodã"
+
+#~ msgid "Untitled"
+#~ msgstr "Fãrã titlu"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "Acesta este %s, produs de makeinfo versiunea %s din %s.\n"
+
+#~ msgid "Next:"
+#~ msgstr "Urmãtor:"
+
+#~ msgid "Previous:"
+#~ msgstr "Precedent:"
+
+#~ msgid "Up:"
+#~ msgstr "Sus:"
+
+#~ msgid "Menu"
+#~ msgstr "Meniu"
+
+#~ msgid "Cross"
+#~ msgstr "Traverseazã"
+
+#~ msgid "Prev"
+#~ msgstr "Prec"
+
+#~ msgid "Up"
+#~ msgstr "Sus"
+
+#, fuzzy
+#~ msgid "see "
+#~ msgstr "Vezi "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "Usage: %s [OPÞIUNE]... [FIªIER-INFO [FIªIER-DIR]]\n"
+#~ "\n"
+#~ "Instaleazã sau ºterge intrãri dir din FIªIER-INFO în fiºier director "
+#~ "Info \n"
+#~ "FIªIER-DIR.\n"
+#~ "\n"
+#~ "Opþiuni:\n"
+#~ " --delete          ºterge intrãri existente pentru FIªIER-INFO din FIªIER-"
+#~ "DIR;\n"
+#~ "                     nu insera nici o nouã intrare.\n"
+#~ " --dir-file=NUME   specificã nume fiºier pentru fiºierul director Info.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insereazã TEXT ca o intrare de director Info.\n"
+#~ "                     TEXT ar trebui sã aibã forma unei linii articol "
+#~ "meniu Info \n"
+#~ "                     plus zero sau mai multe extra linii începând cu "
+#~ "spaþiu.\n"
+#~ "                     Dacã precizaþi mai mult de o intrare, toate sunt "
+#~ "adãugate.\n"
+#~ "                     Dacã nu precizaþi nici o intrare, ele sunt "
+#~ "determinate\n"
+#~ "                     din informaþiile din fiºierul Info.\n"
+#~ " --help            afiºeazã acest mesaj ºi terminã.\n"
+#~ " --info-file=FIªIER  specificã fiºierul Info de instalat în director.\n"
+#~ "                     Acesta este echivalent cu folosirea argumentului "
+#~ "FIªIER-INFO.\n"
+#~ " --info-dir=DIR    acelaºi efect ca --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       acelaºi efect ca --entry TEXT.\n"
+#~ "                     O intrare director Info este de fapt un articol de "
+#~ "meniu.\n"
+#~ " --quiet           suprimã avertismentele.\n"
+#~ " --remove          acelaºi efect ca --delete.\n"
+#~ " --section=SEC     pune intrãrile acestui fiºier în secþiunea SEC, toate\n"
+#~ "                     intrãrile sunt adãugate în fiecare dintre secþiuni.\n"
+#~ "                     Dacã nu specificaþi nici o secþiune, acestea sunt\n"
+#~ "                     determinate din informaþiile din fiºierul Info.\n"
+#~ " --version         afiºeazã informaþii depre versiune ºi terminã.\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "articol meniu `%s' existã deja, pentru fiºier `%s'"
+
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr ""
+#~ "\\%-10[menu-digit]  Alege primul ... al nouãlea articol în meniul "
+#~ "nodului.\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "nodul `%s' a fost referit de %d ori"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Nu existã NICI o garanþie.  Puteþi redistribui acest software conform\n"
+#~ "termenilor Licenþei Publice Generale GNU (GNU GPL). Pentru informaþii\n"
+#~ "suplimentare despre aceste chestiuni, vedeþi fiºierul numit COPYING.\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-arg folositor numai pentru macro-uri cu un singur argument"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Cuprins"
+
+#~ msgid "Short Contents"
+#~ msgstr "Rezumate"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "pãstreazã fiºierele temporare dupã procesare"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "nu pãstra fiºierele temporare dupã procesare (implicit)"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr ""
+#~ "              ºi selecteazã nodul referit de prima intrare gãsitã.\n"
+
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "Nu existã NICI o garanþie.  Puteþi redistribui acest software conform\n"
+#~ "termenilor Licenþei Publice Generale GNU (GNU GPL). Pentru informaþii\n"
+#~ "suplimentare despre aceste chestiuni, vedeþi fiºierul numit COPYING.\n"
diff --git a/Build/source/utils/texinfo/po/ru.gmo b/Build/source/utils/texinfo/po/ru.gmo
index 04eba1eaeea..dd71c4baf73 100644
--- a/Build/source/utils/texinfo/po/ru.gmo
+++ b/Build/source/utils/texinfo/po/ru.gmo
diff --git a/Build/source/utils/texinfo/po/ru.po b/Build/source/utils/texinfo/po/ru.po
index b245a565d08..eac3f06c1be 100644
--- a/Build/source/utils/texinfo/po/ru.po
+++ b/Build/source/utils/texinfo/po/ru.po
@@ -1,145 +1,211 @@
 # ðÅÒÅ×ÏÄÙ ÓÏÏÂÝÅÎÉÊ ÄÌÑ GNU Texinfo.
 # Copyright (C) 1999 Free Software Foundation, Inc.
-# Oleg S. Tihonov <ost@tatnipi.ru>, 1999, 2001, 2002, 2003, 2004
+# Oleg S. Tihonov <ost@tatnipi.ru>, 1999, 2001, 2002, 2003, 2004, 2005
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.7.92\n"
+"Project-Id-Version: texinfo 4.7.94\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
-"PO-Revision-Date: 2004-12-16 08:19+0300\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2005-02-07 09:27+0300\n"
 "Last-Translator: Oleg S. Tihonov <ost@tatnipi.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr ""
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÉÍ×ÏÌ ×ÐÅÒÅÄ"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÉÍ×ÏÌ ÎÁÚÁÄ"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "óÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÓÔÒÏËÉ"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "óÍÅÓÔÉÔØÓÑ × ËÏÎÅÃ ÓÔÒÏËÉ"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÌÏ×Ï ×ÐÅÒÅÄ"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÌÏ×Ï ÎÁÚÁÄ"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "õÄÁÌÉÔØ ÓÌÅÄÕÀÝÉÊ ÓÉÍ×ÏÌ"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "õÄÁÌÉÔØ ÐÒÅÄÙÄÕÝÉÊ ÓÉÍ×ÏÌ"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "ïÔÍÅÎÉÔØ ÉÌÉ ÐÒÅÒ×ÁÔØ ÄÅÊÓÔ×ÉÅ"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "ðÒÉÎÑÔØ (ÉÌÉ ÚÁ×ÅÒÛÉÔØ) ÔÅËÕÝÕÀ ÓÔÒÏËÕ"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "÷ÓÔÁ×ÉÔØ ÓÌÅÄÕÀÝÉÊ ÓÉÍ×ÏÌ \"ËÁË ÅÓÔØ\""
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "÷ÓÔÁ×ÉÔØ ÜÔÏÔ ÓÉÍ×ÏÌ"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "÷ÓÔÁ×ÉÔØ ÓÉÍ×ÏÌ ÔÁÂÕÌÑÃÉÉ"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "ðÅÒÅÓÔÁ×ÉÔØ ÓÉÍ×ÏÌÙ ×ÏËÒÕÇ ÔÏÞËÉ"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÐÏÓÌÅÄÎÉÊ ÕÎÉÞÔÏÖÅÎÎÙÊ ÔÅËÓÔ"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "ëÏÌØÃÏ ÕÎÉÞÔÏÖÅÎÉÊ ÐÕÓÔÏ"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÐÒÅÄÛÅÓÔ×ÕÀÝÉÊ ÕÎÉÞÔÏÖÅÎÎÙÊ ÔÅËÓÔ"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "õÎÉÞÔÏÖÉÔØ ÔÅËÓÔ ÄÏ ËÏÎÃÁ ÓÔÒÏËÉ"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "õÎÉÞÔÏÖÉÔØ ÔÅËÓÔ ÄÏ ÎÁÞÁÌÁ ÓÔÒÏËÉ"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "õÎÉÞÔÏÖÉÔØ ÓÌÅÄÕÀÝÅÅ ÓÌÏ×Ï"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "õÎÉÞÔÏÖÉÔØ ÐÒÅÄÙÄÕÝÅÅ ÓÌÏ×Ï"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "úÁ×ÅÒÛÅÎÉÊ ÎÅÔ"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "îÅ ÚÁ×ÅÒÛÅÎÏ"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "ðÏËÁÚÁÔØ ×ÏÚÍÏÖÎÙÅ ÚÁ×ÅÒÛÅÎÉÑ"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "åÄÉÎÓÔ×ÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "åÄÉÎÓÔ×ÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "úÁ×ÅÒÛÅÎÉÊ: %d :\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "÷ÓÔÁ×ÉÔØ ÚÁ×ÅÒÛÅÎÉÅ"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "óÏÓÔÁ×ÌÅÎÉÅ ÚÁ×ÅÒÛÅÎÉÊ..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "ðÒÏËÒÕÔÉÔØ ÏËÎÏ ÚÁ×ÅÒÛÅÎÉÊ"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "óÎÏÓËÉ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÐÏËÁÚÁÎÙ"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr "ðÏËÁÚÁÔØ ÓÎÏÓËÉ, Ó×ÑÚÁÎÎÙÅ Ó ÜÔÏÊ ÎÏÄÏÊ, × ÄÒÕÇÏÍ ÏËÎÅ"
 
@@ -147,77 +213,77 @@ msgstr "ðÏËÁÚÁÔØ ÓÎÏÓËÉ, Ó×ÑÚÁÎÎÙÅ Ó ÜÔÏÊ ÎÏÄÏÊ, × ÄÒÕÇÏÍ ÏËÎÅ"
 msgid "---------- Footnotes ----------"
 msgstr "----------   óÎÏÓËÉ  ----------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "îÁÊÔÉ ÓÔÒÏËÕ × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÄÌÑ ÄÁÎÎÏÇÏ ÆÁÊÌÁ"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "ðÏÉÓË  × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "îÅ ÎÁÊÄÅÎ ÁÌÆÁ×ÉÔÎÙÊ ÕËÁÚÁÔÅÌØ."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "ðÕÎËÔ × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "ðÅÒÅÊÔÉ Ë ÓÌÅÄÕÀÝÅÍÕ ÐÕÎËÔÕ ÁÌÆÁ×ÉÔÎÏÇÏ ÕËÁÚÁÔÅÌÑ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÍÕ\n"
 "ÐÏÓÌÅÄÎÅÊ ËÏÍÁÎÄÅ `\\[index-search]'"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "óÔÒÏËÁ ÐÏÉÓËÁ × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÎÅ ÂÙÌÁ ÒÁÎØÛÅ ÚÁÄÁÎÁ."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "îÅ ÎÁÊÄÅÎ ÁÌÆÁ×ÉÔÎÙÊ ÕËÁÚÁÔÅÌØ."
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "÷ ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ %s ÎÅ ÎÁÊÄÅÎÏ ÐÕÎËÔÏ×, ÓÏÄÅÒÖÁÝÉÈ `%s'."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "ÂÏÌØÛÅ "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "üÔÏ ÎÅ×ÉÄÉÍÙÊ ÔÅËÓÔ!"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "îÁÊÄÅÎÁ `%s' × %s. (`\\[next-index-match]' ÎÁÈÏÄÉÔ ÓÌÅÄÕÀÝÅÅ ÓÏ×ÐÁÄÅÎÉÅ.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "ðÏÉÓË × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÆÁÊÌÁ `%s'..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "îÉ ÏÄÉÎ ÉÚ info-ÆÁÊÌÏ× ÎÅ ÓÏÄÅÒÖÉÔ `%s' × ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "úÁÐÕÓËÁÅÔ ÐÏÉÓË ÓÔÒÏËÉ × ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ ×ÓÅÈ Info-ÆÁÊÌÏ× É ÓÏÚÄÁÅÔ "
 "ÍÅÎÀ"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "ëÌÀÞÅ×ÏÅ ÓÌÏ×Ï ÄÌÑ ÐÏÉÓËÁ: "
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, c-format
 msgid ""
 "\n"
@@ -226,118 +292,100 @@ msgstr ""
 "\n"
 "* Menu: îÏÄÙ, ÞØÉ ÁÌÆÁ×ÉÔÎÙÅ ÕËÁÚÁÔÅÌÉ ÓÏÄÅÒÖÁÔ `%s':\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ --help ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
 #, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ.  ÷Ù ÍÏÖÅÔÅ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÜÔÉ ÐÒÏÇÒÁÍÍÙ, ÐÒÉ\n"
-"ÓÏÂÌÀÄÅÎÉÉ ÕÓÌÏ×ÉÊ õÎÉ×ÅÒÓÁÌØÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU.\n"
-"äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ Ï ×ÏÚÍÏÖÎÏÓÔÉ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÓÍÏÔÒÉÔÅ\n"
-"ÆÁÊÌ COPYING.\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "ÄÌÑ `%s' ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ × ÉÍÅÎÎÏÍ ÕËÁÚÁÔÅÌÅ\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-"  -b, --speech-friendly       ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ, ÕÄÏÂÎÏÍ ÄÌÑ ÓÉÎÔÅÚÁÔÏÒÏ× "
-"ÒÅÞÉ.\n"
-
-#: info/info.c:597
+#: info/info.c:598
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+#, fuzzy
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+"  -b, --speech-friendly       ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ, ÕÄÏÂÎÏÍ ÄÌÑ ÓÉÎÔÅÚÁÔÏÒÏ× "
+"ÒÅÞÉ.\n"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... [ðõîëô-íåîà...]\n"
-"\n"
-"ðÏÚ×ÏÌÑÅÔ ÐÒÏÓÍÁÔÒÉ×ÁÔØ ÄÏËÕÍÅÎÔÁÃÉÀ × ÆÏÒÍÁÔÅ Info.\n"
-"\n"
-"ëÌÀÞÉ:\n"
-"      --apropos=ôåíá      ÉÓËÁÔØ ôåíõ ×Ï ×ÓÅÈ ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ\n"
-"                          ×ÓÅÈ ÒÕËÏ×ÏÄÓÔ×.\n"
-"  -d, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë INFOPATH.\n"
-"      --dribble=æáêì      ÚÁÐÉÓÁÔØ ××ÏÄÉÍÙÅ ÐÏÌØÚÏ×ÁÔÅÌÅÍ ÚÎÁËÉ × æáêì.\n"
-"  -f, --file=æáêì         ÐÏËÁÚÁÔØ ÚÁÄÁÎÎÙÊ æáêì.\n"
-"  -h, --help              ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n"
-"      --index-search=óôòïëá    ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÎÁ ËÏÔÏÒÕÀ ÓÓÙÌÁÅÔÓÑ "
-"ÚÁÄÁÎÎÏÅ\n"
-"                          óôòïëïê ×ÈÏÖÄÅÎÉÅ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ.\n"
-"  -n, --node=îïäá         ÎÁÞÁÔØ ÐÒÏÓÍÏÔÒ Ó ÚÁÄÁÎÎÏÊ îïäù.\n"
-"  -o, --output=æáêì       ÚÁÐÉÓÁÔØ ×ÙÂÒÁÎÎÙÅ ÎÏÄÙ × æáêì.\n"
-"  -R, --raw-escapes       ×Ù×ÏÄÉÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ANSI (ÐÏ "
-"ÕÍÏÌÞÁÎÉÀ).\n"
-"      --no-raw-escapes    ×Ù×ÏÄÉÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ËÁË ÂÕË×ÁÌØÎÙÊ "
-"ÔÅËÓÔ.\n"
-"      --restore=æáêì      ÐÒÏÞÉÔÁÔØ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÎÁÖÁÔÙÈ ËÌÁ×ÉÛ ÉÚ "
-"æáêìá.\n"
-"  -O, --show-options, --usage ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ ËÏÍÁÎÄÎÏÊ "
-"ÓÔÒÏËÉ.\n"
-"%s      --subnodes          ÒÅËÕÒÓÉ×ÎÏ ×Ù×ÏÄÉÔØ ÐÕÎËÔÙ ÍÅÎÀ.\n"
-"      --vi-keys           ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÉ×ÑÚËÉ ËÌÁ×ÉÛ ËÁË × vi É less.\n"
-"      --version           ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n"
-"\n"
-"ðÅÒ×ÙÊ ÎÅ Ñ×ÌÑÀÝÉÊÓÑ ËÌÀÞÏÍ ÁÒÇÕÍÅÎÔ, ÅÓÌÉ ÏÎ ÅÓÔØ, ÚÁÄÁÅÔ ÉÍÑ\n"
-"ÎÁÞÁÌØÎÏÇÏ ÐÕÎËÔÁ ÍÅÎÀ; ÏÎ ÉÝÅÔÓÑ ×Ï ×ÓÅÈ ÆÁÊÌÁÈ `dir' × INFOPATH.\n"
-"åÓÌÉ ÏÎ ÎÅ ÎÁÊÄÅÎ, info ÏÂßÅÄÉÎÑÅÔ ×ÓÅ ÆÁÊÌÙ `dir' É ÐÏËÁÚÙ×ÁÅÔ\n"
-"ÒÅÚÕÌØÔÁÔ.  ÷ÓÅ ÏÓÔÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÒÁÓÓÍÁÔÒÉ×ÁÀÔÓÑ ËÁË ÉÍÅÎÁ ÐÕÎËÔÏ×\n"
-"ÍÅÎÀ ÏÔÎÏÓÉÔÅÌØÎÏ ÐÅÒ×ÏÊ ÐÏÓÅÝÅÎÎÏÊ ÎÏÄÙ.\n"
-"\n"
-"ðÒÉÍÅÒÙ:\n"
-"  info                       ÐÏËÁÚÁÔØ ÍÅÎÀ ËÁÔÁÌÏÇÁ ×ÅÒÈÎÅÇÏ ÕÒÏ×ÎÑ\n"
-"  info emacs                 ÎÁÞÁÔØ Ó ÎÏÄÙ emacs ÉÚ ËÁÔÁÌÏÇÁ ×ÅÒÈÎÅÇÏ "
-"ÕÒÏ×ÎÑ\n"
-"  info emacs buffers         ÎÁÞÁÔØ Ó ÎÏÄÙ buffers × ÒÕËÏ×ÏÄÓÔ×Å emacs\n"
-"  info --show-options emacs  ÎÁÞÁÔØ Ó ÎÏÄÙ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ emacs\n"
-"  info -f ./foo.info         ÐÏËÁÚÁÔØ ÆÁÊÌ ./foo.info, ÎÅ ÉÓËÁÔØ dir\n"
-
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -349,405 +397,411 @@ msgstr ""
 "ÏÂÝÅÅ ÏÂÓÕÖÄÅÎÉÅ É ×ÏÐÒÏÓÙ ÎÁÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ help-texinfo@gnu.org.\n"
 "äÏÍÁÛÎÁÑ ÓÔÒÁÎÉÃÁ Texinfo: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `%s'."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `(%s)%s'."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÏËÎÏ!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "ôÏÞËÁ ÎÁÈÏÄÉÔÓÑ ×ÎÅ ÎÏÄÙ ÜÔÏÇÏ ÏËÎÁ!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÅÅ ÏËÎÏ."
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "÷ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÍÅÎÀ."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "äÌÑ ÜÔÏÊ ÎÏÄÙ ÎÅÔ ÓÓÙÌËÉ `%s'."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "ëÏÍÁÎÄÁ Info `%c' ÎÅÉÚ×ÅÓÔÎÁ; ÐÏÐÒÏÂÕÊÔÅ `?' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÒÁ×ËÉ."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ""
 "ôÅÒÍÉÎÁÌ ÔÉÐÁ `%s' ÎÅ ÏÂÌÁÄÁÅÔ ÄÏÓÔÁÔÏÞÎÙÍÉ ×ÏÚÍÏÖÎÏÓÔÑÍÉ ÄÌÑ ÚÁÐÕÓËÁ Info."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÐÏÓÌÅÄÎÅÊ ÓÔÒÁÎÉÃÅ ÜÔÏÊ ÎÏÄÙ."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÁÎÉÃÅ ÜÔÏÊ ÎÏÄÙ."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "ôÏÌØËÏ ÏÄÎÏ ÏËÎÏ."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "ðÏÌÕÞÉ×ÛÅÅÓÑ ÏËÎÏ ÂÙÌÏ ÂÙ ÓÌÉÛËÏÍ ÍÁÌÅÎØËÉÍ."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 "îÅ È×ÁÔÁÅÔ ÍÅÓÔÁ ÄÌÑ ÓÐÒÁ×ÏÞÎÏÇÏ ÏËÎÁ, ÐÏÖÁÌÕÊÓÔÁ, ÕÄÁÌÉÔÅ ËÁËÏÅ-ÎÉÂÕÄØ ÏËÎÏ."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
-"ïÓÎÏ×ÎÙÅ ËÏÍÁÎÄÙ × ÏËÎÁÈ Info\n"
-"******************************\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "\\%-10[quit-help]  ðÏËÉÎÕÔØ ÜÔÕ ÓÐÒÁ×ËÕ.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  ðÏËÉÎÕÔØ ÔÁËÖÅ Info.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  ÷ÙÚ×ÁÔØ ÏÂÕÞÁÀÝÅÅ ÒÕËÏ×ÏÄÓÔ×Ï.\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"÷ÙÂÏÒ ÄÒÕÇÏÊ ÎÏÄÙ:\n"
-"------------------\n"
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-line]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
+
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
+
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
+
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  ðÅÒÅÊÔÉ Ë \"ÓÌÅÄÕÀÝÅÊ\" ÎÏÄÅ.\n"
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÜÔÏÊ ÎÏÄÙ.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  ðÅÒÅÊÔÉ Ë \"ÐÒÅÄÙÄÕÝÅÊ\" ÎÏÄÅ.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ \"××ÅÒÈ\".\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÜÔÏÊ ÎÏÄÙ.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
-"\\%-10[menu-item]  ðÅÒÅÊÔÉ Ë ÐÕÎËÔÕ ÍÅÎÀ, ÚÁÄÁ×ÁÅÍÏÍÕ ÐÏ ÉÍÅÎÉ.\n"
-"              ðÒÉ ÐÅÒÅÈÏÄÅ Ë ÚÁÄÁÎÎÏÍÕ ÐÕÎËÔÕ ÍÅÎÀ ×ÙÂÉÒÁÅÔÓÑ ÄÒÕÇÁÑ ÎÏÄÁ.\n"
+"\\%-10[move-to-next-xref]  ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ "
+"ÎÏÄÅ.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
+#, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
-msgstr "\\%-10[xref-item]  ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ.  óÞÉÔÙ×ÁÅÔ ÉÍÑ ÓÓÙÌËÉ.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr ""
+"\\%-10[select-reference-this-line]  ðÅÒÅÊÔÉ ÐÏ ÇÉÐÅÒÓÓÙÌËÅ ÐÏÄ ËÕÒÓÏÒÏÍ.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr "\\%-10[history-node]  ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ × ÜÔÏÍ ÏËÎÅ.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr ""
-"\\%-10[move-to-next-xref]  ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ "
-"ÎÏÄÅ.\n"
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[prev-node]  ðÅÒÅÊÔÉ Ë \"ÐÒÅÄÙÄÕÝÅÊ\" ÎÏÄÅ.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr ""
-"\\%-10[move-to-prev-xref]  ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ "
-"ÎÏÄÅ.\n"
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[next-node]  ðÅÒÅÊÔÉ Ë \"ÓÌÅÄÕÀÝÅÊ\" ÎÏÄÅ.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr ""
-"\\%-10[select-reference-this-line]  ðÅÒÅÊÔÉ ÐÏ ÇÉÐÅÒÓÓÙÌËÅ ÐÏÄ ËÕÒÓÏÒÏÍ.\n"
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  ðÅÒÅÊÔÉ Ë \"ÐÒÅÄÙÄÕÝÅÊ\" ÎÏÄÅ.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr "\\%-10[dir-node]  ðÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÊ ÎÏÄÅ.  üË×É×ÁÌÅÎÔÎÏ `g (DIR)'.\n"
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  ðÅÒÅÊÔÉ Ë \"ÓÌÅÄÕÀÝÅÊ\" ÎÏÄÅ.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr "\\%-10[top-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ Top.  üË×É×ÁÌÅÎÔÎÏ `g Top'.\n"
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ \"××ÅÒÈ\".\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"ðÅÒÅÍÅÝÅÎÉÅ ×ÎÕÔÒÉ ÎÏÄÙ:\n"
-"------------------------\n"
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[end-of-node]  ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÜÔÏÊ ÎÏÄÙ.\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[end-of-node]  ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÜÔÏÊ ÎÏÄÙ.\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÜÔÏÊ ÎÏÄÙ.\n"
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "  %-10s  ÷ÙÂÒÁÔØ ÐÅÒ×ÙÊ ... ÄÅ×ÑÔÙÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÜÔÏÊ ÎÏÄÙ.\n"
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  ÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "\\%-10[next-line]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
+#, fuzzy
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ÚÁÄÁÎÎÏÍÕ ÐÕÎËÔÕ ÍÅÎÀ.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "\\%-10[prev-line]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
+#, fuzzy
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "\\%-10[xref-item]  ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ.  óÞÉÔÙ×ÁÅÔ ÉÍÑ ÓÓÙÌËÉ.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ÚÁÄÁÎÎÏÊ ÎÏÄÅ.\n"
 
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  îÁÊÔÉ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ, É ÐÅÒÅÊÔÉ Ë\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr ""
-"äÒÕÇÉÅ ËÏÍÁÎÄÙ:\n"
-"---------------\n"
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[prev-node]  ðÅÒÅÊÔÉ Ë \"ÐÒÅÄÙÄÕÝÅÊ\" ÎÏÄÅ.\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
 msgstr ""
-"\\%-10[menu-digit]  ÷ÙÂÒÁÔØ ÐÅÒ×ÙÊ ... ÄÅ×ÑÔÙÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ.\n"
-
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "\\%-10[last-menu-item]  ÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ\n"
+"  %-10s  ðÒÏÉÚ×ÅÓÔÉ ÐÏÉÓË ÚÁÄÁÎÎÏÊ ÓÔÒÏËÉ ÓÒÅÄÉ ×ÈÏÖÄÅÎÉÊ ÉÍÅÎÎÙÈ ÕËÁÚÁÔÅÌÅÊ "
+"ÜÔÏÇÏ\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
+#, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 "\\%-10[index-search]  éÓËÁÔØ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ × ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ\n"
 "              Info-ÆÁÊÌÁ É ×ÙÂÒÁÔØ ÎÏÄÕ ÐÏ ÐÅÒ×ÏÊ ÎÁÊÄÅÎÎÏÊ ÓÓÙÌËÅ.\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ, ÚÁÄÁÎÎÏÊ ÐÏ ÉÍÅÎÉ.\n"
-"              ÷Ù ÍÏÖÅÔÅ ÚÁÄÁÔØ ÔÁËÖÅ ÉÍÑ ÆÁÊÌÁ, ÎÁÐÒÉÍÅÒ (æáêì)îïäá.\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  éÓËÁÔØ ÕËÁÚÁÎÎÕÀ ÓÔÒÏËÕ × ÔÅËÕÝÅÍ Info-ÆÁÊÌÅ É ÏÓÔÁÎÏ×ÉÔØÓÑ "
-"×\n"
-"              ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "ïÔÍÅÎÉÔØ ×ÙÐÏÌÎÅÎÉÅ ÔÅËÕÝÅÊ ËÏÍÁÎÄÙ"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  éÓËÁÔØ ÕËÁÚÁÎÎÕÀ ÓÔÒÏËÕ × ÔÅËÕÝÅÍ Info-ÆÁÊÌÅ ×\n"
-"              ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
+"ïÓÎÏ×ÎÙÅ ËÏÍÁÎÄÙ × ÏËÎÁÈ Info\n"
+"******************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  ðÏËÉÎÕÔØ ÜÔÕ ÓÐÒÁ×ËÕ.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  ðÏËÉÎÕÔØ ÔÁËÖÅ Info.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  ÷ÙÚ×ÁÔØ ÏÂÕÞÁÀÝÅÅ ÒÕËÏ×ÏÄÓÔ×Ï.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë `ÓÌÅÄÕÀÝÅÊ' ÎÏÄÅ.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë `ÐÒÅÄÙÄÕÝÅÊ' ÎÏÄÅ.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ÎÏÄÅ `××ÅÒÈ'.\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ÚÁÄÁÎÎÏÍÕ ÐÕÎËÔÕ ÍÅÎÀ.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr ""
+"\\%-10[menu-item]  ðÅÒÅÊÔÉ Ë ÐÕÎËÔÕ ÍÅÎÀ, ÚÁÄÁ×ÁÅÍÏÍÕ ÐÏ ÉÍÅÎÉ.\n"
 "              ðÒÉ ÐÅÒÅÈÏÄÅ Ë ÚÁÄÁÎÎÏÍÕ ÐÕÎËÔÕ ÍÅÎÀ ×ÙÂÉÒÁÅÔÓÑ ÄÒÕÇÁÑ ÎÏÄÁ.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ.  óÞÉÔÙ×ÁÅÔ ÉÍÑ ÓÓÙÌËÉ.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ × ÜÔÏÍ ÏËÎÅ.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ ÎÏÄÅ.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ ÐÏ ÇÉÐÅÒÓÓÙÌËÅ ÐÏÄ ËÕÒÓÏÒÏÍ.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÊ ÎÏÄÅ.  üË×É×ÁÌÅÎÔÎÏ `g (DIR)'.\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ÎÏÄÅ Top.  üË×É×ÁÌÅÎÔÎÏ `g Top'.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"ðÅÒÅÍÅÝÅÎÉÅ ×ÎÕÔÒÉ ÎÏÄÙ:\n"
+"------------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÜÔÏÊ ÎÏÄÙ.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÜÔÏÊ ÎÏÄÙ.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"äÒÕÇÉÅ ËÏÍÁÎÄÙ:\n"
+"---------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  ÷ÙÂÒÁÔØ ÐÅÒ×ÙÊ ... ÄÅ×ÑÔÙÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  ÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ\n"
 
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-"  %-10s  ðÒÏÉÚ×ÅÓÔÉ ÐÏÉÓË ÚÁÄÁÎÎÏÊ ÓÔÒÏËÉ ÓÒÅÄÉ ×ÈÏÖÄÅÎÉÊ ÉÍÅÎÎÙÈ ÕËÁÚÁÔÅÌÅÊ "
-"ÜÔÏÇÏ\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
-msgstr "              Info-ÆÁÊÌÁ É ×ÙÂÒÁÔØ ÎÏÄÕ ÐÏ ÐÅÒ×ÏÊ ÎÁÊÄÅÎÎÏÊ ÓÓÙÌËÅ.\n"
-
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ÚÁÄÁÎÎÏÊ ÎÏÄÅ.\n"
+msgstr ""
+"\\%-10[index-search]  éÓËÁÔØ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ × ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ\n"
+"              Info-ÆÁÊÌÁ É ×ÙÂÒÁÔØ ÎÏÄÕ ÐÏ ÐÅÒ×ÏÊ ÎÁÊÄÅÎÎÏÊ ÓÓÙÌËÅ.\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr "              ÷Ù ÍÏÖÅÔÅ ÚÁÄÁÔØ ÔÁËÖÅ ÉÍÑ ÆÁÊÌÁ, ÎÁÐÒÉÍÅÒ (æáêì)îïäá.\n"
-
-#: info/infodoc.c:133
-#, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  îÁÊÔÉ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ, É ÐÅÒÅÊÔÉ Ë\n"
+msgstr ""
+"\\%-10[goto-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ, ÚÁÄÁÎÎÏÊ ÐÏ ÉÍÅÎÉ.\n"
+"              ÷Ù ÍÏÖÅÔÅ ÚÁÄÁÔØ ÔÁËÖÅ ÉÍÑ ÆÁÊÌÁ, ÎÁÐÒÉÍÅÒ (æáêì)îïäá.\n"
 
-#: info/infodoc.c:134 info/infodoc.c:136
+#: info/infodoc.c:129
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
-msgstr "              ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
+msgstr ""
+"\\%-10[search]  éÓËÁÔØ ÕËÁÚÁÎÎÕÀ ÓÔÒÏËÕ × ÔÅËÕÝÅÍ Info-ÆÁÊÌÅ É ÏÓÔÁÎÏ×ÉÔØÓÑ "
+"×\n"
+"              ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
 
-#: info/infodoc.c:135
-#, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  îÁÊÔÉ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ, É ÐÅÒÅÊÔÉ Ë\n"
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  éÓËÁÔØ ÕËÁÚÁÎÎÕÀ ÓÔÒÏËÕ × ÔÅËÕÝÅÍ Info-ÆÁÊÌÅ É ÏÓÔÁÎÏ×ÉÔØÓÑ "
+"×\n"
+"              ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "ôÅËÕÝÉÊ ÐÕÔØ ÐÏÉÓËÁ:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -755,7 +809,7 @@ msgstr ""
 "ëÏÍÁÎÄÙ, ÄÏÓÔÕÐÎÙÅ × ÏËÎÁÈ Info:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -763,7 +817,7 @@ msgstr ""
 "ëÏÍÁÎÄÙ, ÄÏÓÔÕÐÎÙÅ × ÜÈÏ-ÏÂÌÁÓÔÉ:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -772,7 +826,7 @@ msgstr ""
 "óÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ ÍÏÇÕÔ ÂÙÔØ ×ÙÚ×ÁÎÙ ÔÏÌØËÏ Ó ÐÏÍÏÝØÀ %s:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -780,84 +834,73 @@ msgstr ""
 "óÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ ×ÏÏÂÝÅ ÎÅ ÍÏÇÕÔ ÂÙÔØ ×ÙÚ×ÁÎÙ:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-"--- éÓÐÏÌØÚÕÊÔÅ `\\[history-node]' ÉÌÉ `\\[kill-node]' ÄÌÑ ×ÙÈÏÄÁ ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "ðÏËÁÚÁÔØ ÓÐÒÁ×ËÕ"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "ïÂÒÁÔÉÔØÓÑ Ë Info-ÎÏÄÅ `(info)Help'"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ëìá÷éûå"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "ïÐÉÓÁÔØ ËÌÁ×ÉÛÕ: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s ÎÅÏÐÒÅÄÅÌÅÎÏ."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s ÎÅÏÐÒÅÄÅÌÅÎÏ."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s ÐÒÉ×ÑÚÁÎÏ Ë %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "ðÏËÁÚÙ×ÁÅÔ, ÞÔÏ ÎÕÖÎÏ ÎÁÐÅÞÁÔÁÔØ, ÞÔÏÂÙ ×ÙÐÏÌÎÉÔØ ÄÁÎÎÕÀ ËÏÍÁÎÄÕ"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "ëÏÍÁÎÄÁ: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' ÎÅ ÐÒÉ×ÑÚÁÎÁ ÎÉ Ë ËÁËÉÍ ËÌÁ×ÉÛÁÍ"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s ÍÏÖÅÔ ÂÙÔØ ×ÙÚ×ÁÎÁ ÔÏÌØËÏ Ó ÐÏÍÏÝØÀ %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s ÍÏÖÅÔ ÂÙÔØ ×ÙÚ×ÁÎÁ Ó ÐÏÍÏÝØÀ %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "æÕÎËÃÉÉ Ó ÉÍÅÎÅÍ `%s' ÎÅÔ"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ.  ÷Ù ÍÏÖÅÔÅ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÜÔÉ ÐÒÏÇÒÁÍÍÙ, ÐÒÉ\n"
-"ÓÏÂÌÀÄÅÎÉÉ ÕÓÌÏ×ÉÊ õÎÉ×ÅÒÓÁÌØÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU.\n"
-"äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ Ï ×ÏÚÍÏÖÎÏÓÔÉ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÓÍÏÔÒÉÔÅ\n"
-"ÆÁÊÌ COPYING.\n"
+"÷ÙÂÏÒ ÄÒÕÇÏÊ ÎÏÄÙ:\n"
+"------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -968,22 +1011,22 @@ msgstr ""
 "  --help                       ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n"
 "  --version                    ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÆÁÊÌ infokey `%s' ÉÇÎÏÒÉÒÕÅÔÓÑ - ÓÌÉÛËÏÍ ÍÁÌÅÎØËÉÊ"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÆÁÊÌ infokey `%s' ÉÇÎÏÒÉÒÕÅÔÓÑ - ÓÌÉÛËÏÍ ÂÏÌØÛÏÊ"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ infokey `%s' - ÞÔÅÎÉÅ ÐÒÅÒ×ÁÎÏ"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -991,19 +1034,19 @@ msgstr ""
 "æÁÊÌ infokey `%s' ÎÅÐÒÉÅÍÌÅÍ (ÎÅ×ÅÒÎÁÑ ÓÉÇÎÁÔÕÒÁ) -- ÚÁÐÕÓÔÉÔÅ infokey, "
 "ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÅÇÏ"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr "æÁÊÌ infokey `%s' ÕÓÔÁÒÅÌ -- ÚÁÐÕÓÔÉÔÅ infokey, ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÅÇÏ"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -1011,48 +1054,48 @@ msgstr ""
 "æÁÊÌ infokey `%s' ÎÅÐÒÉÅÍÌÅÍ (ÎÅ×ÅÒÎÙÊ ËÏÄ ÒÁÚÄÅÌÁ) -- ÚÁÐÕÓÔÉÔÅ infokey, "
 "ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÅÇÏ"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 "ðÏ×ÒÅÖÄÅÎÎÙÅ ÄÁÎÎÙÅ × ÆÁÊÌÅ infokey -- ÎÅËÏÔÏÒÙÅ ÐÒÉ×ÑÚËÉ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "ðÏ×ÒÅÖÄÅÎÎÙÅ ÄÁÎÎÙÅ × ÆÁÊÌÅ infokey -- ÎÅËÏÔÏÒÙÅ ÕÓÔÁÎÏ×ËÉ ÐÅÒÅÍÅÎÎÙÈ "
 "ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ËÏÍÁÎÄÙ Info É ÐÏËÁÚÁÔØ ÅÅ ÏÐÉÓÁÎÉÅ"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "ïÐÉÓÁÔØ ËÏÍÁÎÄÕ: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ËÏÍÁÎÄÙ × ÜÈÏ-ÏÂÌÁÓÔÉ É ÉÓÐÏÌÎÉÔØ ÅÅ"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "úÄÅÓØ ÎÅÌØÚÑ ×ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ ÜÈÏ-ÏÂÌÁÓÔÉ."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, c-format
 msgid "Undefined command: %s"
 msgstr "îÅÏÐÒÅÄÅÌÅÎÎÁÑ ËÏÍÁÎÄÁ: %s"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "õÓÔÁÎÏ×ÉÔØ ×ÙÓÏÔÕ ÏÔÏÂÒÁÖÁÅÍÏÇÏ ÏËÎÁ"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "õÓÔÁÎÏ×ÉÔØ ×ÙÓÏÔÕ ÜËÒÁÎÁ ÒÁ×ÎÏÊ (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1061,12 +1104,12 @@ msgstr ""
 "   üÔÏÔ ÆÁÊÌ ×ËÌÀÞÁÅÔ:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÂÒÁÂÏÔÁÔØ ÆÁÊÌ %s.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1078,7 +1121,7 @@ msgstr ""
 "  (æÁÊÌ)îÏÄÁ                         óÔÒÏË  òÁÚÍÅÒ  æÁÊÌ\n"
 "  ----------                         -----  ------  ----"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1086,24 +1129,29 @@ msgstr ""
 "üÔÏ ÍÅÎÀ ÒÁÎÅÅ ÐÏÓÅÝÅÎÎÙÈ ×ÁÍÉ ÎÏÄ.\n"
 "÷ÙÂÅÒÉÔÅ ÏÄÎÕ ÉÚ ÍÅÎÀ ÉÌÉ ÉÓÐÏÌØÚÕÊÔÅ `\\[history-node]' × ÄÒÕÇÏÍ ÏËÎÅ.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "óÏÚÄÁÔØ ÏËÎÏ, ÓÏÄÅÒÖÁÝÅÅ ÍÅÎÀ ÐÏÓÅÝÅÎÎÙÈ ÒÁÎÅÅ ÎÏÄ"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "÷ÙÂÒÁÔØ ÒÁÎÅÅ ÐÏÓÅÝÅÎÎÕÀ ÎÏÄÕ × ×ÉÄÉÍÏÍ ÏËÎÅ"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "÷ÙÂÒÁÔØ ÐÏÓÅÝÅÎÎÕÀ ÒÁÎÅÅ ÎÏÄÕ: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "óÓÙÌËÁ ÉÓÞÅÚÌÁ! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1112,107 +1160,78 @@ msgstr ""
 "äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × Info ×ÅÒÓÉÉ %s. \\[get-help-window] -- ÓÐÒÁ×ËÁ, \\[menu-"
 "item] ×ÙÂÉÒÁÅÔ ÐÕÎËÔ ÍÅÎÀ."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÔÒÏËÕ ÎÉÖÅ"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÔÒÏËÕ ×ÙÛÅ"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "óÍÅÓÔÉÔØÓÑ × ËÏÎÅÃ ÓÔÒÏËÉ"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "óÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÓÔÒÏËÉ"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "óÌÅÄÕÀÝÁÑ"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"óÌÅÄÕÀÝÁÑ\"..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "÷ÙÂÉÒÁÅÔÓÑ ÐÅÒ×ÙÊ ÐÕÎËÔ ÍÅÎÀ..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "÷ÙÂÉÒÁÅÔÓÑ ÎÏÄÁ \"óÌÅÄÕÀÝÁÑ\"..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "ðÅÒÅÍÅÝÅÎÉÅ \"÷×ÅÒÈ\" %d ÒÁÚ(Á), ÚÁÔÅÍ \"óÌÅÄÕÀÝÁÑ\"."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÂÏÌØÛÅ ÎÅÔ ÎÏÄ."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "äÌÑ ÜÔÏÊ ÎÏÄÙ ÎÅÔ ÓÓÙÌËÉ `ðÒÅÄÙÄÕÝÁÑ'."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"ðÒÅÄÙÄÕÝÁÑ\" × ÜÔÏÍ ÏËÎÅ."
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÎÅÔ ÓÓÙÌËÉ `ðÒÅÄÙÄÕÝÁÑ' ÉÌÉ `÷×ÅÒÈ' ÄÌÑ ÜÔÏÊ ÎÏÄÙ."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"÷×ÅÒÈ\" × ÜÔÏÍ ÏËÎÅ."
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "ðÅÒÅÈÏÄ ÎÁ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ ÎÏÄÙ `ðÒÅÄÙÄÕÝÁÑ'."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "ðÒÏÄ×ÉÇÁÔØÓÑ ×ÐÅÒÅÄ ÉÌÉ ×ÎÉÚ ÐÏ ÓÔÒÕËÔÕÒÅ ÎÏÄ"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "ðÒÏÄ×ÉÇÁÔØÓÑ ÎÁÚÁÄ ÉÌÉ ××ÅÒÈ ÐÏ ÓÔÒÕËÔÕÒÅ ÎÏÄ"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "ðÒÏËÒÕÔÉÔØ ×ÐÅÒÅÄ ÔÅËÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ×ÐÅÒÅÄ É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr "ðÒÏËÒÕÔÉÔØ ×ÐÅÒÅÄ ÔÅËÕÝÅÅ ÏËÎÏ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ×ÐÅÒÅÄ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ, É ÕÓÔÁÎÏ×ÉÔØ "
 "ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁÚÁÄ ÔÅËÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ÎÁÚÁÄ É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁÚÁÄ ÔÅËÕÝÅÅ ÏËÎÏ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1220,398 +1239,431 @@ msgstr ""
 "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ÎÁÚÁÄ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ, É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ "
 "ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÎÏÄÙ"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÎÏÄÙ"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÎÅÓËÏÌØËÏ ÓÔÒÏË ×ÎÉÚ"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÎÅÓËÏÌØËÏ ÓÔÒÏË ××ÅÒÈ"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÐÏÌÜËÒÁÎÁ ×ÎÉÚ"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÐÏÌÜËÒÁÎÁ ××ÅÒÈ"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "÷ÙÂÒÁÔØ ÓÌÅÄÕÀÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "÷ÙÂÒÁÔØ ÐÒÅÄÙÄÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "òÁÚÂÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "õÄÁÌÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÔÏÑÎÎÏÅ ÏËÎÏ"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "õÄÁÌÉÔØ ×ÓÅ ÏÓÔÁÌØÎÙÅ ÏËÎÁ"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "ðÒÏËÒÕÔÉÔØ ÄÒÕÇÏÅ ÏËÎÏ"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "ðÒÏËÒÕÔÉÔØ ÄÒÕÇÏÅ ÏËÎÏ ÎÁÚÁÄ"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "õ×ÅÌÉÞÉÔØ (ÉÌÉ ÕÍÅÎØÛÉÔØ) ÔÅËÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "òÁÚÄÅÌÉÔØ ÄÏÓÔÕÐÎÏÅ ÍÅÓÔÏ ÎÁ ÜËÒÁÎÅ ÍÅÖÄÕ ×ÉÄÉÍÙÍÉ ÏËÎÁÍÉ"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "ðÅÒÅËÌÀÞÉÔØ ÒÅÖÉÍ ÒÁÚÂÉ×ÁÎÉÑ ÓÔÒÏË × ÔÅËÕÝÅÍ ÏËÎÅ"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "ðÅÒÅÊÔÉ ÎÁ `óÌÅÄÕÀÝÕÀ' ÎÏÄÕ"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "ðÅÒÅÊÔÉ ÎÁ `ðÒÅÄÙÄÕÝÕÀ' ÎÏÄÕ"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "ðÅÒÅÊÔÉ ÎÁ `÷ÅÒÈÎÀÀ' ÎÏÄÕ"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ × ÆÁÊÌÅ"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "üÔÏ ÏËÎÏ ÎÅ ÉÍÅÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÎÏÄ"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÅÒ×ÕÀ ÎÏÄÕ × ÆÁÊÌÅ"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "÷ÙÂÒÁÔØ ÚÁÄÁÎÎÙÊ ÐÕÎËÔ ÍÅÎÀ"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "÷ ÜÔÏÍ ÍÅÎÀ ÎÅÔ %d ÐÕÎËÔÏ×."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "ðÕÎËÔ ÍÅÎÀ (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "ðÕÎËÔ ÍÅÎÀ: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ÐÕÎËÔÁ ÍÅÎÀ É ÐÅÒÅÊÔÉ Ë ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ÎÏÄÅ"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ÓÓÙÌËÉ ÉÌÉ ÓÎÏÓËÉ É ÐÅÒÅÊÔÉ Ë ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ÎÏÄÅ"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "óÍÅÓÔÉÔØÓÑ Ë ÎÁÞÁÌÕ ÍÅÎÀ ÔÅËÕÝÅÊ ÎÏÄÙ"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "ðÒÏÓÍÏÔÒÅÔØ ÏÄÎÏ×ÒÅÍÅÎÎÏ ËÁË ÍÏÖÎÏ ÂÏÌØÛÅ ÎÏÄ"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ÎÏÄÙ É ÐÅÒÅÊÔÉ Ë ÎÅÊ"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "ðÅÒÅÊÔÉ Ë ÎÏÄÅ: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "÷ ÎÏÄÅ `%s' ÎÅÔ ÍÅÎÀ."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "ðÕÎËÔ ÍÅÎÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ × ÎÏÄÅ `%s'."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ ÐÏ ÓÓÙÌËÅ `%s' × `%s'."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "óÞÉÔÁÔØ ÓÐÉÓÏË ÍÅÎÀ, ÎÁÞÉÎÁÀÝÉÊÓÑ Ó dir É ÐÒÏÓÌÅÄÏ×ÁÔØ ÐÏ ÎÉÍ"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "ðÒÏÓÌÅÄÏ×ÁÔØ ÐÏ ÍÅÎÀ: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "îÁÈÏÄÉÔ ÎÏÄÕ, ÒÁÓÓËÁÚÙ×ÁÀÝÕÀ, ËÁË ×ÙÚÙ×ÁÔØ ÐÒÏÇÒÁÍÍÕ"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "îÁÊÔÉ ÎÏÄÕ Invocation ÄÌÑ [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "óÞÉÔÁÔØ ÉÍÑ manpage É ÐÅÒÅÊÔÉ Ë ÎÅÊ"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "ðÒÏÓÍÏÔÒÅÔØ manpage: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "ðÅÒÅÊÔÉ ÎÁ `ðÅÒ×ÕÀ' ÎÏÄÕ"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "ðÅÒÅÊÔÉ ÎÁ ÎÏÄÕ `(dir)'"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "õÄÁÌÉÔØ ÎÏÄÕ (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÎÏÄÕ `%s'"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "ðÅÒÅÊÔÉ Ë ÐÏÓÌÅÄÎÅÊ ×ÙÂÒÁÎÎÏÊ ÎÏÄÅ"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "õÄÁÌÉÔØ ÔÅËÕÝÕÀ ÎÏÄÕ"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ÆÁÊÌÁ É ÐÅÒÅÊÔÉ Ë ÎÅÍÕ"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "ïÂÒÁÔÉÔØÓÑ Ë ÆÁÊÌÕ: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ `%s'."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "úÁ×ÅÒÛÅÎÏ."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "úÁÐÉÓØ ÎÏÄÙ %s..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "îÁÐÒÁ×ÉÔØ ÓÏÄÅÒÖÉÍÏÅ ÜÔÏÊ ÎÏÄÙ ÎÁ ×ÈÏÄ ËÏÍÁÎÄÙ INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ËÁÎÁÌ Ë `%s'."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "ðÅÞÁÔØ ÎÏÄÙ %s..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "õÎÉÞÔÏÖÉÔØ ÔÅËÓÔ ÄÏ ÎÁÞÁÌÁ ÓÔÒÏËÉ"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "ðÏÉÓË ÆÁÊÌÁ %s ..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÒÅÇÉÓÔÒÏÚÁ×ÉÓÉÍÙÊ ÐÏÉÓË"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÐÏÉÓË"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÐÏÉÓË × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "%s%s ÓÔÒÏËÉ [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr " c ÕÞÅÔÏÍ ÒÅÇÉÓÔÒÁ "
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "ïÂÒÁÔÎÙÊ ÐÏÉÓË"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "ðÏÉÓË"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " c ÕÞÅÔÏÍ ÒÅÇÉÓÔÒÁ "
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "îÅ ÎÁÊÄÅÎÏ"
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "ðÏ×ÔÏÒÉÔØ ÐÏÓÌÅÄÎÉÊ ÐÏÉÓË × ÔÏÍ ÖÅ ÎÁÐÒÁ×ÌÅÎÉÉ"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "îÅÔ ÓÔÒÏËÉ ÐÒÅÄÙÄÕÝÅÇÏ ÐÏÉÓËÁ"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "ðÏ×ÔÏÒÉÔØ ÐÏÓÌÅÄÎÉÊ ÐÏÉÓË × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "úÁÐÕÓÔÉÔØ ÉÎÔÅÒÁËÔÉ×ÎÙÊ ÎÁÒÁÝÉ×ÁÅÍÙÊ ÐÏÉÓË"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÏÂÒÁÔÎÙÊ ÐÏÉÓË: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÏÂÒÁÔÎÙÊ ÐÏÉÓË: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÐÏÉÓË: "
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÐÏÉÓË: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "îÅ ÎÁÊÄÅÎÏ "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "óÍÅÓÔÉÔØÓÑ Ë ÐÒÅÄÙÄÕÝÅÊ ÓÓÙÌËÅ"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "óÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÓÓÙÌËÅ"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "÷ÙÂÒÁÔØ ÓÓÙÌËÕ ÉÌÉ ÐÕÎËÔ ÍÅÎÀ, ÎÁÈÏÄÑÝÉÊÓÑ ÎÁ ÄÁÎÎÏÊ ÓÔÒÏËÅ"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "ïÔÍÅÎÉÔØ ×ÙÐÏÌÎÅÎÉÅ ÔÅËÕÝÅÊ ËÏÍÁÎÄÙ"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "÷ÙÈÏÄ"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÕÒÓÏÒ Ë ÚÁÄÁÎÎÏÊ ÓÔÒÏËÅ ÏËÎÁ"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "ðÅÒÅÒÉÓÏ×ÁÔØ ÜËÒÁÎ"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "÷ÙÊÔÉ ÉÚ Info"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr "úÁÐÕÓÔÉÔØ ËÏÍÁÎÄÕ, ÐÒÉ×ÑÚÁÎÎÕÀ Ë ÜÔÏÊ ËÌÁ×ÉÛÅ × ÎÉÖÎÅÍ ÒÅÇÉÓÔÒÅ"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" ÎÅ×ÅÒÎÁÑ ËÏÍÁÎÄÁ"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, c-format
 msgid "`%s' is invalid"
 msgstr "`%s' ÎÅ×ÅÒÎÏ"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "äÏÂÁ×ÌÑÅÔ ÃÉÆÒÕ Ë ÔÅËÕÝÅÍÕ ÞÉÓÌÏ×ÏÍÕ ÁÒÇÕÍÅÎÔÕ"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "îÁÞÁÔØ (ÉÌÉ ÕÍÎÏÖÉÔØ ÎÁ 4) ÔÅËÕÝÉÊ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÆÕÎËÃÉÅÊ \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: ÷ÉÒÔÕÁÌØÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ!\n"
@@ -1646,195 +1698,366 @@ msgstr "åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎÏ (\"On\"), ×ÙÄÅÌÑÔØ ÐÒÉ ÐÏÉÓËÅ ÓÏ×ÐÁ×ÛÕÀ ÓÔÒÏËÕ"
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "ïÐÒÅÄÅÌÑÅÔ ÐÏ×ÅÄÅÎÉÅ ÐÒÏËÒÕÔËÉ × ËÏÎÃÅ ÎÏÄÙ"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "þÉÓÌÏ ÐÒÏËÒÕÞÉ×ÁÅÍÙÈ ÓÔÒÏË, ËÏÇÄÁ ËÕÒÓÏÒ ÐÅÒÅÍÅÝÁÅÔÓÑ ÚÁ ÐÒÅÄÅÌÙ ÏËÎÁ"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎÏ (\"On\"), Info ÏÔÏÂÒÁÖÁÅÔ ÓÉÍ×ÏÌÙ ISO Latin"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "ïÐÒÅÄÅÌÑÅÔ ÐÏ×ÅÄÅÎÉÅ ÐÒÏËÒÕÔËÉ × ËÏÎÃÅ ÎÏÄÙ"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "ïÐÉÓÁÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÐÅÒÅÍÅÎÎÏÊ"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "ïÐÉÓÁÔØ ÐÅÒÅÍÅÎÎÕÀ: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "õÓÔÁÎÏ×ÉÔØ ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "õÓÔÁÎÏ×ÉÔØ ÐÅÒÅÍÅÎÎÕÀ: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "õÓÔÁÎÏ×ÉÔØ ÚÎÁÞÅÎÉÅ %s ÒÁ×ÎÙÍ (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "õÓÔÁÎÏ×ÉÔØ ÚÎÁÞÅÎÉÅ %s ÒÁ×ÎÙÍ (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** ôÅÇÉ ÕÓÔÁÒÅÌÉ ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), ÓÔÒÏË ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, ÓÔÒÏË: %d --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, ÓÔÒÏË: %d --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " æÁÊÌ: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
+msgid "%s: warning: "
+msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+msgid " for %s"
+msgstr " ÄÌÑ %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\túÁÐÕÓÔÉÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÌÎÏÇÏ ÓÐÉÓËÁ ËÌÀÞÅÊ.\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... TEXINFO-æáêì...\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ bug-texinfo@gnu.org,\n"
+"ÏÂÝÅÅ ÏÂÓÕÖÄÅÎÉÅ É ×ÏÐÒÏÓÙ ÎÁÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ help-texinfo@gnu.org.\n"
+"äÏÍÁÛÎÁÑ ÓÔÒÁÎÉÃÁ Texinfo: http://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"üÔÏ ÆÁÊÌ .../info/dir, ÓÏÄÅÒÖÁÝÉÊ ËÏÒÎÅ×ÕÀ ÎÏÄÕ ÉÅÒÁÒÈÉÉ Info,\n"
+"ÎÁÚÙ×ÁÅÍÕÀ (dir)Top.  ðÒÉ ×ÙÚÏ×Å Info ×Ù ×ÉÄÉÔÅ ÜÔÕ ÎÏÄÕ.\n"
+"\n"
+"%s\tüÔÏ ËÏÒÎÅ×ÁÑ ÎÏÄÁ ÉÅÒÁÒÈÉÉ Info\n"
+"\n"
+"  úÄÅÓØ (× ËÁÔÁÌÏÇÅ Info) ÐÒÅÄÓÔÁ×ÌÅÎÏ ÍÅÎÀ ÐÏ ÏÓÎÏ×ÎÙÍ ÔÅÍÁÍ.\n"
+"  îÁÖÍÉÔÅ \"q\" ÞÔÏÂÙ ×ÙÊÔÉ, \"?\" ÞÔÏÂÙ ÐÏÓÍÏÔÒÅÔØ ×ÓÅ ËÏÍÁÎÄÙ Info,\n"
+"  \"d\" ÞÔÏÂÙ ×ÅÒÎÕÔØÓÑ ÓÀÄÁ, \"h\" ÞÔÏÂÙ ÐÒÏÞÉÔÁÔØ ÒÕËÏ×ÏÄÓÔ×Ï ÄÌÑ "
+"ÎÏ×ÉÞËÏ×,\n"
+"  \"mEmacs<Return>\" ÞÔÏÂÙ ÐÒÏÞÉÔÁÔØ ÒÕËÏ×ÏÄÓÔ×Ï ÐÏ Emacs.\n"
+"\n"
+"  ÷ Emacs ×Ù ÍÏÖÅÔÅ ÎÁÖÁÔØ ×ÔÏÒÕÀ ËÎÏÐËÕ ÍÙÛÉ ÎÁ ÐÕÎËÔÅ ÍÅÎÀ ÉÌÉ ÓÓÙÌËÅ,\n"
+"  ÞÔÏÂÙ ÐÅÒÅÊÔÉ Ë ÎÅÍÕ.\n"
+"\n"
+"%s\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ (%s) É ÓÏÚÄÁÔØ (%s)\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
+msgid "%s: empty file"
+msgstr "%s: ÐÕÓÔÏÊ ÆÁÊÌ"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ END-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ START-INFO-DIR-ENTRY"
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ ÆÁÊÌ dir: %s\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ Info-ÆÁÊÌ.\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+msgid "excess command line argument `%s'"
+msgstr "ÉÚÌÉÛÎÉÊ ÁÒÇÕÍÅÎÔ `%s'"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ""
+"îÅ ÚÁÄÁÎ ×ÈÏÄÎÏÊ ÆÁÊÌ.\n"
+"ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+"îÅ ÚÁÄÁÎ ÆÁÊÌ ËÁÔÁÌÏÇÁ.\n"
+"ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ."
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "× `%s' ÎÅÔ ×ÈÏÖÄÅÎÉÑ ÄÌÑ ËÁÔÁÌÏÇÁ Info"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ ÄÌÑ `%s'; ÎÉÞÅÇÏ ÎÅ ÕÄÁÌÅÎÏ"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ @%s ÉÇÎÏÒÉÒÏ×ÁÎÙ"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "ÑÎ×ÁÒÑ"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "ÆÅ×ÒÁÌÑ"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "ÍÁÒÔÁ"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "ÁÐÒÅÌÑ"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "ÍÁÑ"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "ÉÀÎÑ"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "ÉÀÌÑ"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "Á×ÇÕÓÔÁ"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "ÓÅÎÔÑÂÒÑ"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "ÏËÔÑÂÒÑ"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "ÎÏÑÂÒÑ"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "ÄÅËÁÂÒÑ"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "ÍÁÌÏ×ÅÒÏÑÔÎÙÊ ÚÎÁË %c × @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "×ÅÓØ ÁÒÇÕÍÅÎÔ @sc ÎÁÂÒÁÎ ÚÁÇÌÁ×ÎÙÍÉ ÂÕË×ÁÍÉ, ÒÅÚÕÌØÔÁÔÁ ÎÅ ÂÕÄÅÔ"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "ÏÖÉÄÁÌÏÓØ `{', ×ÓÔÒÅÞÅÎÏ `%c'"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "ËÏÎÅà ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÎÅÏËÏÎÞÅÎÎÏÇÏ ÂÌÏËÁ"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "ÏÖÉÄÁÌÏÓØ `}', ×ÓÔÒÅÞÅÎÏ `%c'"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1842,330 +2065,314 @@ msgstr ""
 "@strong{Note...} ÓÏÚÄÁÅÔ × Info ÌÏÖÎÕÀ ÐÅÒÅËÒÅÓÔÎÕÀ ÓÓÙÌËÕ; ÐÅÒÅÆÒÁÚÉÒÕÊÔÅ "
 "ÔÅËÓÔ, ÞÔÏÂÙ ÉÚÂÅÖÁÔØ ÜÔÏÇÏ"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "ëÏÍÁÎÄÁ %c%s ÕÓÔÁÒÅÌÁ É ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "ËÏÍÁÎÄÅ @sp ÎÕÖÎÏ ÕËÁÚÁÔØ ÐÏÌÏÖÉÔÅÌØÎÙÊ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ, Á ÎÅ `%s'"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s"
 
 # ???
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr "insert"
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "÷ ÁÒÇÕÍÅÎÔÅ @def ÐÒÏÐÕÝÅÎÁ `}'"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "æÕÎËÃÉÑ"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "íÁËÒÏ"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "óÐÅÃÉÁÌØÎÁÑ ÆÏÒÍÁ"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "ðÅÒÅÍÅÎÎÁÑ"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "ðÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÐÁÒÁÍÅÔÒ"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "ðÅÒÅÍÅÎÎÁÑ ÜËÚÅÍÐÌÑÒÁ"
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "íÅÔÏÄ"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "ÉÚ"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "ÎÁÄ"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "÷ ÁÒÇÕÍÅÎÔÅ @def ÐÒÏÐÕÝÅÎÁ `}'"
 
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "îÕÖÎÏ ÂÙÔØ × ÂÌÏËÅ `@%s', ÞÔÏÂÙ ÉÓÐÏÌØÚÏ×ÁÔØ `@%s'"
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr "ÐÅÒÅÄ ÉÍÅÎÅÍ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ ÏÐÕÝÅÎÏ `%s'"
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr "`%s' ÏÐÕÝÅÎÏ, ÐÏÓËÏÌØËÕ ÐÅÞÁÔØ ÉÄÅÔ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr "÷ÙÈÏÄÎÏÊ ÂÕÆÅÒ ÎÅ ÐÕÓÔ."
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "óÍÏÔÒÉÔÅ "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "`%c%s' ÔÒÅÂÕÅÔ ÁÒÇÕÍÅÎÔ `{...}', Á ÎÅ ÐÒÏÓÔÏ `%s'"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "äÌÑ ÓÎÏÓËÉ `%s' ÎÅÔ ÚÁËÒÙ×ÁÀÝÅÊ ÆÉÇÕÒÎÏÊ ÓËÏÂËÉ"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "óÎÏÓËÁ ÏÐÒÅÄÅÌÅÎÁ ÂÅÚ ÒÏÄÉÔÅÌØÓËÏÊ ÎÏÄÙ"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "óÎÏÓËÉ ÉÚ ÓÎÏÓÏË ÚÁÐÒÅÝÅÎÙ"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "óÎÏÓËÉ"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ css-ÆÁÊÌ: %s"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: css-ÆÁÊÌ ÏÂÒÙ×ÁÅÔÓÑ × ËÏÍÍÅÎÔÁÒÉÉ"
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "âÅÚ ÚÁÇÏÌÏ×ËÁ"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] × ÓÔÅËÅ html-ÔÅÇÏ× ÎÅÔ ÜÌÅÍÅÎÔÁ ÄÌÑ ×ÙÔÁÌËÉ×ÁÎÉÑ"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] ÎÅ×ÅÒÎÏÅ ÉÍÑ ÎÏÄÙ: `%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÎÅÉÚ×ÅÓÔÅÎ"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 "Info ÎÅ ÍÏÖÅÔ ÏÂÒÁÂÏÔÁÔØ ÚÎÁË `:' ×Ï ×ÈÏÖÄÅÎÉÉ ÁÌÆÁ×ÉÔÎÏÇÏ ÕËÁÚÁÔÅÌÑ `%s'"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "îÅÉÚ×ÅÓÔÅÎ ÉÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' É/ÉÌÉ `%s' × @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr "(ÓÔÒÏËÁ )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr "(ÓÔÒÏËÁ %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "îÅÉÚ×ÅÓÔÅÎ ÉÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' × @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "÷ÈÏÖÄÅÎÉÅ ÄÌÑ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ `%s' ×ÎÅ ÎÏÄÙ"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(×ÎÅ ËÁËÏÊ-ÌÉÂÏ ÎÏÄÙ)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "óÍÏÔÒÉÔÅ "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr "ÎÅÌØÚÑ ÚÁÄÁ×ÁÔØ @item × ÁÒÇÕÍÅÎÔÅ ÄÌÑ @itemize"
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Broken-Type × insertion_type_pname"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÓÔÅËÁ ÐÅÒÅÞÉÓÌÅÎÉÑ"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "ÚÁËÏÎÞÉÌÓÑ ÁÌÆÁ×ÉÔ, ×ÏÚ×ÒÁÔ ÎÁ %c"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s ÄÏÌÖÎÁ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ: ÆÏÒÍÁÔÏÍ ÄÌÑ %citem"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr "ÂÌÏËÉ %cfloat ÎÅÌØÚÑ ×ËÌÁÄÙ×ÁÔØ ÄÒÕÇ × ÄÒÕÇÁ"
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "ÏÖÉÄÁÌÏÓØ `@end' Ó `%s', ×ÓÔÒÅÞÅÎÏ `%s'"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "îÅÔ ÐÁÒÎÏÊ `%cend %s'"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s ÔÒÅÂÕÅÔ ÂÕË×Ù ÉÌÉ ÃÉÆÒÙ"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "ËÏÎÅà ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÎÅÏËÏÎÞÅÎÎÏÇÏ ÂÌÏËÁ"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ `@float'"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "×ÅÒÏÑÔÎÏ, ×ÁÛÁ ÎÏÄÁ @top ÄÏÌÖÎÁ ÂÙÔØ × ÂÌÏËÅ @ifnottex, Á ÎÅ × @ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ `@titlepage' ÉÌÉ `@quotation'"
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ `@titlepage'"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "îÅÐÁÒÎÁÑ `%c%s'"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "ðÏÓÌÅ `%c%s' ÄÏÌÖÎÏ ÞÔÏ-ÔÏ ÉÄÔÉ"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ `%s' ÄÌÑ `@%s', ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ `%s'"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ `@%s'"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ `%s'"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s ×ÓÔÒÅÞÅÎÁ ×ÎÅ ÂÌÏËÁ ×ÓÔÁ×ËÉ"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ËÏÄÏÍ ÑÚÙËÁ ÉÚ ISO 639"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "ÉÍÑ ËÏÄÉÒÏ×ËÉ `%s' ÎÅ ÒÁÓÐÏÚÎÁÎÏ"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "ÉÚ×ÉÎÉÔÅ, ËÏÄÉÒÏ×ËÁ `%s' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏ ÚÁËÏÄÉÒÏ×ÁÎÎÙÊ ÚÎÁË `%s'"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ `i' ÉÌÉ `j', Á ÎÅ `%c'"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ ÏÄÉÎ ÓÉÍ×ÏÌ `i' ÉÌÉ `j'"
@@ -2180,7 +2387,7 @@ msgstr "ÍÁËÒÏ `%s' ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ ÒÁÎØÛÅ"
 msgid "here is the previous definition of `%s'"
 msgstr "ÍÅÓÔÏ ÐÒÅÄÙÄÕÝÅÇÏ ÏÐÒÅÄÅÌÅÎÉÑ `%s'"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "ÐÏÓÌÅ \\ × ÒÁÓËÒÙÔÉÉ ÍÁËÒÏ ÓÔÏÉÔ `%s', Á ÎÅ ÉÍÑ ÐÁÒÁÍÅÔÒÁ"
@@ -2190,46 +2397,50 @@ msgstr "ÐÏÓÌÅ \\ × ÒÁÓËÒÙÔÉÉ ÍÁËÒÏ ÓÔÏÉÔ `%s', Á ÎÅ ÉÍÑ ÐÁÒÁÍÅÔÒÁ"
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "íÁËÒÏ `%s' ×ÙÚ×ÁÎÏ ÎÁ ÓÔÒÏËÅ %d Ó ÉÚÌÉÛÎÉÍÉ ÁÒÇÕÍÅÎÔÁÍÉ"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "ÎÅ ×ÓÔÒÅÞÅÎÏ %cend macro"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg ÐÏÌÅÚÎÁ, ÔÏÌØËÏ ÅÓÌÉ ÍÁËÒÏ ÐÒÉÎÉÍÁÅÔ ÏÄÉÎ ÁÒÇÕÍÅÎÔ"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "ÎÅÐÁÒÎÙÅ @end %s É @%s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË! ïÓÔÁÎÏ×ËÁ.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "úÄÅÓØ ÎÅ ÄÏÌÖÎÏ ÂÙÔØ %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... TEXINFO-æáêì...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2238,17 +2449,17 @@ msgstr ""
 "ÕÍÏÌÞÁÎÉÀ × Info-ÆÁÊÌÙ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÞÉÔÁÔØ Ó ÐÏÍÏÝØÀ Emacs ÉÌÉ\n"
 "ÏÔÄÅÌØÎÏÊ ÐÒÏÇÒÁÍÍÙ GNU Info.\n"
 
-#: makeinfo/makeinfo.c:350
-#, c-format
+#: makeinfo/makeinfo.c:354
+#, fuzzy, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
@@ -2266,14 +2477,14 @@ msgstr ""
 "  -v, --verbose                 ÐÏÑÓÎÑÔØ ÄÅÊÓÔ×ÉÑ.\n"
 "      --version                 ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n"
 
-#: makeinfo/makeinfo.c:364
-#, no-wrap
+#: makeinfo/makeinfo.c:369
+#, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 "÷ÙÂÏÒ ×ÙÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ (ÐÏ ÕÍÏÌÞÁÎÉÀ ×Ù×ÏÄÉÔÓÑ Info):\n"
 "      --docbook             ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ DocBook XML, Á ÎÅ Info.\n"
@@ -2281,20 +2492,24 @@ msgstr ""
 "      --xml                 ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ Texinfo XML, Á ÎÅ × Info.\n"
 "      --plaintext           ×Ù×ÏÄÉÔØ ÐÒÏÓÔÏÊ ÔÅËÓÔ, Á ÎÅ Info.\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
+#, fuzzy
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 "ïÂÝÉÅ ËÌÀÞÉ, ÕÐÒÁ×ÌÑÀÝÉÅ ×Ù×ÏÄÏÍ:\n"
 " -E, --macro-expand æáêì   ×Ù×ÅÓÔÉ × æáêì ÐÅÒ×ÏÎÁÞÁÌØÎÙÊ Texinfo-ÆÁÊÌ Ó\n"
@@ -2312,18 +2527,21 @@ msgstr ""
 " -o, --output=æáêì         ×Ù×ÏÄÉÔØ × ÕËÁÚÁÎÎÙÊ æáêì (ËÁÔÁÌÏÇ ÄÌÑ HTML Ó \n"
 "                           ÒÁÚÂÉÅÎÉÅÍ).\n"
 
-#: makeinfo/makeinfo.c:386
-#, c-format
+#: makeinfo/makeinfo.c:391
+#, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2350,24 +2568,28 @@ msgstr ""
 "      --split-size=òáúíåò     ÒÁÚÂÉ×ÁÔØ ÎÁ ÆÁÊÌÙ ÚÁÄÁÎÎÏÇÏ òáúíåòá (ÐÏ\n"
 "                                ÕÍÏÌÞÁÎÉÀ %d).\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
+#, fuzzy
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 "ëÌÀÞÉ ÄÌÑ HTML:\n"
 "      --css-include=æáêì        ×ËÌÀÞÉÔØ æáêì × ÔÅÇ <style> × ×Ù×ÏÄÅ HTML;\n"
 "                                ÞÉÔÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ, ÅÓÌÉ æáêì ÚÁÄÁÎ ËÁË "
 "-.\n"
 
-#: makeinfo/makeinfo.c:409
-#, c-format
+#: makeinfo/makeinfo.c:418
+#, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 "ëÌÀÞÉ ÄÌÑ XML É Docbook:\n"
@@ -2377,7 +2599,7 @@ msgstr ""
 "                                åÓÌÉ þéóìï ÒÁ×ÎÏ ÎÕÌÀ, ÎÅÚÎÁÞÁÝÉÅ ÐÒÏÂÅÌÙ "
 "ÏÐÕÓËÁÀÔÓÑ.\n"
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2398,7 +2620,7 @@ msgstr ""
 " -U ðåòåíåîîáñ           ÓÄÅÌÁÔØ ðåòåíåîîõà ÎÅÏÐÒÅÄÅÌÅÎÎÏÊ, ÁÎÁÌÏÇÉÞÎÏ\n"
 "                           ÉÓÐÏÌØÚÏ×ÁÎÉÀ @clear.\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2435,7 +2657,7 @@ msgstr ""
 "\n"
 "  ëÒÏÍÅ ÔÏÇÏ, ÄÌÑ ËÌÀÞÅÊ --no-ifæïòíáô, ÏÂÒÁÂÁÔÙ×ÁÔØ ÂÌÏËÉ @ifnotæïòíáô.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2449,19 +2671,21 @@ msgstr ""
 "  ÐÒÉ ×Ù×ÏÄÅ ÐÒÏÓÔÏÇÏ ÔÅËÓÔÁ ×ËÌÀÞÅÎ --ifplaintext, ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ;\n"
 "  ÐÒÉ ×Ù×ÏÄÅ XML ×ËÌÀÞÅÎ --ifxml, ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ.\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
+#, fuzzy
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "ðÒÉÍÅÒÙ:\n"
 "  makeinfo foo.texi                    ÚÁÐÉÓÁÔØ Info × @setfilename ÉÚ foo\n"
@@ -2477,83 +2701,78 @@ msgstr ""
 "ÒÁÚÄÅÌÁÍÉ\n"
 "  makeinfo --no-split foo.texi         ÚÁÐÉÓÁÔØ ÏÄÉÎ ÂÏÌØÛÏÊ Info-ÆÁÊÌ\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÏÅ ÚÎÁÞÅÎÉÅ TEXINFO_OUTPUT_FORMAT `%s' ÉÇÎÏÒÉÒÏ×ÁÎÏ.\n"
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÎÅ `%s'.\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s'"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s: ×ÔÏÒÏÊ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s' ÉÇÎÏÒÉÒÏ×ÁÎ.\n"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: ÁÒÇÕÍÅÎÔ --paragraph-indent ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÉÌÉ\n"
 "`none', ÉÌÉ `asis'; ÎÅ `%s'.\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: ÁÒÇÕÍÅÎÔ --footnote-style ÄÏÌÖÅÎ ÂÙÔØ `separate' ÉÌÉ `end'; Á ÎÅ `%s'.\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ, ÚÁÄÁÀÝÉÊ ÆÁÊÌ.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "îÅÐÒÁ×ÉÌØÎÏ ÉÓÐÏÌØÚÏ×ÁÎÁ ÍÎÏÇÏÓÔÒÏÞÎÁÑ ËÏÍÁÎÄÁ %c%s"
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "ïÖÉÄÁÅÔÓÑ `%s'"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ `%s': %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%s' ÎÅ ÎÁÊÄÅÎ × `%s'"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: òÁÓËÒÙÔÉÅ ÍÁËÒÏÓÏ× × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ ÎÅ ÐÒÏÉÚ×ÏÄÉÔÓÑ,\n"
 "ÔÁË ËÁË ÔÕÄÁ ÎÁÐÒÁ×ÌÅÎ ×Ù×ÏÄ × ÆÏÒÍÁÔÅ Info.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "óÏÚÄÁÎÉÅ %s-ÆÁÊÌÁ `%s' ÉÚ `%s'.\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "üÔÏ %s, ÓÏÚÄÁÎÎÙÊ makeinfo ×ÅÒÓÉÉ %s ÉÚ %s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2561,82 +2780,82 @@ msgstr ""
 "%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÊ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n"
 "ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n"
 "ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ `%s'"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 "éÓÐÏÌØÚÕÊÔÅ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ, ÞÔÏÂÙ ÐÅÒÅÄÁÔØ @%s ËÏÍÁÎÄÕ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s ÐÏÄÒÁÚÕÍÅ×ÁÅÔ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "îÅÐÁÒÎÁÑ }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "âåú_éíåîé!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s ÐÒÏÐÕÝÅÎÁ ÚÁËÒÙ×ÁÀÝÁÑ ÓËÏÂËÁ"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ HTML): %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, c-format
 msgid "No such file `%s'"
 msgstr "æÁÊÌ `%s' ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ ÔÅËÓÔÁ): %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "ÐÏÓÌÅ @image ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ ÚÁÄÁÀÝÉÊ ÆÁÊÌ "
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr "ÎÅÏÐÒÅÄÅÌÅÎÎÙÊ ÆÌÁÇ: %s"
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{úÎÁÞÅÎÉÅ `%s' ÎÅ ÚÁÄÁÎÏ}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "ËÏÍÁÎÄÅ %c%s ÎÕÖÎÏ ÕËÁÚÁÔØ ÉÍÑ"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "ëÏÎÅà ÆÁÊÌÁ ÒÁÎØÛÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ËÏÍÁÎÄÙ @end %s"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' ÓÌÉÛËÏÍ ×ÅÌÉËÏ; ÎÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ"
@@ -2645,167 +2864,134 @@ msgstr "`%.40s...' ÓÌÉÛËÏÍ ×ÅÌÉËÏ; ÎÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ"
 msgid "Missing } in @multitable template"
 msgstr "÷ ÛÁÂÌÏÎÅ @multitable ÐÒÏÐÕÝÅÎÁ `}'"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ÔÅËÓÔ `%s' ÐÏÓÌÅ @multitable ÉÇÎÏÒÉÒÏ×ÁÎ"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ËÏÌÏÎÏË × ÜÌÅÍÅÎÔÅ ÔÁÂÌÉÃÙ (ÍÁËÓÉÍÕÍ %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] ÎÅ×ÏÚÍÏÖÎÏ ×ÙÂÒÁÔØ ËÏÌÏÎËÕ #%d × ÔÁÂÌÉÃÅ"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "@tab ×ÎÅ ÔÁÂÌÉÃÙ ÉÇÎÏÒÉÒÏ×ÁÎ"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** íÎÏÇÏËÏÌÏÎÏÞÎÙÊ ×Ù×ÏÄ ÉÚ ÐÏÓÌÅÄÎÅÊ ÓÔÒÏËÉ:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* ËÏÌÏÎËÁ %d: ×Ù×ÏÄ = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "îÏÄÁ `%s' ÂÙÌÁ ÒÁÎÅÅ ÏÐÒÅÄÅÌÅÎÁ × ÓÔÒÏËÅ %d"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "æÏÒÍÁÔÉÒÏ×ÁÎÉÅ ÎÏÄÙ %s...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "äÌÑ ÎÏÄÙ `%s' ÔÒÅÂÕÅÔÓÑ ËÏÍÁÎÄÁ ÏÐÉÓÁÎÉÑ ÓÔÒÕËÔÕÒÙ ÇÌÁ× (ÎÁÐÒ. %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "äÌÑ ËÏÍÁÎÄÙ `%c%s' ÎÅ ÚÁÄÁÎÏ ÉÍÑ ÎÏÄÙ"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "íÁÒËÅÒ `%s' É ÎÏÄÁ `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "äÁÎÎÁÑ ËÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "ðÅÒÅÉÍÅÎÕÊÔÅ ÜÔÏÔ ÍÁÒËÅÒ ÉÌÉ ÉÓÐÏÌØÚÕÊÔÅ ËÌÀÞ `--no-split'"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "îÅÏÖÉÄÁÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÒÁÚÂÉÔÏÇÏ HTML-ÆÁÊÌÁ `%s'"
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "óÌÅÄÕÀÝÁÑ:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "ðÒÅÄÙÄÕÝÁÑ:"
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "÷×ÅÒÈ:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "íÁÒËÅÒÙ `%s' É `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr "ëÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ"
 
 #  ÚÄÅÓØ %s ÍÏÖÅÔ ÂÙÔØ `cross' ÉÌÉ `menu'
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 "%s ÎÁ ÎÅÓÕÝÅÓÔ×ÕÀÝÕÀ ÎÏÄÕ `%s' (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ "
 "ÇÌÁ×?)"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "óÓÙÌËÁ ÉÚ ÍÅÎÀ"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "ðÅÒÅËÒÅÓÔÎÁÑ ÓÓÙÌËÁ"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 "îÁ ÐÏÌÅ Next ÎÏÄÙ `%s' ÎÅÔ ÓÓÙÌÏË (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ "
 "ÇÌÁ×?)"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "÷ ÜÔÏÊ ÎÏÄÅ (%s) ÎÅÐÒÁ×ÉÌØÎÙÊ ÕËÁÚÁÔÅÌØ Prev"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "ðÒÅÄÙÄÕÝÁÑ"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "îÁ ÐÏÌÅ Prev ÎÏÄÙ `%s' ÎÅÔ ÓÓÙÌÏË"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "÷ ÜÔÏÊ ÎÏÄÅ (%s) ÎÅÐÒÁ×ÉÌØÎÙÊ ÕËÁÚÁÔÅÌØ Next"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 "÷ ÎÏÄÅ `%s' ÎÅÔ ÐÏÌÑ Up (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ ÇÌÁ×?)"
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "÷×ÅÒÈ"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "îÏÄÁ `%s' ÎÅ ÉÍÅÅÔ ÐÕÎËÔÁ ÍÅÎÀ ÄÌÑ `%s', ÈÏÔÑ ÎÁ ÎÅÅ ÓÓÙÌÁÅÔÓÑ ÐÏÌÅ Up"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "ÎÁ ÎÏÄÕ `%s' ÐÏÑ×ÉÌÏÓØ %d ÓÓÙÌÏË"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "ÎÁ ÎÏÄÕ `%s' ÎÅÔ ÓÓÙÌÏË"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr "õÄÁÌÅÎÉÅ %s\n"
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÆÁÊÌ `%s': %s"
@@ -2820,271 +3006,108 @@ msgstr "ðÒÉÌÏÖÅÎÉÅ %c"
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ (search_sectioning) `%s'!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "ëÏÍÁÎÄÁ %c%s ÕÓÔÁÒÅÌÁ; ÉÓÐÏÌØÚÕÊÔÅ ×ÍÅÓÔÏ ÎÅÅ %c%s"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "îÏÄÁ Ó %ctop × ËÁÞÅÓÔ×Å ÒÁÚÄÅÌÁ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "úÄÅÓØ ÎÁÈÏÄÉÔÓÑ ÎÏÄÁ %ctop"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop ×ÓÔÒÅÞÅÎÁ ÐÅÒÅÄ %cnode, ÐÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ %s"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "óÏÄÅÒÖÁÎÉÅ"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "ëÒÁÔËÏÅ ÓÏÄÅÒÖÁÎÉÅ"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ @image ÆÁÊÌ `%s': %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 "ÉÓÐÏÌØÚÏ×ÁÎÉÅ @headitem × ËÁÞÅÓÔ×Å ÐÏÓÌÅÄÎÅÇÏ ÜÌÅÍÅÎÔÁ @multitable ×ÙÄÁÅÔ "
 "ÎÅËÏÒÒÅËÔÎÙÅ ÄÏËÕÍÅÎÔÙ Docbook"
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " ÄÌÑ %s"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "ÉÚ"
 
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\túÁÐÕÓÔÉÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÌÎÏÇÏ ÓÐÉÓËÁ ËÌÀÞÅÊ.\n"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "ÎÁÄ"
 
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... [INFO-æáêì [DIR-æáêì]]\n"
-"\n"
-"õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÉÌÉ ÕÄÁÌÑÅÔ ×ÈÏÖÄÅÎÉÑ ËÁÔÁÌÏÇÁ ÄÌÑ INFO-æáêìá ÉÚ\n"
-"ÆÁÊÌÁ-ËÁÔÁÌÏÇÁ Info DIR-æáêì.\n"
-"\n"
-"ëÌÀÞÉ:\n"
-" --delete          ÕÄÁÌÉÔØ ÓÕÝÅÓÔ×ÕÀÝÉÅ ×ÈÏÖÄÅÎÉÑ ÄÌÑ INFO-æáêìá ÉÚ DIR-"
-"æáêìá;\n"
-"                   ÎÅ ×ÓÔÁ×ÌÑÔØ ÎÏ×ÙÅ ×ÈÏÖÄÅÎÉÑ.\n"
-" --dir-file=éíñ    ÚÁÄÁÅÔ ÉÍÑ ËÁÔÁÌÏÇÅ Info,\n"
-"                   ÜË×É×ÁÌÅÎÔÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÁÒÇÕÍÅÎÔÁ DIR-æáêì.\n"
-" --entry=ôåëóô     ×ÓÔÁ×ÉÔØ ôåëóô × ËÁÞÅÓÔ×Å ×ÈÏÖÄÅÎÉÑ ËÁÔÁÌÏÇÁ Info.\n"
-"                   ôÅËÓÔ ÄÏÌÖÅÎ ÉÍÅÔØ ÆÏÒÍÕ ÐÕÎËÔÁ ÍÅÎÀ ÐÌÀÓ (×ÏÚÍÏÖÎÏ)\n"
-"                   ÎÅÓËÏÌØËÏ ÓÔÒÏË, ÎÁÞÉÎÁÀÝÉÈÓÑ ÐÒÏÂÅÌØÎÙÍÉ ÓÉÍ×ÏÌÁÍÉ.  "
-"åÓÌÉ ×Ù\n"
-"                   ÚÁÄÁÄÉÔÅ ÎÅÓËÏÌØËÏ ×ÈÏÖÄÅÎÉÊ, ×ÓÅ ÏÎÉ ÂÕÄÕÔ ×ÓÔÁ×ÌÅÎÙ.  "
-"åÓÌÉ\n"
-"                   ×Ù ÎÅ ÚÁÄÁÄÉÔÅ ×ÈÏÖÄÅÎÉÊ, ÂÕÄÅÔ ×ÓÔÁ×ÌÅÎ ÔÅËÓÔ ÉÚ Info-"
-"ÆÁÊÌÁ.\n"
-" --help            ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n"
-" --info-file=æáêì  ÚÁÄÁÅÔ ÉÍÑ ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÏÇÏ Info-ÆÁÊÌÁ,\n"
-"                   ÜË×É×ÁÌÅÎÔÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÁÒÇÕÍÅÎÔÁ INFO-æáêì.\n"
-" --info-dir=éíñ    ÓÉÎÏÎÉÍ --dir-file=éíñ/dir.\n"
-" --item=ôåëóô      ÓÉÎÏÎÉÍ --entry ôåëóô.\n"
-"                   ÷ÈÏÖÄÅÎÉÅ ËÁÔÁÌÏÇÁ Info ÎÁ ÓÁÍÏÍ ÄÅÌÅ Ñ×ÌÑÅÔÓÑ ÐÕÎËÔÏÍ "
-"ÍÅÎÀ.\n"
-" --quiet           ÎÅ ×Ù×ÏÄÉÔØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ.\n"
-" --remove          ÓÉÎÏÎÉÍ --delete.\n"
-" --section=óåë     ÐÏÍÅÓÔÉÔØ ×ÈÏÖÄÅÎÉÑ × ÚÁÄÁÎÎÕÀ ÓÅËÃÉÀ ËÁÔÁÌÏÇÁ.\n"
-"                   åÓÌÉ ×Ù ÚÁÄÁÄÉÔÅ ÎÅÓËÏÌØËÏ ÓÅËÃÉÊ, ×ÈÏÖÄÅÎÉÑ ÂÕÄÕÔ "
-"×ÓÔÁ×ÌÅÎÙ ×\n"
-"                   ËÁÖÄÕÀ. åÓÌÉ ×Ù ÎÅ ÚÁÄÁÄÉÔÅ ÓÅËÃÉÊ, ×ÈÏÖÄÅÎÉÑ ÂÕÄÕÔ "
-"×ÓÔÁ×ÌÅÎÙ\n"
-"                   × ÓÅËÃÉÉ, ÚÁÄÁÎÎÙÅ × Info-ÆÁÊÌÅ.\n"
-" --version         ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n"
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
 msgstr ""
-"üÔÏ ÆÁÊÌ .../info/dir, ÓÏÄÅÒÖÁÝÉÊ ËÏÒÎÅ×ÕÀ ÎÏÄÕ ÉÅÒÁÒÈÉÉ Info,\n"
-"ÎÁÚÙ×ÁÅÍÕÀ (dir)Top.  ðÒÉ ×ÙÚÏ×Å Info ×Ù ×ÉÄÉÔÅ ÜÔÕ ÎÏÄÕ.\n"
-"\n"
-"%s\tüÔÏ ËÏÒÎÅ×ÁÑ ÎÏÄÁ ÉÅÒÁÒÈÉÉ Info\n"
-"\n"
-"  úÄÅÓØ (× ËÁÔÁÌÏÇÅ Info) ÐÒÅÄÓÔÁ×ÌÅÎÏ ÍÅÎÀ ÐÏ ÏÓÎÏ×ÎÙÍ ÔÅÍÁÍ.\n"
-"  îÁÖÍÉÔÅ \"q\" ÞÔÏÂÙ ×ÙÊÔÉ, \"?\" ÞÔÏÂÙ ÐÏÓÍÏÔÒÅÔØ ×ÓÅ ËÏÍÁÎÄÙ Info,\n"
-"  \"d\" ÞÔÏÂÙ ×ÅÒÎÕÔØÓÑ ÓÀÄÁ, \"h\" ÞÔÏÂÙ ÐÒÏÞÉÔÁÔØ ÒÕËÏ×ÏÄÓÔ×Ï ÄÌÑ "
-"ÎÏ×ÉÞËÏ×,\n"
-"  \"mEmacs<Return>\" ÞÔÏÂÙ ÐÒÏÞÉÔÁÔØ ÒÕËÏ×ÏÄÓÔ×Ï ÐÏ Emacs.\n"
-"\n"
-"  ÷ Emacs ×Ù ÍÏÖÅÔÅ ÎÁÖÁÔØ ×ÔÏÒÕÀ ËÎÏÐËÕ ÍÙÛÉ ÎÁ ÐÕÎËÔÅ ÍÅÎÀ ÉÌÉ ÓÓÙÌËÅ,\n"
-"  ÞÔÏÂÙ ÐÅÒÅÊÔÉ Ë ÎÅÍÕ.\n"
-"\n"
-"%s\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ (%s) É ÓÏÚÄÁÔØ (%s)\n"
 
-#: util/install-info.c:600
+#: makeinfo/xref.c:252
 #, c-format
-msgid "%s: empty file"
-msgstr "%s: ÐÕÓÔÏÊ ÆÁÊÌ"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ START-INFO-DIR-ENTRY"
-
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr "%s: ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ ÆÁÊÌ dir: %s\n"
-
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ Info-ÆÁÊÌ.\n"
-
-#: util/install-info.c:1284
-#, c-format
-msgid "excess command line argument `%s'"
-msgstr "ÉÚÌÉÛÎÉÊ ÁÒÇÕÍÅÎÔ `%s'"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
-"îÅ ÚÁÄÁÎ ×ÈÏÄÎÏÊ ÆÁÊÌ.\n"
-"ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ."
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
 msgstr ""
-"îÅ ÚÁÄÁÎ ÆÁÊÌ ËÁÔÁÌÏÇÁ.\n"
-"ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ."
 
-#: util/install-info.c:1313
+#: makeinfo/xref.c:390
 #, c-format
-msgid "no info dir entry in `%s'"
-msgstr "× `%s' ÎÅÔ ×ÈÏÖÄÅÎÉÑ ÄÌÑ ËÁÔÁÌÏÇÁ Info"
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr ""
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "ÐÕÎËÔ ÍÅÎÀ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ, ÄÌÑ ÆÁÊÌÁ `%s'"
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË."
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ ÄÌÑ `%s'; ÎÉÞÅÇÏ ÎÅ ÕÄÁÌÅÎÏ"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr ""
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "ÓÏÈÒÁÎÑÔØ ×ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ ÐÏÓÌÅ ÒÁÂÏÔÙ"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "ÎÅ ÓÏÈÒÁÎÑÔØ ×ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ (ÐÏ ÕÍÏÌÞÁÎÉÀ)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × æáêì"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... æáêì...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 "óÏÚÄÁÅÔ ÓÏÒÔÉÒÏ×ÁÎÎÙÊ ÁÌÆÁ×ÉÔÎÙÊ ÕËÁÚÁÔÅÌØ ÄÌÑ\n"
 "ËÁÖÄÏÇÏ ×ÙÈÏÄÎÏÇÏ TeX-ÆÁÊÌÁ.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr "æáêì... ÄÌÑ ÄÏËÕÍÅÎÔÁ `foo.texi' ÏÂÙÞÎÏ ÚÁÄÁÅÔÓÑ ËÁË `foo.%c%c'.\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3093,23 +3116,394 @@ msgstr ""
 "\n"
 "ëÌÀÞÉ:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: ÎÅ texinfo-ÆÁÊÌ Ó ÁÌÆÁ×ÉÔÎÙÍ ÕËÁÚÁÔÅÌÅÍ"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "ÏÛÉÂËÁ ÐÏ×ÔÏÒÎÏÇÏ ÏÔËÒÙÔÉÑ %s"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: ÎÅ texinfo-ÆÁÊÌ Ó ÁÌÆÁ×ÉÔÎÙÍ ÕËÁÚÁÔÅÌÅÍ"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "÷ %s ÎÅÔ ÎÏÍÅÒÁ ÓÔÒÁÎÉÃÙ"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "ÚÁ ×ÈÏÖÄÅÎÉÅÍ %s ÓÌÅÄÕÅÔ ×ÈÏÖÄÅÎÉÅ Ó ×ÔÏÒÉÞÎÙÍ ÉÍÅÎÅÍ"
+
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10[search]  éÓËÁÔØ ÕËÁÚÁÎÎÕÀ ÓÔÒÏËÕ × ÔÅËÕÝÅÍ Info-ÆÁÊÌÅ É "
+#~ "ÏÓÔÁÎÏ×ÉÔØÓÑ ×\n"
+#~ "              ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
+
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10[goto-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ, ÚÁÄÁÎÎÏÊ ÐÏ ÉÍÅÎÉ.\n"
+#~ "              ÷Ù ÍÏÖÅÔÅ ÚÁÄÁÔØ ÔÁËÖÅ ÉÍÑ ÆÁÊÌÁ, ÎÁÐÒÉÍÅÒ (æáêì)îïäá.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "\\%-10[next-node]  ðÅÒÅÊÔÉ Ë \"ÓÌÅÄÕÀÝÅÊ\" ÎÏÄÅ.\n"
+
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr ""
+#~ "\\%-10[dir-node]  ðÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÊ ÎÏÄÅ.  üË×É×ÁÌÅÎÔÎÏ `g (DIR)'.\n"
+
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr "\\%-10[top-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ Top.  üË×É×ÁÌÅÎÔÎÏ `g Top'.\n"
+
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10[search-backward]  éÓËÁÔØ ÕËÁÚÁÎÎÕÀ ÓÔÒÏËÕ × ÔÅËÕÝÅÍ Info-ÆÁÊÌÅ ×\n"
+#~ "              ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr ""
+#~ "--- éÓÐÏÌØÚÕÊÔÅ `\\[history-node]' ÉÌÉ `\\[kill-node]' ÄÌÑ ×ÙÈÏÄÁ ---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr ""
+#~ "\\%-10[move-to-prev-xref]  ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ "
+#~ "ÎÏÄÅ.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... [ðõîëô-íåîà...]\n"
+#~ "\n"
+#~ "ðÏÚ×ÏÌÑÅÔ ÐÒÏÓÍÁÔÒÉ×ÁÔØ ÄÏËÕÍÅÎÔÁÃÉÀ × ÆÏÒÍÁÔÅ Info.\n"
+#~ "\n"
+#~ "ëÌÀÞÉ:\n"
+#~ "      --apropos=ôåíá      ÉÓËÁÔØ ôåíõ ×Ï ×ÓÅÈ ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ\n"
+#~ "                          ×ÓÅÈ ÒÕËÏ×ÏÄÓÔ×.\n"
+#~ "  -d, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë INFOPATH.\n"
+#~ "      --dribble=æáêì      ÚÁÐÉÓÁÔØ ××ÏÄÉÍÙÅ ÐÏÌØÚÏ×ÁÔÅÌÅÍ ÚÎÁËÉ × æáêì.\n"
+#~ "  -f, --file=æáêì         ÐÏËÁÚÁÔØ ÚÁÄÁÎÎÙÊ æáêì.\n"
+#~ "  -h, --help              ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n"
+#~ "      --index-search=óôòïëá    ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÎÁ ËÏÔÏÒÕÀ ÓÓÙÌÁÅÔÓÑ "
+#~ "ÚÁÄÁÎÎÏÅ\n"
+#~ "                          óôòïëïê ×ÈÏÖÄÅÎÉÅ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ.\n"
+#~ "  -n, --node=îïäá         ÎÁÞÁÔØ ÐÒÏÓÍÏÔÒ Ó ÚÁÄÁÎÎÏÊ îïäù.\n"
+#~ "  -o, --output=æáêì       ÚÁÐÉÓÁÔØ ×ÙÂÒÁÎÎÙÅ ÎÏÄÙ × æáêì.\n"
+#~ "  -R, --raw-escapes       ×Ù×ÏÄÉÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ANSI (ÐÏ "
+#~ "ÕÍÏÌÞÁÎÉÀ).\n"
+#~ "      --no-raw-escapes    ×Ù×ÏÄÉÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ËÁË "
+#~ "ÂÕË×ÁÌØÎÙÊ ÔÅËÓÔ.\n"
+#~ "      --restore=æáêì      ÐÒÏÞÉÔÁÔØ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÎÁÖÁÔÙÈ ËÌÁ×ÉÛ ÉÚ "
+#~ "æáêìá.\n"
+#~ "  -O, --show-options, --usage ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ ËÏÍÁÎÄÎÏÊ "
+#~ "ÓÔÒÏËÉ.\n"
+#~ "%s      --subnodes          ÒÅËÕÒÓÉ×ÎÏ ×Ù×ÏÄÉÔØ ÐÕÎËÔÙ ÍÅÎÀ.\n"
+#~ "      --vi-keys           ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÉ×ÑÚËÉ ËÌÁ×ÉÛ ËÁË × vi É less.\n"
+#~ "      --version           ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n"
+#~ "\n"
+#~ "ðÅÒ×ÙÊ ÎÅ Ñ×ÌÑÀÝÉÊÓÑ ËÌÀÞÏÍ ÁÒÇÕÍÅÎÔ, ÅÓÌÉ ÏÎ ÅÓÔØ, ÚÁÄÁÅÔ ÉÍÑ\n"
+#~ "ÎÁÞÁÌØÎÏÇÏ ÐÕÎËÔÁ ÍÅÎÀ; ÏÎ ÉÝÅÔÓÑ ×Ï ×ÓÅÈ ÆÁÊÌÁÈ `dir' × INFOPATH.\n"
+#~ "åÓÌÉ ÏÎ ÎÅ ÎÁÊÄÅÎ, info ÏÂßÅÄÉÎÑÅÔ ×ÓÅ ÆÁÊÌÙ `dir' É ÐÏËÁÚÙ×ÁÅÔ\n"
+#~ "ÒÅÚÕÌØÔÁÔ.  ÷ÓÅ ÏÓÔÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÒÁÓÓÍÁÔÒÉ×ÁÀÔÓÑ ËÁË ÉÍÅÎÁ ÐÕÎËÔÏ×\n"
+#~ "ÍÅÎÀ ÏÔÎÏÓÉÔÅÌØÎÏ ÐÅÒ×ÏÊ ÐÏÓÅÝÅÎÎÏÊ ÎÏÄÙ.\n"
+#~ "\n"
+#~ "ðÒÉÍÅÒÙ:\n"
+#~ "  info                       ÐÏËÁÚÁÔØ ÍÅÎÀ ËÁÔÁÌÏÇÁ ×ÅÒÈÎÅÇÏ ÕÒÏ×ÎÑ\n"
+#~ "  info emacs                 ÎÁÞÁÔØ Ó ÎÏÄÙ emacs ÉÚ ËÁÔÁÌÏÇÁ ×ÅÒÈÎÅÇÏ "
+#~ "ÕÒÏ×ÎÑ\n"
+#~ "  info emacs buffers         ÎÁÞÁÔØ Ó ÎÏÄÙ buffers × ÒÕËÏ×ÏÄÓÔ×Å emacs\n"
+#~ "  info --show-options emacs  ÎÁÞÁÔØ Ó ÎÏÄÙ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ emacs\n"
+#~ "  info -f ./foo.info         ÐÏËÁÚÁÔØ ÆÁÊÌ ./foo.info, ÎÅ ÉÓËÁÔØ dir\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr ""
+#~ "              ðÒÉ ÐÅÒÅÈÏÄÅ Ë ÚÁÄÁÎÎÏÍÕ ÐÕÎËÔÕ ÍÅÎÀ ×ÙÂÉÒÁÅÔÓÑ ÄÒÕÇÁÑ "
+#~ "ÎÏÄÁ.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "              ÷Ù ÍÏÖÅÔÅ ÚÁÄÁÔØ ÔÁËÖÅ ÉÍÑ ÆÁÊÌÁ, ÎÁÐÒÉÍÅÒ (æáêì)îïäá.\n"
+
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr ""
+#~ "  %-10s  îÁÊÔÉ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ, É ÐÅÒÅÊÔÉ Ë\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "              ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"óÌÅÄÕÀÝÁÑ\"..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "÷ÙÂÉÒÁÅÔÓÑ ÐÅÒ×ÙÊ ÐÕÎËÔ ÍÅÎÀ..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "÷ÙÂÉÒÁÅÔÓÑ ÎÏÄÁ \"óÌÅÄÕÀÝÁÑ\"..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "ðÅÒÅÍÅÝÅÎÉÅ \"÷×ÅÒÈ\" %d ÒÁÚ(Á), ÚÁÔÅÍ \"óÌÅÄÕÀÝÁÑ\"."
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"ðÒÅÄÙÄÕÝÁÑ\" × ÜÔÏÍ ÏËÎÅ."
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"÷×ÅÒÈ\" × ÜÔÏÍ ÏËÎÅ."
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "ðÅÒÅÈÏÄ ÎÁ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ ÎÏÄÙ `ðÒÅÄÙÄÕÝÁÑ'."
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "æÕÎËÃÉÑ"
+
+#~ msgid "Macro"
+#~ msgstr "íÁËÒÏ"
+
+#~ msgid "Special Form"
+#~ msgstr "óÐÅÃÉÁÌØÎÁÑ ÆÏÒÍÁ"
+
+#~ msgid "Variable"
+#~ msgstr "ðÅÒÅÍÅÎÎÁÑ"
+
+#~ msgid "User Option"
+#~ msgstr "ðÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÐÁÒÁÍÅÔÒ"
+
+#~ msgid "Instance Variable"
+#~ msgstr "ðÅÒÅÍÅÎÎÁÑ ÜËÚÅÍÐÌÑÒÁ"
+
+#~ msgid "Method"
+#~ msgstr "íÅÔÏÄ"
+
+#~ msgid "Untitled"
+#~ msgstr "âÅÚ ÚÁÇÏÌÏ×ËÁ"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "üÔÏ %s, ÓÏÚÄÁÎÎÙÊ makeinfo ×ÅÒÓÉÉ %s ÉÚ %s.\n"
+
+#~ msgid "Next:"
+#~ msgstr "óÌÅÄÕÀÝÁÑ:"
+
+#~ msgid "Previous:"
+#~ msgstr "ðÒÅÄÙÄÕÝÁÑ:"
+
+#~ msgid "Up:"
+#~ msgstr "÷×ÅÒÈ:"
+
+#~ msgid "Menu"
+#~ msgstr "óÓÙÌËÁ ÉÚ ÍÅÎÀ"
+
+#~ msgid "Cross"
+#~ msgstr "ðÅÒÅËÒÅÓÔÎÁÑ ÓÓÙÌËÁ"
+
+#~ msgid "Prev"
+#~ msgstr "ðÒÅÄÙÄÕÝÁÑ"
+
+#~ msgid "Up"
+#~ msgstr "÷×ÅÒÈ"
+
+#, fuzzy
+#~ msgid "see "
+#~ msgstr "óÍÏÔÒÉÔÅ "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... [INFO-æáêì [DIR-æáêì]]\n"
+#~ "\n"
+#~ "õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÉÌÉ ÕÄÁÌÑÅÔ ×ÈÏÖÄÅÎÉÑ ËÁÔÁÌÏÇÁ ÄÌÑ INFO-æáêìá ÉÚ\n"
+#~ "ÆÁÊÌÁ-ËÁÔÁÌÏÇÁ Info DIR-æáêì.\n"
+#~ "\n"
+#~ "ëÌÀÞÉ:\n"
+#~ " --delete          ÕÄÁÌÉÔØ ÓÕÝÅÓÔ×ÕÀÝÉÅ ×ÈÏÖÄÅÎÉÑ ÄÌÑ INFO-æáêìá ÉÚ DIR-"
+#~ "æáêìá;\n"
+#~ "                   ÎÅ ×ÓÔÁ×ÌÑÔØ ÎÏ×ÙÅ ×ÈÏÖÄÅÎÉÑ.\n"
+#~ " --dir-file=éíñ    ÚÁÄÁÅÔ ÉÍÑ ËÁÔÁÌÏÇÅ Info,\n"
+#~ "                   ÜË×É×ÁÌÅÎÔÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÁÒÇÕÍÅÎÔÁ DIR-æáêì.\n"
+#~ " --entry=ôåëóô     ×ÓÔÁ×ÉÔØ ôåëóô × ËÁÞÅÓÔ×Å ×ÈÏÖÄÅÎÉÑ ËÁÔÁÌÏÇÁ Info.\n"
+#~ "                   ôÅËÓÔ ÄÏÌÖÅÎ ÉÍÅÔØ ÆÏÒÍÕ ÐÕÎËÔÁ ÍÅÎÀ ÐÌÀÓ (×ÏÚÍÏÖÎÏ)\n"
+#~ "                   ÎÅÓËÏÌØËÏ ÓÔÒÏË, ÎÁÞÉÎÁÀÝÉÈÓÑ ÐÒÏÂÅÌØÎÙÍÉ ÓÉÍ×ÏÌÁÍÉ.  "
+#~ "åÓÌÉ ×Ù\n"
+#~ "                   ÚÁÄÁÄÉÔÅ ÎÅÓËÏÌØËÏ ×ÈÏÖÄÅÎÉÊ, ×ÓÅ ÏÎÉ ÂÕÄÕÔ "
+#~ "×ÓÔÁ×ÌÅÎÙ.  åÓÌÉ\n"
+#~ "                   ×Ù ÎÅ ÚÁÄÁÄÉÔÅ ×ÈÏÖÄÅÎÉÊ, ÂÕÄÅÔ ×ÓÔÁ×ÌÅÎ ÔÅËÓÔ ÉÚ Info-"
+#~ "ÆÁÊÌÁ.\n"
+#~ " --help            ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n"
+#~ " --info-file=æáêì  ÚÁÄÁÅÔ ÉÍÑ ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÏÇÏ Info-ÆÁÊÌÁ,\n"
+#~ "                   ÜË×É×ÁÌÅÎÔÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÁÒÇÕÍÅÎÔÁ INFO-æáêì.\n"
+#~ " --info-dir=éíñ    ÓÉÎÏÎÉÍ --dir-file=éíñ/dir.\n"
+#~ " --item=ôåëóô      ÓÉÎÏÎÉÍ --entry ôåëóô.\n"
+#~ "                   ÷ÈÏÖÄÅÎÉÅ ËÁÔÁÌÏÇÁ Info ÎÁ ÓÁÍÏÍ ÄÅÌÅ Ñ×ÌÑÅÔÓÑ ÐÕÎËÔÏÍ "
+#~ "ÍÅÎÀ.\n"
+#~ " --quiet           ÎÅ ×Ù×ÏÄÉÔØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ.\n"
+#~ " --remove          ÓÉÎÏÎÉÍ --delete.\n"
+#~ " --section=óåë     ÐÏÍÅÓÔÉÔØ ×ÈÏÖÄÅÎÉÑ × ÚÁÄÁÎÎÕÀ ÓÅËÃÉÀ ËÁÔÁÌÏÇÁ.\n"
+#~ "                   åÓÌÉ ×Ù ÚÁÄÁÄÉÔÅ ÎÅÓËÏÌØËÏ ÓÅËÃÉÊ, ×ÈÏÖÄÅÎÉÑ ÂÕÄÕÔ "
+#~ "×ÓÔÁ×ÌÅÎÙ ×\n"
+#~ "                   ËÁÖÄÕÀ. åÓÌÉ ×Ù ÎÅ ÚÁÄÁÄÉÔÅ ÓÅËÃÉÊ, ×ÈÏÖÄÅÎÉÑ ÂÕÄÕÔ "
+#~ "×ÓÔÁ×ÌÅÎÙ\n"
+#~ "                   × ÓÅËÃÉÉ, ÚÁÄÁÎÎÙÅ × Info-ÆÁÊÌÅ.\n"
+#~ " --version         ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "ÐÕÎËÔ ÍÅÎÀ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ, ÄÌÑ ÆÁÊÌÁ `%s'"
+
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr ""
+#~ "\\%-10[menu-digit]  ÷ÙÂÒÁÔØ ÐÅÒ×ÙÊ ... ÄÅ×ÑÔÙÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ "
+#~ "ÎÏÄÅ.\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "ÎÁ ÎÏÄÕ `%s' ÐÏÑ×ÉÌÏÓØ %d ÓÓÙÌÏË"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ.  ÷Ù ÍÏÖÅÔÅ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÜÔÉ ÐÒÏÇÒÁÍÍÙ, "
+#~ "ÐÒÉ\n"
+#~ "ÓÏÂÌÀÄÅÎÉÉ ÕÓÌÏ×ÉÊ õÎÉ×ÅÒÓÁÌØÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU.\n"
+#~ "äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ Ï ×ÏÚÍÏÖÎÏÓÔÉ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ "
+#~ "ÓÍÏÔÒÉÔÅ\n"
+#~ "ÆÁÊÌ COPYING.\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-arg ÐÏÌÅÚÎÁ, ÔÏÌØËÏ ÅÓÌÉ ÍÁËÒÏ ÐÒÉÎÉÍÁÅÔ ÏÄÉÎ ÁÒÇÕÍÅÎÔ"
+
+#~ msgid "Table of Contents"
+#~ msgstr "óÏÄÅÒÖÁÎÉÅ"
+
+#~ msgid "Short Contents"
+#~ msgstr "ëÒÁÔËÏÅ ÓÏÄÅÒÖÁÎÉÅ"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "ÓÏÈÒÁÎÑÔØ ×ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ ÐÏÓÌÅ ÒÁÂÏÔÙ"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "ÎÅ ÓÏÈÒÁÎÑÔØ ×ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ (ÐÏ ÕÍÏÌÞÁÎÉÀ)"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr ""
+#~ "              Info-ÆÁÊÌÁ É ×ÙÂÒÁÔØ ÎÏÄÕ ÐÏ ÐÅÒ×ÏÊ ÎÁÊÄÅÎÎÏÊ ÓÓÙÌËÅ.\n"
+
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ.  ÷Ù ÍÏÖÅÔÅ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÜÔÉ ÐÒÏÇÒÁÍÍÙ, "
+#~ "ÐÒÉ\n"
+#~ "ÓÏÂÌÀÄÅÎÉÉ ÕÓÌÏ×ÉÊ õÎÉ×ÅÒÓÁÌØÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU.\n"
+#~ "äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ Ï ×ÏÚÍÏÖÎÏÓÔÉ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ "
+#~ "ÓÍÏÔÒÉÔÅ\n"
+#~ "ÆÁÊÌ COPYING.\n"
diff --git a/Build/source/utils/texinfo/po/rw.gmo b/Build/source/utils/texinfo/po/rw.gmo
new file mode 100644
index 00000000000..cefe988a956
--- /dev/null
+++ b/Build/source/utils/texinfo/po/rw.gmo
diff --git a/Build/source/utils/texinfo/po/rw.po b/Build/source/utils/texinfo/po/rw.po
new file mode 100644
index 00000000000..4b7b4c541ba
--- /dev/null
+++ b/Build/source/utils/texinfo/po/rw.po
@@ -0,0 +1,3514 @@
+# Kinyarwanda translations for texinfo package.
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the texinfo package.
+# Steve Murphy <murf@e-tools.com>, 2005.
+# Steve performed initial rough translation from compendium built from translations provided by the following translators:
+# Philibert Ndandali  <ndandali@yahoo.fr>, 2005.
+# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
+# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
+# Carole Karema <karemacarole@hotmail.com>, 2005.
+# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
+# Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
+# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005.
+# Antoine Bigirimana <antoine@e-tools.com>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: texinfo 4.7.94\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2005-04-04 10:55-0700\n"
+"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
+"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, fuzzy, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s:Ihitamo ni"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, fuzzy, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s:Ihitamo Kwemerera"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, fuzzy, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s:Ihitamo Kwemerera"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, fuzzy, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s:Ihitamo"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, fuzzy, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s:Ihitamo"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, fuzzy, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s:Ihitamo"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, fuzzy, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s:Ihitamo"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, fuzzy, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s:Sibyo Ihitamo"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s:Ihitamo"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, fuzzy, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s:Ihitamo ni"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s:Ihitamo Kwemerera"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr ""
+
+#: info/echo-area.c:283 info/session.c:735
+#, fuzzy
+msgid "Move forward a character"
+msgstr "Imbere a Inyuguti"
+
+#: info/echo-area.c:295 info/session.c:767
+#, fuzzy
+msgid "Move backward a character"
+msgstr "subira inyuma a Inyuguti"
+
+#: info/echo-area.c:307
+#, fuzzy
+msgid "Move to the start of this line"
+msgstr "Kuri i Gutangira Bya iyi Umurongo"
+
+#: info/echo-area.c:312
+#, fuzzy
+msgid "Move to the end of this line"
+msgstr "Kuri i Impera Bya iyi Umurongo"
+
+#: info/echo-area.c:320 info/session.c:808
+#, fuzzy
+msgid "Move forward a word"
+msgstr "Imbere a ijambo"
+
+#: info/echo-area.c:360 info/session.c:881
+#, fuzzy
+msgid "Move backward a word"
+msgstr "subira inyuma a ijambo"
+
+#: info/echo-area.c:400
+#, fuzzy
+msgid "Delete the character under the cursor"
+msgstr "i Inyuguti i indanga"
+
+#: info/echo-area.c:430
+#, fuzzy
+msgid "Delete the character behind the cursor"
+msgstr "i Inyuguti i indanga"
+
+#: info/echo-area.c:451
+#, fuzzy
+msgid "Cancel or quit operation"
+msgstr "Cyangwa Kuvamo"
+
+#: info/echo-area.c:466
+#, fuzzy
+msgid "Accept (or force completion of) this line"
+msgstr "Cyangwa Bya iyi Umurongo"
+
+#: info/echo-area.c:471
+#, fuzzy
+msgid "Insert next character verbatim"
+msgstr "Komeza>> Inyuguti"
+
+#: info/echo-area.c:479
+#, fuzzy
+msgid "Insert this character"
+msgstr "iyi Inyuguti"
+
+#: info/echo-area.c:497
+#, fuzzy
+msgid "Insert a TAB character"
+msgstr "a Inyuguti"
+
+#: info/echo-area.c:504
+#, fuzzy
+msgid "Transpose characters at point"
+msgstr "Inyuguti ku Akadomo"
+
+#: info/echo-area.c:555
+#, fuzzy
+msgid "Yank back the contents of the last kill"
+msgstr "Inyuma i Ibigize Bya i Iheruka"
+
+#: info/echo-area.c:562
+#, fuzzy
+msgid "Kill ring is empty"
+msgstr "Kuvuza Inzogera ni ubusa"
+
+#: info/echo-area.c:575
+#, fuzzy
+msgid "Yank back a previous kill"
+msgstr "Inyuma a Ibanjirije"
+
+#: info/echo-area.c:608
+#, fuzzy
+msgid "Kill to the end of the line"
+msgstr "Kuri i Impera Bya i Umurongo"
+
+#: info/echo-area.c:621
+#, fuzzy
+msgid "Kill to the beginning of the line"
+msgstr "Kuri i Itangiriro Bya i Umurongo"
+
+#: info/echo-area.c:633
+#, fuzzy
+msgid "Kill the word following the cursor"
+msgstr "i ijambo i indanga"
+
+#: info/echo-area.c:652
+#, fuzzy
+msgid "Kill the word preceding the cursor"
+msgstr "i ijambo i indanga"
+
+#: info/echo-area.c:867 info/echo-area.c:923
+msgid "No completions"
+msgstr ""
+
+#: info/echo-area.c:869
+#, fuzzy
+msgid "Not complete"
+msgstr "Byuzuye"
+
+#: info/echo-area.c:910
+msgid "List possible completions"
+msgstr ""
+
+#: info/echo-area.c:927
+msgid "Sole completion"
+msgstr ""
+
+#: info/echo-area.c:936
+msgid "One completion:\n"
+msgstr ""
+
+#: info/echo-area.c:937
+#, c-format
+msgid "%d completions:\n"
+msgstr ""
+
+#: info/echo-area.c:1084
+msgid "Insert completion"
+msgstr ""
+
+#: info/echo-area.c:1219
+msgid "Building completions..."
+msgstr ""
+
+#: info/echo-area.c:1339
+#, fuzzy
+msgid "Scroll the completions window"
+msgstr "i Idirishya"
+
+#: info/footnotes.c:212
+#, fuzzy
+msgid "Footnotes could not be displayed"
+msgstr "OYA"
+
+#: info/footnotes.c:238
+#, fuzzy
+msgid "Show the footnotes associated with this node in another window"
+msgstr "i Ubusobanuro mpezarupapuro Na: iyi in Idirishya"
+
+#: info/footnotes.h:26
+msgid "---------- Footnotes ----------"
+msgstr ""
+
+#: info/indices.c:171
+#, fuzzy
+msgid "Look up a string in the index for this file"
+msgstr "Hejuru a Ikurikiranyanyuguti in i Umubarendanga kugirango iyi IDOSIYE"
+
+#: info/indices.c:198
+#, fuzzy
+msgid "Finding index entries..."
+msgstr "Umubarendanga Ibyinjijwe"
+
+#: info/indices.c:206
+#, fuzzy
+msgid "No indices found."
+msgstr "ibimenyetso Byabonetse"
+
+# sw/source\ui\inc\swmn.hrc:_MN_EDIT.FN_EDIT_IDX_ENTRY_DLG.text
+#: info/indices.c:216
+#, fuzzy
+msgid "Index entry: "
+msgstr "Ikinjizwa mu mubarendanga...."
+
+#: info/indices.c:324
+#, fuzzy
+msgid ""
+"Go to the next matching index item from the last `\\[index-search]' command"
+msgstr ""
+"Kuri i Komeza>> Umubarendanga Ikintu Bivuye i Iheruka Umubarendanga Gushaka "
+"Komandi:"
+
+#: info/indices.c:334
+#, fuzzy
+msgid "No previous index search string."
+msgstr "Ibanjirije Umubarendanga Gushaka Ikurikiranyanyuguti"
+
+#: info/indices.c:341
+#, fuzzy
+msgid "No index entries."
+msgstr "Umubarendanga Ibyinjijwe"
+
+#: info/indices.c:374
+#, fuzzy, c-format
+msgid "No %sindex entries containing `%s'."
+msgstr "Ibyinjijwe"
+
+# framework/source\services\logindialog.src:RID_DLG_LOGIN.RID_PB_ADDITIONALSETTINGS.text
+#: info/indices.c:375
+#, fuzzy
+msgid "more "
+msgstr "Birenzeho"
+
+#: info/indices.c:385
+msgid "CAN'T SEE THIS"
+msgstr ""
+
+#: info/indices.c:421
+#, fuzzy, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr "in Komeza>> Umubarendanga BIHUYE Kuri Gushaka Komeza>>"
+
+#: info/indices.c:549
+#, fuzzy, c-format
+msgid "Scanning indices of `%s'..."
+msgstr "ibimenyetso Bya"
+
+#: info/indices.c:604
+#, fuzzy, c-format
+msgid "No available info files have `%s' in their indices."
+msgstr "Bihari Ibisobanuro Idosiye in ibimenyetso"
+
+#: info/indices.c:630
+#, fuzzy
+msgid "Grovel all known info file's indices for a string and build a menu"
+msgstr ""
+"Byose Ibisobanuro ibimenyetso kugirango a Ikurikiranyanyuguti Na a "
+"Ibikubiyemo"
+
+#: info/indices.c:634
+msgid "Index apropos: "
+msgstr ""
+
+#: info/indices.c:662
+#, fuzzy, c-format
+msgid ""
+"\n"
+"* Menu: Nodes whose indices contain `%s':\n"
+msgstr "*bya ibimenyetso"
+
+#: info/info.c:273 info/infokey.c:899
+#, fuzzy, c-format
+msgid "Try --help for more information.\n"
+msgstr "Ifashayobora kugirango Birenzeho Ibisobanuro"
+
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+
+#: info/info.c:504
+#, fuzzy, c-format
+msgid "no index entries found for `%s'\n"
+msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
+
+#: info/info.c:598
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [MENU-ITEM...]\n"
+"\n"
+"Read documentation in Info format.\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
+"Options:\n"
+"  -k, --apropos=STRING         look up STRING in all indices of all "
+"manuals.\n"
+"  -d, --directory=DIR          add DIR to INFOPATH.\n"
+"      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
+"  -h, --help                   display this help and exit.\n"
+"      --index-search=STRING    go to node pointed by index entry STRING.\n"
+"  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
+"      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+#, fuzzy
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr "-B Kuri"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
+"      --vi-keys                use vi-like and less-like key bindings.\n"
+"      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
+"\n"
+"The first non-option argument, if present, is the menu entry to start from;\n"
+"it is searched for in all `dir' files along INFOPATH.\n"
+"If it is not present, info merges all `dir' files and shows the result.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
+"\n"
+"Examples:\n"
+"  info                       show top-level dir menu\n"
+"  info emacs                 start at emacs node from top-level dir\n"
+"  info emacs buffers         start at buffers node within emacs manual\n"
+"  info --show-options emacs  start at node with emacs' command line options\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
+msgstr ""
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
+#, fuzzy
+msgid ""
+"\n"
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr "org."
+
+#: info/info.c:684
+#, fuzzy, c-format
+msgid "Cannot find node `%s'."
+msgstr "Gushaka"
+
+#: info/info.c:685
+#, fuzzy, c-format
+msgid "Cannot find node `(%s)%s'."
+msgstr "Gushaka"
+
+#: info/info.c:686
+#, fuzzy
+msgid "Cannot find a window!"
+msgstr "Gushaka a Idirishya"
+
+#: info/info.c:687
+#, fuzzy
+msgid "Point doesn't appear within this window's node!"
+msgstr "Kugaragara muri iyi"
+
+#: info/info.c:688
+#, fuzzy
+msgid "Cannot delete the last window."
+msgstr "Gusiba i Iheruka Idirishya"
+
+#: info/info.c:689
+#, fuzzy
+msgid "No menu in this node."
+msgstr "Ibikubiyemo in iyi"
+
+#: info/info.c:690
+#, fuzzy
+msgid "No footnotes in this node."
+msgstr "Ubusobanuro mpezarupapuro in iyi"
+
+#: info/info.c:691
+#, fuzzy
+msgid "No cross references in this node."
+msgstr "Kwambukiranya Indango in iyi"
+
+#: info/info.c:692
+#, fuzzy, c-format
+msgid "No `%s' pointer for this node."
+msgstr "Mweretsi kugirango iyi"
+
+#: info/info.c:693
+#, fuzzy, c-format
+msgid "Unknown Info command `%c'; try `?' for help."
+msgstr "Komandi: kugirango Ifashayobora"
+
+#: info/info.c:694
+#, fuzzy, c-format
+msgid "Terminal type `%s' is not smart enough to run Info."
+msgstr "Ubwoko ni OYA Cyiza Kuri Gukoresha"
+
+#: info/info.c:695
+#, fuzzy
+msgid "You are already at the last page of this node."
+msgstr "ku i Iheruka Ipaji Bya iyi"
+
+#: info/info.c:696
+#, fuzzy
+msgid "You are already at the first page of this node."
+msgstr "ku i Itangira Ipaji Bya iyi"
+
+#: info/info.c:697
+#, fuzzy
+msgid "Only one window."
+msgstr "Idirishya"
+
+#: info/info.c:698
+#, fuzzy
+msgid "Resulting window would be too small."
+msgstr "Idirishya Gitoya"
+
+#: info/info.c:699
+#, fuzzy
+msgid "Not enough room for a help window, please delete a window."
+msgstr "kugirango a Ifashayobora Idirishya Gusiba a Idirishya"
+
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
+msgstr ""
+
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
+msgstr "\\%-10 Kuvamo Ifashayobora iyi Ifashayobora"
+
+#: info/infodoc.c:48
+#, fuzzy
+msgid "\\%-10[quit]  Quit Info altogether.\n"
+msgstr "\\%-10 Kuvamo"
+
+#: info/infodoc.c:49
+#, fuzzy
+msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
+msgstr "\\%-10 Kubona Ibisobanuro Ifashayobora i"
+
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10 Umurongo subira inyuma 1. Umurongo"
+
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10 Komeza>> Umurongo Imbere 1. Umurongo"
+
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10 subira inyuma subira inyuma a Ipaji"
+
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10 Imbere Imbere a Ipaji"
+
+#: info/infodoc.c:55
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10 Itangiriro Bya Kuri i Itangiriro Bya iyi"
+
+#: info/infodoc.c:56
+#, fuzzy
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10 Impera Bya Kuri i Impera Bya iyi"
+
+#: info/infodoc.c:58
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr ""
+"\\%-10 Kwimura Kuri Komeza>> X- Ngenderwaho Kuri Komeza>> Ihuza muri iyi"
+
+#: info/infodoc.c:59
+#, fuzzy
+msgid ""
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr "\\%-10 Guhitamo Indango iyi Umurongo i Ihuza indanga"
+
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
+msgstr "\\%-10 Urutonde Kuri i Iheruka in iyi Idirishya"
+
+#: info/infodoc.c:62
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10 Kuri i Ibanjirije Bya iyi"
+
+#: info/infodoc.c:63
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10 Komeza>> Kuri i Komeza>> Bya iyi"
+
+#: info/infodoc.c:64
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10 Kuri i Ibanjirije Bya iyi"
+
+#: info/infodoc.c:65
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10 Komeza>> Kuri i Komeza>> Bya iyi"
+
+#: info/infodoc.c:66
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10 Hejuru Hejuru Bivuye iyi"
+
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10 Impera Bya Kuri i Impera Bya iyi"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10 Impera Bya Kuri i Impera Bya iyi"
+
+#: info/infodoc.c:70
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "%-10sItangira Ikintu in Ibikubiyemo"
+
+#: info/infodoc.c:71
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10 Iheruka Ibikubiyemo Ikintu Iheruka Ikintu in Ibikubiyemo"
+
+#: info/infodoc.c:72
+#, fuzzy
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "%-10sIbikubiyemo Ikintu ku Izina:"
+
+#: info/infodoc.c:73
+#, fuzzy
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr ""
+"\\%-10 X- Ngenderwaho Ikintu a Kwambukiranya Indango Izina: Bya Indango"
+
+#: info/infodoc.c:74
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "%-10sKuri ku Izina:"
+
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "%-10sImbere kugirango a Ikurikiranyanyuguti"
+
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10 Kuri i Ibanjirije Bya iyi"
+
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr ""
+"%-10skugirango a Ikurikiranyanyuguti in i Umubarendanga Ibyinjijwe Bya iyi"
+
+#: info/infodoc.c:79
+#, fuzzy
+msgid ""
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
+msgstr ""
+"\\%-10 Umubarendanga Gushaka kugirango a Ikurikiranyanyuguti in i "
+"Umubarendanga Ibyinjijwe Bya iyi IDOSIYE Na Guhitamo i ku i Itangira "
+"Icyinjijwe Byabonetse"
+
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "KIGEZWEHO"
+
+#: info/infodoc.c:89
+#, fuzzy
+msgid ""
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr "in"
+
+#: info/infodoc.c:92
+#, fuzzy, c-format
+msgid "  %-10s  Quit this help.\n"
+msgstr "%-10siyi Ifashayobora"
+
+#: info/infodoc.c:93
+#, c-format
+msgid "  %-10s  Quit Info altogether.\n"
+msgstr ""
+
+#: info/infodoc.c:94
+#, fuzzy, c-format
+msgid "  %-10s  Invoke the Info tutorial.\n"
+msgstr "%-10si"
+
+#: info/infodoc.c:98
+#, fuzzy, c-format
+msgid "  %-10s  Move to the `next' node of this node.\n"
+msgstr "%-10sKuri i Bya iyi"
+
+#: info/infodoc.c:99
+#, fuzzy, c-format
+msgid "  %-10s  Move to the `previous' node of this node.\n"
+msgstr "%-10sKuri i Bya iyi"
+
+#: info/infodoc.c:100
+#, fuzzy, c-format
+msgid "  %-10s  Move `up' from this node.\n"
+msgstr "%-10sBivuye iyi"
+
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"\\%-10 Ibikubiyemo Ikintu Ibikubiyemo Ikintu ku Izina: a Ibikubiyemo Ikintu "
+"Kuri Byahiswemo"
+
+#: info/infodoc.c:103
+#, fuzzy, c-format
+msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
+msgstr "%-10sa Kwambukiranya Indango Izina: Bya Indango"
+
+#: info/infodoc.c:104
+#, fuzzy, c-format
+msgid "  %-10s  Move to the last node seen in this window.\n"
+msgstr "%-10sKuri i Iheruka in iyi Idirishya"
+
+#: info/infodoc.c:105
+#, fuzzy, c-format
+msgid "  %-10s  Skip to next hypertext link within this node.\n"
+msgstr "%-10sKuri Komeza>> Ihuza muri iyi"
+
+#: info/infodoc.c:106
+#, fuzzy, c-format
+msgid "  %-10s  Follow the hypertext link under cursor.\n"
+msgstr "%-10si Ihuza indanga"
+
+#: info/infodoc.c:107
+#, fuzzy, c-format
+msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
+msgstr "%-10sKuri i Kuri g"
+
+#: info/infodoc.c:108
+#, fuzzy, c-format
+msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
+msgstr "%-10sKuri i Kuri g"
+
+#: info/infodoc.c:110
+#, fuzzy
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr "muri a"
+
+#: info/infodoc.c:112
+#, fuzzy, c-format
+msgid "  %-10s  Scroll forward a page.\n"
+msgstr "%-10sImbere a Ipaji"
+
+#: info/infodoc.c:113
+#, fuzzy, c-format
+msgid "  %-10s  Scroll backward a page.\n"
+msgstr "%-10ssubira inyuma a Ipaji"
+
+#: info/infodoc.c:114
+#, fuzzy, c-format
+msgid "  %-10s  Go to the beginning of this node.\n"
+msgstr "%-10sKuri i Itangiriro Bya iyi"
+
+#: info/infodoc.c:115
+#, fuzzy, c-format
+msgid "  %-10s  Go to the end of this node.\n"
+msgstr "%-10sKuri i Impera Bya iyi"
+
+#: info/infodoc.c:116
+#, fuzzy, c-format
+msgid "  %-10s  Scroll forward 1 line.\n"
+msgstr "%-10sImbere 1. Umurongo"
+
+#: info/infodoc.c:117
+#, fuzzy, c-format
+msgid "  %-10s  Scroll backward 1 line.\n"
+msgstr "%-10ssubira inyuma 1. Umurongo"
+
+#: info/infodoc.c:119
+#, fuzzy
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr "Amabwiriza"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
+msgstr "%-10sItangira Ikintu in Ibikubiyemo"
+
+#: info/infodoc.c:122
+#, fuzzy, c-format
+msgid "  %-10s  Pick last item in node's menu.\n"
+msgstr "%-10sIheruka Ikintu in Ibikubiyemo"
+
+#: info/infodoc.c:125
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search for a specified string in the index entries of this Info\n"
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"\\%-10 Umubarendanga Gushaka kugirango a Ikurikiranyanyuguti in i "
+"Umubarendanga Ibyinjijwe Bya iyi IDOSIYE Na Guhitamo i ku i Itangira "
+"Icyinjijwe Byabonetse"
+
+#: info/infodoc.c:127
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Move to node specified by name.\n"
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"\\%-10 Kuri ku Izina: Gicurasi Gushyiramo a Izina ry'idosiye: Nka Nka in"
+
+#: info/infodoc.c:129
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search forward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10 Gushaka Imbere kugirango a Na Guhitamo i in i Komeza>> ukugaragara ni "
+"Byabonetse"
+
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10 Gushaka Imbere kugirango a Na Guhitamo i in i Komeza>> ukugaragara ni "
+"Byabonetse"
+
+#: info/infodoc.c:312
+#, fuzzy
+msgid "The current search path is:\n"
+msgstr "KIGEZWEHO Gushaka Inzira ni"
+
+#: info/infodoc.c:316
+#, fuzzy
+msgid ""
+"Commands available in Info windows:\n"
+"\n"
+msgstr "Bihari in"
+
+#: info/infodoc.c:320
+#, fuzzy
+msgid ""
+"Commands available in the echo area:\n"
+"\n"
+msgstr "Bihari in i Ubuso"
+
+#: info/infodoc.c:343
+#, fuzzy, c-format
+msgid ""
+"The following commands can only be invoked via %s:\n"
+"\n"
+msgstr "Amabwiriza Biturutse"
+
+#: info/infodoc.c:347
+#, fuzzy
+msgid ""
+"The following commands cannot be invoked at all:\n"
+"\n"
+msgstr "Amabwiriza ku Byose"
+
+#: info/infodoc.c:477
+#, fuzzy
+msgid "Display help message"
+msgstr "Ifashayobora Ubutumwa"
+
+#: info/infodoc.c:495
+#, fuzzy
+msgid "Visit Info node `(info)Help'"
+msgstr "Ibisobanuro"
+
+#: info/infodoc.c:633
+#, fuzzy
+msgid "Print documentation for KEY"
+msgstr "kugirango"
+
+#: info/infodoc.c:645
+#, fuzzy, c-format
+msgid "Describe key: %s"
+msgstr "Urufunguzo"
+
+#: info/infodoc.c:656
+#, fuzzy, c-format
+msgid "ESC %s is undefined."
+msgstr "ni kidasobanuye"
+
+#: info/infodoc.c:672 info/infodoc.c:701
+#, fuzzy, c-format
+msgid "%s is undefined."
+msgstr "%sni kidasobanuye"
+
+#: info/infodoc.c:722
+#, fuzzy, c-format
+msgid "%s is defined to %s."
+msgstr "%sni Kuri"
+
+#: info/infodoc.c:1145
+#, fuzzy
+msgid "Show what to type to execute a given command"
+msgstr "Kuri Ubwoko Kuri Gukora a Komandi:"
+
+#: info/infodoc.c:1149
+#, fuzzy
+msgid "Where is command: "
+msgstr "ni Komandi:"
+
+#: info/infodoc.c:1171
+#, fuzzy, c-format
+msgid "`%s' is not on any keys"
+msgstr "`%s'ni OYA ku Utubuto"
+
+#: info/infodoc.c:1178
+#, fuzzy, c-format
+msgid "%s can only be invoked via %s."
+msgstr "%sBiturutse"
+
+#: info/infodoc.c:1182
+#, fuzzy, c-format
+msgid "%s can be invoked via %s."
+msgstr "%sBiturutse"
+
+#: info/infodoc.c:1187
+#, fuzzy, c-format
+msgid "There is no function named `%s'"
+msgstr "ni Oya Umumaro"
+
+#: info/infodoc.c:96
+#, fuzzy
+msgid ""
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr "Ikindi"
+
+#: info/infokey.c:170
+#, fuzzy
+msgid "incorrect number of arguments"
+msgstr "Umubare Bya ingingo"
+
+#: info/infokey.c:201
+#, fuzzy, c-format
+msgid "cannot open input file `%s'"
+msgstr "Gufungura Iyinjiza IDOSIYE"
+
+#: info/infokey.c:215
+#, fuzzy, c-format
+msgid "cannot create output file `%s'"
+msgstr "Kurema Ibisohoka IDOSIYE"
+
+#: info/infokey.c:226
+#, fuzzy, c-format
+msgid "error writing to `%s'"
+msgstr "Ikosa Kuri"
+
+#: info/infokey.c:232
+#, fuzzy, c-format
+msgid "error closing output file `%s'"
+msgstr "Ikosa Ibisohoka IDOSIYE"
+
+#: info/infokey.c:450
+#, fuzzy
+msgid "key sequence too long"
+msgstr "Urufunguzo"
+
+#: info/infokey.c:529
+#, fuzzy
+msgid "missing key sequence"
+msgstr "Ibuze Urufunguzo"
+
+#: info/infokey.c:610
+#, fuzzy
+msgid "NUL character (\\000) not permitted"
+msgstr "Inyuguti OYA"
+
+#: info/infokey.c:641
+#, fuzzy, c-format
+msgid "NUL character (^%c) not permitted"
+msgstr "Inyuguti OYA"
+
+#: info/infokey.c:665
+#, fuzzy
+msgid "missing action name"
+msgstr "Ibuze Igikorwa Izina:"
+
+#: info/infokey.c:681 info/infokey.c:756
+#, fuzzy
+msgid "section too long"
+msgstr "Icyiciro"
+
+#: info/infokey.c:688
+#, fuzzy, c-format
+msgid "unknown action `%s'"
+msgstr "Kitazwi Igikorwa"
+
+#: info/infokey.c:698
+#, fuzzy
+msgid "action name too long"
+msgstr "Igikorwa Izina:"
+
+#: info/infokey.c:712
+#, fuzzy, c-format
+msgid "extra characters following action `%s'"
+msgstr "Birenga Inyuguti Igikorwa"
+
+#: info/infokey.c:723
+#, fuzzy
+msgid "missing variable name"
+msgstr "Ibuze IMPINDURAGACIRO Izina:"
+
+#: info/infokey.c:733
+#, fuzzy
+msgid "missing `=' immediately after variable name"
+msgstr "Ibuze Ako kanya Nyuma IMPINDURAGACIRO Izina:"
+
+#: info/infokey.c:741
+#, fuzzy
+msgid "variable name too long"
+msgstr "IMPINDURAGACIRO Izina:"
+
+#: info/infokey.c:765
+#, fuzzy
+msgid "value too long"
+msgstr "Agaciro"
+
+#: info/infokey.c:890
+#, fuzzy, c-format
+msgid "\"%s\", line %u: "
+msgstr "\"%s\",Umurongo"
+
+#: info/infokey.c:906
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [OPTION]... [INPUT-FILE]\n"
+"\n"
+"Compile infokey source file to infokey file.  Reads INPUT-FILE (default\n"
+"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n"
+"\n"
+"Options:\n"
+"  --output FILE        output to FILE instead of $HOME/.info\n"
+"  --help               display this help and exit.\n"
+"  --version            display version information and exit.\n"
+msgstr "Ibisobanuro."
+
+#: info/infomap.c:955
+#, fuzzy, c-format
+msgid "Ignoring invalid infokey file `%s' - too small"
+msgstr "Kwirengagiza Sibyo IDOSIYE Gitoya"
+
+#: info/infomap.c:958
+#, fuzzy, c-format
+msgid "Ignoring invalid infokey file `%s' - too big"
+msgstr "Kwirengagiza Sibyo IDOSIYE"
+
+#: info/infomap.c:971
+#, fuzzy, c-format
+msgid "Error reading infokey file `%s' - short read"
+msgstr "IDOSIYE Gusoma"
+
+#: info/infomap.c:990
+#, fuzzy, c-format
+msgid ""
+"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
+msgstr "IDOSIYE Imibare Gukoresha Kuri Kuvugurura"
+
+#: info/infomap.c:999
+#, fuzzy, c-format
+msgid "Your infokey file `%s' is out of date -- run infokey to update it"
+msgstr "IDOSIYE ni Inyuma Bya Itariki Gukoresha Kuri Kuvugurura"
+
+#: info/infomap.c:1015
+#, fuzzy, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section length) -- run infokey to update it"
+msgstr "IDOSIYE Icyiciro Uburebure Gukoresha Kuri Kuvugurura"
+
+#: info/infomap.c:1036
+#, fuzzy, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section code) -- run infokey to update it"
+msgstr "IDOSIYE Icyiciro ITEGEKONGENGA Gukoresha Kuri Kuvugurura"
+
+#: info/infomap.c:1171
+#, fuzzy
+msgid "Bad data in infokey file -- some key bindings ignored"
+msgstr "Ibyatanzwe in IDOSIYE Urufunguzo Ibyafataranyijwe"
+
+#: info/infomap.c:1221
+#, fuzzy
+msgid "Bad data in infokey file -- some var settings ignored"
+msgstr "Ibyatanzwe in IDOSIYE VAR Amagenamiterere"
+
+#: info/m-x.c:68
+#, fuzzy
+msgid "Read the name of an Info command and describe it"
+msgstr "i Izina: Bya Komandi: Na"
+
+#: info/m-x.c:72
+#, fuzzy
+msgid "Describe command: "
+msgstr "Komandi:"
+
+#: info/m-x.c:95
+#, fuzzy
+msgid "Read a command name in the echo area and execute it"
+msgstr "a Komandi: Izina: in i Ubuso Na Gukora"
+
+#: info/m-x.c:139
+#, fuzzy
+msgid "Cannot execute an `echo-area' command here."
+msgstr "Gukora Komandi:"
+
+#: info/m-x.c:153
+#, fuzzy, c-format
+msgid "Undefined command: %s"
+msgstr "Komandi:"
+
+#: info/m-x.c:159
+#, fuzzy
+msgid "Set the height of the displayed window"
+msgstr "i Ubuhagarike Bya i Idirishya"
+
+#: info/m-x.c:172
+#, fuzzy, c-format
+msgid "Set screen height to (%d): "
+msgstr "Mugaragaza Ubuhagarike Kuri"
+
+#: info/makedoc.c:166 info/makedoc.c:174
+#, fuzzy, c-format
+msgid ""
+"   Source files groveled to make this file include:\n"
+"\n"
+msgstr "Idosiye Kuri Ubwoko iyi IDOSIYE Gushyiramo"
+
+#: info/makedoc.c:556
+#, fuzzy, c-format
+msgid "Couldn't manipulate the file %s.\n"
+msgstr "i IDOSIYE"
+
+#: info/nodemenu.c:30
+#, fuzzy
+msgid ""
+"\n"
+"* Menu:\n"
+"  (File)Node                        Lines   Size   Containing File\n"
+"  ----------                        -----   ----   ---------------"
+msgstr "*Idosiye"
+
+#: info/nodemenu.c:201
+#, fuzzy
+msgid ""
+"Here is the menu of nodes you have recently visited.\n"
+"Select one from this menu, or use `\\[history-node]' in another window.\n"
+msgstr ""
+"ni i Ibikubiyemo Bya Bivuye iyi Ibikubiyemo Cyangwa Gukoresha Urutonde in "
+"Idirishya"
+
+#: info/nodemenu.c:223
+#, fuzzy
+msgid "Make a window containing a menu of all of the currently visited nodes"
+msgstr "a Idirishya a Ibikubiyemo Bya Byose Bya i"
+
+#: info/nodemenu.c:303
+#, fuzzy
+msgid "Select a node which has been previously visited in a visible window"
+msgstr "a in a Kigaragara Idirishya"
+
+#: info/nodemenu.c:316
+msgid "Select visited node: "
+msgstr ""
+
+#: info/nodemenu.c:336 info/session.c:2443
+#, fuzzy, c-format
+msgid "The reference disappeared! (%s)."
+msgstr "Indango"
+
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
+#, fuzzy, c-format
+msgid ""
+"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
+"for menu item."
+msgstr ""
+"Kuri Verisiyo Kubona Ifashayobora Idirishya kugirango Ifashayobora "
+"Ibikubiyemo Ikintu kugirango Ibikubiyemo Ikintu"
+
+#: info/session.c:625
+#, fuzzy
+msgid "Move down to the next line"
+msgstr "Hasi Kuri i Komeza>> Umurongo"
+
+#: info/session.c:661
+#, fuzzy
+msgid "Move up to the previous line"
+msgstr "Hejuru Kuri i Ibanjirije Umurongo"
+
+#: info/session.c:696
+#, fuzzy
+msgid "Move to the end of the line"
+msgstr "Kuri i Impera Bya i Umurongo"
+
+#: info/session.c:716
+#, fuzzy
+msgid "Move to the start of the line"
+msgstr "Kuri i Gutangira Bya i Umurongo"
+
+#: info/session.c:1007
+msgid "Next"
+msgstr "Ikurikira"
+
+#: info/session.c:1023 info/session.c:1148
+#, fuzzy
+msgid "No more nodes within this document."
+msgstr "Birenzeho muri iyi Inyandiko"
+
+#: info/session.c:1174
+#, fuzzy
+msgid "No `Prev' for this node."
+msgstr "kugirango iyi"
+
+#: info/session.c:1194
+#, fuzzy
+msgid "No `Prev' or `Up' for this node within this document."
+msgstr "Cyangwa kugirango iyi muri iyi Inyandiko"
+
+#: info/session.c:1256
+#, fuzzy
+msgid "Move forwards or down through node structure"
+msgstr "Cyangwa Hasi Gihinguranya Imiterere"
+
+#: info/session.c:1272
+#, fuzzy
+msgid "Move backwards or up through node structure"
+msgstr "Inyuma Cyangwa Hejuru Gihinguranya Imiterere"
+
+#: info/session.c:1373
+#, fuzzy
+msgid "Scroll forward in this window"
+msgstr "Imbere in iyi Idirishya"
+
+#: info/session.c:1381
+#, fuzzy
+msgid "Scroll forward in this window and set default window size"
+msgstr "Imbere in iyi Idirishya Na Gushyiraho Mburabuzi Idirishya Ingano"
+
+#: info/session.c:1389
+#, fuzzy
+msgid "Scroll forward in this window staying within node"
+msgstr "Imbere in iyi Idirishya muri"
+
+#: info/session.c:1397
+#, fuzzy
+msgid ""
+"Scroll forward in this window staying within node and set default window size"
+msgstr "Imbere in iyi Idirishya muri Na Gushyiraho Mburabuzi Idirishya Ingano"
+
+#: info/session.c:1405
+#, fuzzy
+msgid "Scroll backward in this window"
+msgstr "subira inyuma in iyi Idirishya"
+
+#: info/session.c:1413
+#, fuzzy
+msgid "Scroll backward in this window and set default window size"
+msgstr ""
+"subira inyuma in iyi Idirishya Na Gushyiraho Mburabuzi Idirishya Ingano"
+
+#: info/session.c:1422
+#, fuzzy
+msgid "Scroll backward in this window staying within node"
+msgstr "subira inyuma in iyi Idirishya muri"
+
+#: info/session.c:1430
+#, fuzzy
+msgid ""
+"Scroll backward in this window staying within node and set default window "
+"size"
+msgstr ""
+"subira inyuma in iyi Idirishya muri Na Gushyiraho Mburabuzi Idirishya Ingano"
+
+#: info/session.c:1438
+#, fuzzy
+msgid "Move to the start of this node"
+msgstr "Kuri i Gutangira Bya iyi"
+
+#: info/session.c:1445
+#, fuzzy
+msgid "Move to the end of this node"
+msgstr "Kuri i Impera Bya iyi"
+
+#: info/session.c:1452
+#, fuzzy
+msgid "Scroll down by lines"
+msgstr "Hasi ku Imirongo"
+
+#: info/session.c:1469
+#, fuzzy
+msgid "Scroll up by lines"
+msgstr "Hejuru ku Imirongo"
+
+#: info/session.c:1487
+#, fuzzy
+msgid "Scroll down by half screen size"
+msgstr "Hasi ku Mugaragaza Ingano"
+
+#: info/session.c:1513
+#, fuzzy
+msgid "Scroll up by half screen size"
+msgstr "Hejuru ku Mugaragaza Ingano"
+
+#: info/session.c:1542
+#, fuzzy
+msgid "Select the next window"
+msgstr "i Komeza>> Idirishya"
+
+#: info/session.c:1581
+#, fuzzy
+msgid "Select the previous window"
+msgstr "i Ibanjirije Idirishya"
+
+#: info/session.c:1632
+#, fuzzy
+msgid "Split the current window"
+msgstr "i KIGEZWEHO Idirishya"
+
+#: info/session.c:1713
+#, fuzzy
+msgid "Delete the current window"
+msgstr "i KIGEZWEHO Idirishya"
+
+#: info/session.c:1721
+#, fuzzy
+msgid "Cannot delete a permanent window"
+msgstr "Gusiba a Idirishya"
+
+#: info/session.c:1753
+#, fuzzy
+msgid "Delete all other windows"
+msgstr "Byose Ikindi"
+
+#: info/session.c:1799
+#, fuzzy
+msgid "Scroll the other window"
+msgstr "i Ikindi Idirishya"
+
+#: info/session.c:1820
+#, fuzzy
+msgid "Scroll the other window backward"
+msgstr "i Ikindi Idirishya subira inyuma"
+
+#: info/session.c:1826
+#, fuzzy
+msgid "Grow (or shrink) this window"
+msgstr "Cyangwa Kugabanuka iyi Idirishya"
+
+#: info/session.c:1837
+#, fuzzy
+msgid "Divide the available screen space among the visible windows"
+msgstr "i Bihari Mugaragaza Umwanya i Kigaragara"
+
+#: info/session.c:1844
+#, fuzzy
+msgid "Toggle the state of line wrapping in the current window"
+msgstr "i Leta Bya Umurongo in i KIGEZWEHO Idirishya"
+
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
+#, fuzzy
+msgid "Select the Next node"
+msgstr "i"
+
+#: info/session.c:2035
+#, fuzzy
+msgid "Select the Prev node"
+msgstr "i"
+
+#: info/session.c:2043
+#, fuzzy
+msgid "Select the Up node"
+msgstr "i"
+
+#: info/session.c:2050
+#, fuzzy
+msgid "Select the last node in this file"
+msgstr "i Iheruka in iyi IDOSIYE"
+
+#: info/session.c:2077 info/session.c:2110
+#, fuzzy
+msgid "This window has no additional nodes"
+msgstr "Idirishya Oya"
+
+#: info/session.c:2083
+#, fuzzy
+msgid "Select the first node in this file"
+msgstr "i Itangira in iyi IDOSIYE"
+
+#: info/session.c:2117
+#, fuzzy
+msgid "Select the last item in this node's menu"
+msgstr "i Iheruka Ikintu in iyi Ibikubiyemo"
+
+#: info/session.c:2123
+#, fuzzy
+msgid "Select this menu item"
+msgstr "iyi Ibikubiyemo Ikintu"
+
+#: info/session.c:2156
+#, fuzzy, c-format
+msgid "There aren't %d items in this menu."
+msgstr "in iyi Ibikubiyemo"
+
+#: info/session.c:2350 info/session.c:2351
+#, fuzzy, c-format
+msgid "Menu item (%s): "
+msgstr "Ikintu"
+
+#: info/session.c:2354
+#, fuzzy
+msgid "Menu item: "
+msgstr "Ikintu"
+
+#: info/session.c:2361 info/session.c:2362
+#, fuzzy, c-format
+msgid "Follow xref (%s): "
+msgstr "X- Ngenderwaho"
+
+#: info/session.c:2365
+#, fuzzy
+msgid "Follow xref: "
+msgstr "X- Ngenderwaho"
+
+#: info/session.c:2494
+#, fuzzy
+msgid "Read a menu item and select its node"
+msgstr "a Ibikubiyemo Ikintu Na Guhitamo"
+
+#: info/session.c:2502
+#, fuzzy
+msgid "Read a footnote or cross reference and select its node"
+msgstr "a Ubusobanuro mpezarupapuro Cyangwa Kwambukiranya Indango Na Guhitamo"
+
+#: info/session.c:2508
+#, fuzzy
+msgid "Move to the start of this node's menu"
+msgstr "Kuri i Gutangira Bya iyi Ibikubiyemo"
+
+#: info/session.c:2532
+#, fuzzy
+msgid "Visit as many menu items at once as possible"
+msgstr "Nka Ibikubiyemo ku Rimwe Nka"
+
+#: info/session.c:2560
+#, fuzzy
+msgid "Read a node name and select it"
+msgstr "a Izina: Na Guhitamo"
+
+#: info/session.c:2615 info/session.c:2620
+msgid "Goto node: "
+msgstr ""
+
+#: info/session.c:2684
+#, fuzzy, c-format
+msgid "No menu in node `%s'."
+msgstr "Ibikubiyemo in"
+
+#: info/session.c:2730
+#, fuzzy, c-format
+msgid "No menu item `%s' in node `%s'."
+msgstr "Ibikubiyemo Ikintu in"
+
+#: info/session.c:2760
+#, fuzzy, c-format
+msgid "Unable to find node referenced by `%s' in `%s'."
+msgstr "Kuri Gushaka ku in"
+
+#: info/session.c:2810
+#, fuzzy
+msgid "Read a list of menus starting from dir and follow them"
+msgstr "a Urutonde Bya Ibikubiyemo Bivuye Na"
+
+#: info/session.c:2812
+#, fuzzy
+msgid "Follow menus: "
+msgstr "Ibikubiyemo"
+
+#: info/session.c:3005
+#, fuzzy
+msgid "Find the node describing program invocation"
+msgstr "i Porogaramu"
+
+#: info/session.c:3007
+#, fuzzy, c-format
+msgid "Find Invocation node of [%s]: "
+msgstr "Bya"
+
+#: info/session.c:3045
+#, fuzzy
+msgid "Read a manpage reference and select it"
+msgstr "a Indango Na Guhitamo"
+
+#: info/session.c:3049
+msgid "Get Manpage: "
+msgstr ""
+
+#: info/session.c:3079
+#, fuzzy
+msgid "Select the node `Top' in this file"
+msgstr "i in iyi IDOSIYE"
+
+#: info/session.c:3085
+#, fuzzy
+msgid "Select the node `(dir)'"
+msgstr "i"
+
+#: info/session.c:3102 info/session.c:3104
+#, c-format
+msgid "Kill node (%s): "
+msgstr ""
+
+#: info/session.c:3156
+#, c-format
+msgid "Cannot kill node `%s'"
+msgstr ""
+
+#: info/session.c:3166
+#, fuzzy
+msgid "Cannot kill the last node"
+msgstr "i Iheruka"
+
+#: info/session.c:3252
+#, fuzzy
+msgid "Select the most recently selected node"
+msgstr "i Byahiswemo"
+
+#: info/session.c:3258
+#, fuzzy
+msgid "Kill this node"
+msgstr "iyi"
+
+#: info/session.c:3266
+#, fuzzy
+msgid "Read the name of a file and select it"
+msgstr "i Izina: Bya a IDOSIYE Na Guhitamo"
+
+#: info/session.c:3270
+#, fuzzy
+msgid "Find file: "
+msgstr "IDOSIYE"
+
+#: info/session.c:3287
+#, fuzzy, c-format
+msgid "Cannot find `%s'."
+msgstr "Gushaka"
+
+#: info/session.c:3330 info/session.c:3448
+#, fuzzy, c-format
+msgid "Could not create output file `%s'."
+msgstr "OYA Kurema Ibisohoka IDOSIYE"
+
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
+msgid "Done."
+msgstr "Byakozwe."
+
+#: info/session.c:3399
+#, c-format
+msgid "Writing node %s..."
+msgstr ""
+
+#: info/session.c:3475
+#, fuzzy
+msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+msgstr "i Ibigize Bya iyi Gihinguranya"
+
+#: info/session.c:3510
+#, fuzzy, c-format
+msgid "Cannot open pipe to `%s'."
+msgstr "Gufungura Kuri"
+
+#: info/session.c:3516
+#, c-format
+msgid "Printing node %s..."
+msgstr ""
+
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "Kuri i Itangiriro Bya i Umurongo"
+
+#: info/session.c:3755
+#, c-format
+msgid "Searching subfile %s ..."
+msgstr ""
+
+#: info/session.c:3812
+#, fuzzy
+msgid "Read a string and search for it case-sensitively"
+msgstr "a Ikurikiranyanyuguti Na Gushaka kugirango"
+
+#: info/session.c:3819
+#, fuzzy
+msgid "Read a string and search for it"
+msgstr "a Ikurikiranyanyuguti Na Gushaka kugirango"
+
+#: info/session.c:3827
+#, fuzzy
+msgid "Read a string and search backward for it"
+msgstr "a Ikurikiranyanyuguti Na Gushaka subira inyuma kugirango"
+
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
+msgstr "%s%sforIkurikiranyanyuguti"
+
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+msgid " case-sensitively"
+msgstr ""
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
+msgstr "Gushaka usubira inyuma"
+
+#: info/session.c:3870
+msgid "Search"
+msgstr "Gushaka"
+
+#: info/session.c:3911
+#, fuzzy
+msgid "Search failed."
+msgstr "Byanze"
+
+#: info/session.c:3929
+#, fuzzy
+msgid "Repeat last search in the same direction"
+msgstr "Iheruka Gushaka in i Icyerekezo"
+
+#: info/session.c:3932 info/session.c:3942
+#, fuzzy
+msgid "No previous search string"
+msgstr "Ibanjirije Gushaka Ikurikiranyanyuguti"
+
+#: info/session.c:3939
+#, fuzzy
+msgid "Repeat last search in the reverse direction"
+msgstr "Iheruka Gushaka in i Ihindurakerekezo Icyerekezo"
+
+#: info/session.c:3958 info/session.c:3964
+#, fuzzy
+msgid "Search interactively for a string as you type it"
+msgstr "kugirango a Ikurikiranyanyuguti Nka Ubwoko"
+
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "Gushaka subira inyuma"
+
+#: info/session.c:4045
+#, fuzzy
+msgid "I-search backward: "
+msgstr "Gushaka subira inyuma"
+
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "Gushaka"
+
+#: info/session.c:4048
+#, fuzzy
+msgid "I-search: "
+msgstr "Gushaka"
+
+#: info/session.c:4073 info/session.c:4075
+msgid "Failing "
+msgstr ""
+
+#: info/session.c:4560
+#, fuzzy
+msgid "Move to the previous cross reference"
+msgstr "Kuri i Ibanjirije Kwambukiranya Indango"
+
+#: info/session.c:4578
+#, fuzzy
+msgid "Move to the next cross reference"
+msgstr "Kuri i Komeza>> Kwambukiranya Indango"
+
+#: info/session.c:4600
+#, fuzzy
+msgid "Select reference or menu item appearing on this line"
+msgstr "Indango Cyangwa Ibikubiyemo Ikintu ku iyi Umurongo"
+
+#: info/session.c:4623
+#, fuzzy
+msgid "Cancel current operation"
+msgstr "KIGEZWEHO"
+
+#: info/session.c:4630
+msgid "Quit"
+msgstr "Kuvamo"
+
+#: info/session.c:4639
+#, fuzzy
+msgid "Move the cursor to a specific line of the window"
+msgstr "i indanga Kuri a Umurongo Bya i Idirishya"
+
+#: info/session.c:4671
+#, fuzzy
+msgid "Redraw the display"
+msgstr "i Kugaragaza"
+
+#: info/session.c:4708
+#, fuzzy
+msgid "Quit using Info"
+msgstr "ikoresha"
+
+#: info/session.c:4721
+#, fuzzy
+msgid "Run command bound to this key's lowercase variant"
+msgstr "Komandi: Kuri iyi Inyuguti nto"
+
+#: info/session.c:4732
+#, fuzzy, c-format
+msgid "Unknown command (%s)."
+msgstr "Komandi:"
+
+#: info/session.c:4735
+#, fuzzy, c-format
+msgid "\"%s\" is invalid"
+msgstr "\"%s\"ni Sibyo"
+
+#: info/session.c:4736
+#, fuzzy, c-format
+msgid "`%s' is invalid"
+msgstr "`%s'ni Sibyo"
+
+#: info/session.c:4950
+#, fuzzy
+msgid "Add this digit to the current numeric argument"
+msgstr "iyi Kuri i KIGEZWEHO Bikurikije umubare"
+
+#: info/session.c:4959
+#, fuzzy
+msgid "Start (or multiply by 4) the current numeric argument"
+msgstr "Gutangira Cyangwa Gukuba ku 4. i KIGEZWEHO Bikurikije umubare"
+
+#: info/session.c:4974
+#, fuzzy
+msgid "Internally used by \\[universal-argument]"
+msgstr "ku Ky'isi yose"
+
+#: info/tilde.c:336
+#, fuzzy, c-format
+msgid "readline: Out of virtual memory!\n"
+msgstr "Bya Kitaboneka Ububiko"
+
+#: info/variables.c:37
+#, fuzzy
+msgid "When \"On\", footnotes appear and disappear automatically"
+msgstr "Ubusobanuro mpezarupapuro Kugaragara Na Kubura ku buryo bwikora"
+
+#: info/variables.c:41
+#, fuzzy
+msgid "When \"On\", creating or deleting a window resizes other windows"
+msgstr "Cyangwa a Idirishya Ikindi"
+
+#: info/variables.c:45
+#, fuzzy
+msgid "When \"On\", flash the screen instead of ringing the bell"
+msgstr "Umurabyo i Mugaragaza Bya i"
+
+#: info/variables.c:49
+#, fuzzy
+msgid "When \"On\", errors cause the bell to ring"
+msgstr "Amakosa i Kuri Kuvuza Inzogera"
+
+#: info/variables.c:53
+#, fuzzy
+msgid "When \"On\", Info garbage collects files which had to be uncompressed"
+msgstr "Idosiye Kuri"
+
+#: info/variables.c:56
+#, fuzzy
+msgid "When \"On\", the portion of the matched search string is highlighted"
+msgstr "i Bya i Gushaka Ikurikiranyanyuguti ni"
+
+#: info/variables.c:60
+#, fuzzy
+msgid "Controls what happens when scrolling is requested at the end of a node"
+msgstr "Ryari: ni ku i Impera Bya a"
+
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
+#, fuzzy
+msgid "The number lines to scroll when the cursor moves out of the window"
+msgstr "Umubare Imirongo Kuri Ryari: i indanga Inyuma Bya i Idirishya"
+
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
+#, fuzzy
+msgid "When \"On\", Info accepts and displays ISO Latin characters"
+msgstr "Na Inyuguti"
+
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "Ryari: ni ku i Impera Bya a"
+
+#: info/variables.c:88
+#, fuzzy
+msgid "Explain the use of a variable"
+msgstr "i Gukoresha Bya a IMPINDURAGACIRO"
+
+#: info/variables.c:94
+#, fuzzy
+msgid "Describe variable: "
+msgstr "IMPINDURAGACIRO"
+
+#: info/variables.c:113
+#, fuzzy
+msgid "Set the value of an Info variable"
+msgstr "i Agaciro Bya IMPINDURAGACIRO"
+
+# sw/source\ui\fldui\fldui.src:STR_SETFLD.text
+#: info/variables.c:119
+#, fuzzy
+msgid "Set variable: "
+msgstr "Gushyiraho igihinduka"
+
+#: info/variables.c:137
+#, fuzzy, c-format
+msgid "Set %s to value (%d): "
+msgstr "Kuri Agaciro"
+
+#: info/variables.c:178
+#, fuzzy, c-format
+msgid "Set %s to value (%s): "
+msgstr "Kuri Agaciro"
+
+#: info/window.c:1150
+#, fuzzy
+msgid "--*** Tags out of Date ***"
+msgstr "--***Inyuma Bya"
+
+#: info/window.c:1161
+#, fuzzy
+msgid "-----Info: (), lines ----, "
+msgstr "-----Imirongo"
+
+#: info/window.c:1168
+#, fuzzy, c-format
+msgid "-%s---Info: %s, %d lines --%s--"
+msgstr "-%s---Info:%s,%dImirongo"
+
+#: info/window.c:1172
+#, fuzzy, c-format
+msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+msgstr "-%s%s-Info:(%s)%s,%dImirongo"
+
+#: info/window.c:1179
+#, c-format
+msgid " Subfile: %s"
+msgstr ""
+
+#: install-info/install-info.c:221
+#, fuzzy, c-format
+msgid "%s: warning: "
+msgstr "%s:Iburira"
+
+#: install-info/install-info.c:270
+#, fuzzy, c-format
+msgid " for %s"
+msgstr "ya:"
+
+#: install-info/install-info.c:500
+#, fuzzy, c-format
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "kugirango a Byuzuye Urutonde Bya Amahitamo"
+
+#: install-info/install-info.c:508
+#, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr ""
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr "org."
+
+#: install-info/install-info.c:597
+#, fuzzy, c-format
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"ni i IDOSIYE Ibisobanuro Kirimo Bya i Itangira Igihe Gutangira Bidakora ku "
+"iyi ni i Hejuru: Bya i i a Ibikubiyemo Bya Q Intonde Byose Amabwiriza D h a "
+"kugirango Itangira i Bikorwa Kanda Imbeba Akabuto 2. ku a Ibikubiyemo Ikintu "
+"Cyangwa Kwambukiranya Kuri Guhitamo"
+
+#: install-info/install-info.c:622
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s:OYA Gusoma Na OYA Kurema"
+
+#: install-info/install-info.c:715
+#, fuzzy, c-format
+msgid "%s: empty file"
+msgstr "%s:ubusa IDOSIYE"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr ""
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr ""
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
+#, fuzzy, c-format
+msgid "%s: already have dir file: %s\n"
+msgstr "%s:IDOSIYE"
+
+#: install-info/install-info.c:2026
+#, fuzzy, c-format
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s:i IDOSIYE Rimwe"
+
+#: install-info/install-info.c:2059
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: install-info/install-info.c:2071
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: install-info/install-info.c:2129
+#, fuzzy, c-format
+msgid "excess command line argument `%s'"
+msgstr "Komandi: Umurongo"
+
+#: install-info/install-info.c:2133
+#, fuzzy
+msgid "No input file specified; try --help for more information."
+msgstr "Iyinjiza IDOSIYE Ifashayobora kugirango Birenzeho Ibisobanuro"
+
+#: install-info/install-info.c:2136
+#, fuzzy
+msgid "No dir file specified; try --help for more information."
+msgstr "IDOSIYE Ifashayobora kugirango Birenzeho Ibisobanuro"
+
+#: install-info/install-info.c:2278
+#, fuzzy, c-format
+msgid "no info dir entry in `%s'"
+msgstr "Oya Ibisobanuro Icyinjijwe in"
+
+#: install-info/install-info.c:2526
+#, fuzzy, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "Oya Ibyinjijwe Byabonetse kugirango Cyasibwe"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
+#, fuzzy, c-format
+msgid "arguments to @%s ignored"
+msgstr "ingingo Kuri"
+
+#: makeinfo/cmds.c:779
+msgid "January"
+msgstr "Mutarama"
+
+#: makeinfo/cmds.c:779
+msgid "February"
+msgstr "Gashyantare"
+
+#: makeinfo/cmds.c:779
+msgid "March"
+msgstr "Werurwe"
+
+#: makeinfo/cmds.c:779
+msgid "April"
+msgstr "Mata"
+
+#: makeinfo/cmds.c:779
+msgid "May"
+msgstr "Gicurasi"
+
+#: makeinfo/cmds.c:780
+msgid "June"
+msgstr "Kamena"
+
+#: makeinfo/cmds.c:780
+msgid "July"
+msgstr "Nyakanga"
+
+#: makeinfo/cmds.c:780
+msgid "August"
+msgstr "Kanama"
+
+#: makeinfo/cmds.c:780
+msgid "September"
+msgstr "Nzeri"
+
+#: makeinfo/cmds.c:780
+msgid "October"
+msgstr "Ukwakira"
+
+#: makeinfo/cmds.c:781
+msgid "November"
+msgstr "Ugushyingo"
+
+#: makeinfo/cmds.c:781
+msgid "December"
+msgstr "Ukuboza"
+
+#: makeinfo/cmds.c:1131
+#, fuzzy, c-format
+msgid "unlikely character %c in @var"
+msgstr "Inyuguti in VAR"
+
+#: makeinfo/cmds.c:1174
+#, fuzzy
+msgid "@sc argument all uppercase, thus no effect"
+msgstr "@Byose Inyuguti nkuru Oya INGARUKA"
+
+#: makeinfo/cmds.c:1229
+#, fuzzy, c-format
+msgid "`{' expected, but saw `%c'"
+msgstr "`{'Ikitezwe:"
+
+#: makeinfo/cmds.c:1269
+#, fuzzy
+msgid "end of file inside verb block"
+msgstr "Impera Bya IDOSIYE Mo Imbere Ishinga Funga"
+
+#: makeinfo/cmds.c:1277
+#, fuzzy, c-format
+msgid "`}' expected, but saw `%c'"
+msgstr "`}'Ikitezwe:"
+
+#: makeinfo/cmds.c:1308
+#, fuzzy
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr "@a Kwambukiranya Indango in Kuri"
+
+#: makeinfo/cmds.c:1504
+#, fuzzy, c-format
+msgid "%c%s is obsolete"
+msgstr "%c%sni"
+
+#: makeinfo/cmds.c:1612
+#, fuzzy, c-format
+msgid "@sp requires a positive numeric argument, not `%s'"
+msgstr "@SP a Bikurikije umubare OYA"
+
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
+#, fuzzy, c-format
+msgid "Bad argument to %c%s"
+msgstr "Kuri"
+
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
+msgid "asis"
+msgstr ""
+
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
+msgid "none"
+msgstr "ntacyo"
+
+#: makeinfo/cmds.c:2049
+#, fuzzy, c-format
+msgid "Bad argument to @%s"
+msgstr "Kuri"
+
+# basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.RID_INSERT.text
+#: makeinfo/cmds.c:2063
+#, fuzzy
+msgid "insert"
+msgstr "Kongeramo"
+
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Kuri"
+
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
+
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
+
+#: makeinfo/defun.c:83
+#, fuzzy
+msgid "Missing `}' in @def arg"
+msgstr "in"
+
+#: makeinfo/defun.c:711
+#, fuzzy, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "in Kuri Gukoresha"
+
+#: makeinfo/files.c:434
+#, c-format
+msgid "%s: getwd: %s, %s\n"
+msgstr ""
+
+#: makeinfo/files.c:637
+#, fuzzy, c-format
+msgid "`%s' omitted before output filename"
+msgstr "`%s'Mbere Ibisohoka Izina ry'idosiye:"
+
+#: makeinfo/files.c:645
+#, fuzzy, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr "`%s'guhera Kuri"
+
+#: makeinfo/files.c:693
+#, fuzzy
+msgid "Output buffer not empty."
+msgstr "OYA ubusa"
+
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr ""
+
+#: makeinfo/footnote.c:149
+#, fuzzy, c-format
+msgid "`%c%s' needs an argument `{...}', not just `%s'"
+msgstr "`%c%s'OYA"
+
+#: makeinfo/footnote.c:164
+#, fuzzy, c-format
+msgid "No closing brace for footnote `%s'"
+msgstr "kugirango Ubusobanuro mpezarupapuro"
+
+#: makeinfo/footnote.c:197
+msgid "Footnote defined without parent node"
+msgstr ""
+
+#: makeinfo/footnote.c:209
+#, fuzzy
+msgid "Footnotes inside footnotes are not allowed"
+msgstr "Mo Imbere Ubusobanuro mpezarupapuro OYA"
+
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
+msgid "Footnotes"
+msgstr "Ubusobanuro mpezarupapuro"
+
+#: makeinfo/html.c:86
+#, fuzzy, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s:OYA Gufungura IDOSIYE"
+
+#: makeinfo/html.c:175
+#, fuzzy, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d:--IDOSIYE in Icyo wongeraho"
+
+#: makeinfo/html.c:421
+#, fuzzy
+msgid "[unexpected] no html tag to pop"
+msgstr "[Oya HTML Itagi: Kuri"
+
+#: makeinfo/html.c:764
+#, fuzzy, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[Sibyo Izina:"
+
+#: makeinfo/index.c:167
+#, fuzzy, c-format
+msgid "Unknown index `%s'"
+msgstr "Umubarendanga"
+
+#: makeinfo/index.c:232
+#, fuzzy, c-format
+msgid "Info cannot handle `:' in index entry `%s'"
+msgstr "in Umubarendanga Icyinjijwe"
+
+#: makeinfo/index.c:410
+#, c-format
+msgid "Index `%s' already exists"
+msgstr ""
+
+#: makeinfo/index.c:453
+#, fuzzy, c-format
+msgid "Unknown index `%s' and/or `%s' in @synindex"
+msgstr "Umubarendanga Na Cyangwa in"
+
+#: makeinfo/index.c:676
+#, fuzzy
+msgid "(line )"
+msgstr "(Umurongo"
+
+#: makeinfo/index.c:684
+#, fuzzy, c-format
+msgid "(line %*d)"
+msgstr "(Umurongo"
+
+#: makeinfo/index.c:764
+#, fuzzy, c-format
+msgid "Unknown index `%s' in @printindex"
+msgstr "Umubarendanga in"
+
+#: makeinfo/index.c:833
+#, fuzzy, c-format
+msgid "Entry for index `%s' outside of any node"
+msgstr "kugirango Umubarendanga Hanze Bya"
+
+#: makeinfo/index.c:836 makeinfo/index.c:872
+#, fuzzy
+msgid "(outside of any node)"
+msgstr "(Hanze Bya"
+
+#: makeinfo/insertion.c:161
+#, fuzzy
+msgid "@item not allowed in argument to @itemize"
+msgstr "@Ikintu OYA in Kuri"
+
+#: makeinfo/insertion.c:242
+#, fuzzy
+msgid "Broken-Type in insertion_type_pname"
+msgstr "in"
+
+#: makeinfo/insertion.c:338
+#, fuzzy
+msgid "Enumeration stack overflow"
+msgstr "Byarenze urugero"
+
+#: makeinfo/insertion.c:370
+#, fuzzy, c-format
+msgid "lettering overflow, restarting at %c"
+msgstr "Byarenze urugero ku"
+
+#: makeinfo/insertion.c:639
+#, fuzzy, c-format
+msgid "%s requires an argument: the formatter for %citem"
+msgstr "%si kugirango"
+
+#: makeinfo/insertion.c:727
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:981
+#, fuzzy, c-format
+msgid "`@end' expected `%s', but saw `%s'"
+msgstr "`@Ikitezwe:"
+
+#: makeinfo/insertion.c:1349
+#, c-format
+msgid "No matching `%cend %s'"
+msgstr ""
+
+#: makeinfo/insertion.c:1618
+#, fuzzy, c-format
+msgid "%s requires letter or digit"
+msgstr "%sIbaruwa... Cyangwa"
+
+#: makeinfo/insertion.c:1718
+#, fuzzy
+msgid "end of file inside verbatim block"
+msgstr "Impera Bya IDOSIYE Mo Imbere Funga"
+
+#: makeinfo/insertion.c:1942
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%sOYA Hanze"
+
+#: makeinfo/insertion.c:1978
+#, fuzzy
+msgid "@menu seen before first @node, creating `Top' node"
+msgstr "@Ibikubiyemo Mbere Itangira"
+
+#: makeinfo/insertion.c:1979
+#, fuzzy
+msgid ""
+"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
+msgstr "Hejuru: in"
+
+#: makeinfo/insertion.c:1991
+#, fuzzy
+msgid "@detailmenu seen before first node, creating `Top' node"
+msgstr "@Mbere Itangira"
+
+#: makeinfo/insertion.c:2047
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%sOYA Hanze Na"
+
+#: makeinfo/insertion.c:2061
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%sOYA Hanze"
+
+#: makeinfo/insertion.c:2092
+#, c-format
+msgid "Unmatched `%c%s'"
+msgstr ""
+
+#: makeinfo/insertion.c:2097
+#, fuzzy, c-format
+msgid "`%c%s' needs something after it"
+msgstr "`%c%s'Nyuma"
+
+#: makeinfo/insertion.c:2103
+#, fuzzy, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "Kuri ikoresha"
+
+#: makeinfo/insertion.c:2200
+#, fuzzy, c-format
+msgid "@%s not meaningful inside `@%s' block"
+msgstr "@%sOYA Mo Imbere Funga"
+
+#: makeinfo/insertion.c:2209
+#, fuzzy, c-format
+msgid "@itemx not meaningful inside `%s' block"
+msgstr "@OYA Mo Imbere Funga"
+
+#: makeinfo/insertion.c:2383
+#, fuzzy, c-format
+msgid "%c%s found outside of an insertion block"
+msgstr "%c%sByabonetse Hanze Bya Iyinjizamo Funga"
+
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
+#, fuzzy, c-format
+msgid "%s is not a valid ISO 639 language code"
+msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
+
+#: makeinfo/lang.c:1399
+#, fuzzy, c-format
+msgid "unrecognized encoding name `%s'"
+msgstr "Imisobekere: Izina:"
+
+#: makeinfo/lang.c:1407
+#, fuzzy, c-format
+msgid "sorry, encoding `%s' not supported"
+msgstr "Imisobekere: OYA"
+
+#: makeinfo/lang.c:1492
+#, fuzzy, c-format
+msgid "invalid encoded character `%s'"
+msgstr "Sibyo Inyuguti"
+
+#: makeinfo/lang.c:1800
+#, fuzzy, c-format
+msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgstr "%c%sCyangwa Nka OYA"
+
+#: makeinfo/lang.c:1804
+#, fuzzy, c-format
+msgid "%c%s expects a single character `i' or `j' as argument"
+msgstr "%c%sa UMWE Inyuguti Cyangwa Nka"
+
+#: makeinfo/macro.c:128
+#, fuzzy, c-format
+msgid "macro `%s' previously defined"
+msgstr "Makoro"
+
+#: makeinfo/macro.c:132
+#, fuzzy, c-format
+msgid "here is the previous definition of `%s'"
+msgstr "ni i Ibanjirije Insobanuro Bya"
+
+#: makeinfo/macro.c:359
+#, fuzzy, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr "\\ in Makoro ku Bya Izina:"
+
+#: makeinfo/macro.c:401
+#, fuzzy, c-format
+msgid "Macro `%s' called on line %d with too many args"
+msgstr "ku Umurongo Na:"
+
+#: makeinfo/macro.c:580
+#, fuzzy, c-format
+msgid "%cend macro not found"
+msgstr "%cendMakoro OYA Byabonetse"
+
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
+
+#: makeinfo/macro.c:649
+#, fuzzy, c-format
+msgid "mismatched @end %s with @%s"
+msgstr "Impera Na:"
+
+#: makeinfo/makeinfo.c:188
+#, fuzzy, c-format
+msgid "Too many errors!  Gave up.\n"
+msgstr "Amakosa Hejuru"
+
+#: makeinfo/makeinfo.c:306
+#, fuzzy, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d:Iburira"
+
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
+#, c-format
+msgid "Misplaced %c"
+msgstr ""
+
+#: makeinfo/makeinfo.c:344
+#, fuzzy, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "kugirango Birenzeho Ibisobanuro"
+
+#: makeinfo/makeinfo.c:347
+#, c-format
+msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:350
+#, fuzzy
+msgid ""
+"Translate Texinfo source documentation to various other formats, by default\n"
+"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
+msgstr ""
+"Inkomoko Kuri Ikindi Imiterere ku Idosiye kugirango kiri kuri interineti Na: "
+"Cyangwa"
+
+#: makeinfo/makeinfo.c:354
+#, fuzzy, c-format
+msgid ""
+"General options:\n"
+"      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
+"      --force                 preserve output even if errors.\n"
+"      --help                  display this help and exit.\n"
+"      --no-validate           suppress node cross-reference validation.\n"
+"      --no-warn               suppress warnings (but not errors).\n"
+"  -v, --verbose               explain what is being done.\n"
+"      --version               display version information and exit.\n"
+msgstr ""
+"Amahitamo Ikosa Kuvamo Nyuma Amakosa Mburabuzi Ibisohoka ATARIIGIHARWE NIBA "
+"Amakosa Ifashayobora Kugaragaza iyi Ifashayobora Na Gusohoka Oya Kwemeza "
+"Kwambukiranya Indango Kwemeza Oya Iburira OYA Amakosa Indango Ibyerekeye ku "
+"Indango Mburabuzi v ni Byakozwe Verisiyo Kugaragaza Verisiyo Ibisobanuro Na "
+"Gusohoka"
+
+#: makeinfo/makeinfo.c:369
+#, fuzzy, no-wrap
+msgid ""
+"Output format selection (default is to produce Info):\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
+msgstr "Imiterere Ihitamo Mburabuzi ni Kuri InyandikoGitabo Ibisohoka HTML Ibisohoka xml Ibisohoka Ibisohoka Byuzuye Umwandiko"
+
+#: makeinfo/makeinfo.c:377
+#, fuzzy
+msgid ""
+"General output options:\n"
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
+"menus\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
+msgstr ""
+"Ibisohoka Amahitamo E Makoro Kwagura Ibisohoka Makoro Cyagutse Inkomoko Kuri "
+"Oya Imitwe Imirongo Na Bivuye Ibisohoka Byuzuye Umwandiko Cyangwa Bivuye "
+"Ibisohoka Kwandika Kuri Bisanzwe Ibisohoka ku Mburabuzi Oya Gutandukanya Bya "
+"Cyangwa Ibisohoka Ibisohoka IDOSIYE Umubare Ibyatoranyijwe Ibisohoka Umutwe "
+"Na Imibare o Ibisohoka Ibisohoka Kuri bushyinguro NIBA Gutandukanya"
+
+#: makeinfo/makeinfo.c:391
+#, fuzzy, c-format
+msgid ""
+"Options for Info and plain text:\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
+"      --fill-column=NUM       break Info lines at NUM characters (default %"
+"d).\n"
+"      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
+"                                `separate' to put them in their own node;\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
+"      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
+"d).\n"
+"                                If VAL is `none', do not indent; if VAL is\n"
+"                                `asis', preserve existing indentation.\n"
+"      --split-size=NUM        split Info files at size NUM (default %d).\n"
+msgstr ""
+"kugirango Na Byuzuye Umwandiko Gushoboza Imisobekere: Ibisohoka Na "
+"Bidasanzwe Inyuguti Ibisohoka ku Kuzuza Inkingi itandukanya Imirongo ku "
+"Inyuguti Mburabuzi Ubusobanuro mpezarupapuro IMISUSIRE Ibisohoka Ubusobanuro "
+"mpezarupapuro in Kuri Kuri Gushyira in Kuri Gushyira ku i Impera Bya i in "
+"Mburabuzi Igika Ikurura Ikurura Ibika ku Imyanya Mburabuzi ni OYA Ikurura "
+"NIBA Gutandukanya Ingano Gutandukanya Idosiye ku Ingano Mburabuzi"
+
+#: makeinfo/makeinfo.c:409
+#, fuzzy
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
+msgstr "kugirango Gushyiramo Gushyiramo in IMISUSIRE Ibisohoka Gusoma NIBA ni"
+
+#: makeinfo/makeinfo.c:418
+#, fuzzy, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+"kugirango Na Ibisohoka Ikurura Ikurura Ibintu ku Imyanya Mburabuzi ni 0 ni"
+
+#: makeinfo/makeinfo.c:425
+#, fuzzy
+msgid ""
+"Input file options:\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
+msgstr ""
+"IDOSIYE Amahitamo Amabwiriza in Amazina Kwemerera Amabwiriza in Amazina "
+"Kugaragaza... i IMPINDURAGACIRO Nka Na: Gushyiraho Kongeraho... Kuri i "
+"Gushyiramo Gushaka Inzira Kuri i Gushyiramo Gushaka Inzira U i "
+"IMPINDURAGACIRO Nka Na: Gusiba"
+
+#: makeinfo/makeinfo.c:434
+#, fuzzy
+msgid ""
+"Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
+"  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
+"  --ifinfo          process @ifinfo even if not generating Info.\n"
+"  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
+"  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
+"  --no-ifhtml       do not process @ifhtml and @html text.\n"
+"  --no-ifinfo       do not process @ifinfo text.\n"
+"  --no-ifplaintext  do not process @ifplaintext text.\n"
+"  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
+msgstr ""
+"Inonosora in Iyinjiza Na InyandikoGitabo ATARIIGIHARWE OYA Na HTML "
+"ATARIIGIHARWE NIBA OYA ATARIIGIHARWE NIBA OYA ATARIIGIHARWE NIBA OYA Byuzuye "
+"Umwandiko Na Oya Gutandukanya Na xml Oya OYA Na InyandikoGitabo Umwandiko "
+"Oya OYA Na HTML Umwandiko Oya OYA Umwandiko Oya OYA Umwandiko Oya OYA Na "
+"Umwandiko Oya OYA Na xml Umwandiko kugirango i Oya Amahitamo Umwandiko"
+
+#: makeinfo/makeinfo.c:453
+#, fuzzy
+msgid ""
+"  The defaults for the @if... conditionals depend on the output format:\n"
+"  if generating HTML, --ifhtml is on and the others are off;\n"
+"  if generating Info, --ifinfo is on and the others are off;\n"
+"  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
+msgstr ""
+"kugirango i NIBA ku i Ibisohoka Imiterere NIBA ni ku Na i Ibindi Bidakora "
+"NIBA ni ku Na i Ibindi Bidakora NIBA Byuzuye Umwandiko ni ku Na i Ibindi "
+"Bidakora NIBA ni ku Na i Ibindi Bidakora"
+
+#: makeinfo/makeinfo.c:461
+#, fuzzy
+msgid ""
+"Examples:\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
+"menus\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
+msgstr ""
+"Kwandika Kuri HTML Kwandika Kuri xml Kwandika Kuri InyandikoGitabo Kwandika "
+"Kuri Oya Imitwe Kwandika Byuzuye Umwandiko Kuri Bisanzwe HTML Oya Imitwe "
+"Kwandika HTML Imirongo Umubare Ibyatoranyijwe Kwandika Na: Iriho Imibare Oya "
+"Gutandukanya Kwandika IDOSIYE"
+
+#: makeinfo/makeinfo.c:619
+#, fuzzy, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr "%s:Kwirengagiza Agaciro"
+
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
+#, fuzzy, c-format
+msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgstr "%s:%sBikurikije umubare OYA"
+
+#: makeinfo/makeinfo.c:680
+#, fuzzy, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "%s:OYA Gufungura Makoro Ibisohoka"
+
+#: makeinfo/makeinfo.c:685
+#, fuzzy, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "%s:ISEGONDA Makoro Ibisohoka"
+
+#: makeinfo/makeinfo.c:732
+#, fuzzy, c-format
+msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
+
+#: makeinfo/makeinfo.c:750
+#, fuzzy, c-format
+msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
+
+#: makeinfo/makeinfo.c:825
+#, fuzzy, c-format
+msgid "%s: missing file argument.\n"
+msgstr "%s:Ibuze IDOSIYE"
+
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
+#, fuzzy, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr "Komandi:"
+
+#: makeinfo/makeinfo.c:1019
+#, fuzzy, c-format
+msgid "Expected `%s'"
+msgstr "Ikitezwe:"
+
+#: makeinfo/makeinfo.c:1496
+#, fuzzy, c-format
+msgid "Can't create directory `%s': %s"
+msgstr "Kurema bushyinguro"
+
+#: makeinfo/makeinfo.c:1542
+#, fuzzy, c-format
+msgid "No `%s' found in `%s'"
+msgstr "Byabonetse in"
+
+#: makeinfo/makeinfo.c:1622
+#, fuzzy, c-format
+msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
+msgstr "%s:Makoro Kuri Nka Ibisohoka ni"
+
+#: makeinfo/makeinfo.c:1652
+#, fuzzy, c-format
+msgid "Making %s file `%s' from `%s'.\n"
+msgstr "IDOSIYE Bivuye"
+
+#: makeinfo/makeinfo.c:1719
+#, fuzzy, c-format
+msgid ""
+"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
+msgstr "%s:Makoro Ibisohoka IDOSIYE Kuri Amakosa Gukoresha Kuri"
+
+#: makeinfo/makeinfo.c:1774
+#, fuzzy, c-format
+msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
+msgstr "%s:Ibisohoka IDOSIYE Kuri Amakosa Gukoresha Kuri"
+
+#: makeinfo/makeinfo.c:2068
+#, fuzzy, c-format
+msgid "Unknown command `%s'"
+msgstr "Komandi:"
+
+#: makeinfo/makeinfo.c:2090
+#, fuzzy, c-format
+msgid "Use braces to give a command as an argument to @%s"
+msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
+
+#: makeinfo/makeinfo.c:2349
+#, fuzzy, c-format
+msgid "%c%s expected braces"
+msgstr "%c%sIkitezwe: Ingirwadusodeko"
+
+#: makeinfo/makeinfo.c:2362
+msgid "Unmatched }"
+msgstr ""
+
+# 4203
+#: makeinfo/makeinfo.c:2410
+#, fuzzy
+msgid "NO_NAME!"
+msgstr "nta zina"
+
+#: makeinfo/makeinfo.c:2431
+#, fuzzy, c-format
+msgid "%c%s missing close brace"
+msgstr "%c%sIbuze Gufunga"
+
+#: makeinfo/makeinfo.c:3434
+#, fuzzy, c-format
+msgid "@image file `%s' (for HTML) not readable: %s"
+msgstr "@Ishusho IDOSIYE kugirango OYA"
+
+#: makeinfo/makeinfo.c:3440
+#, fuzzy, c-format
+msgid "No such file `%s'"
+msgstr "IDOSIYE"
+
+#: makeinfo/makeinfo.c:3576
+#, fuzzy, c-format
+msgid "@image file `%s' (for text) unreadable: %s"
+msgstr "@Ishusho IDOSIYE kugirango Umwandiko"
+
+#: makeinfo/makeinfo.c:3585
+#, fuzzy
+msgid "@image missing filename argument"
+msgstr "@Ishusho Ibuze Izina ry'idosiye:"
+
+#: makeinfo/makeinfo.c:3803
+#, fuzzy, c-format
+msgid "undefined flag: %s"
+msgstr "kidasobanuye Ibendera"
+
+#: makeinfo/makeinfo.c:3804
+#, fuzzy, c-format
+msgid "{No value for `%s'}"
+msgstr "{Agaciro kugirango"
+
+#: makeinfo/makeinfo.c:3856
+#, fuzzy, c-format
+msgid "%c%s requires a name"
+msgstr "%c%sa Izina:"
+
+#: makeinfo/makeinfo.c:3962
+#, fuzzy, c-format
+msgid "Reached eof before matching @end %s"
+msgstr "Mbere Impera"
+
+#: makeinfo/makeinfo.c:4211
+#, fuzzy, c-format
+msgid "`%.40s...' is too long for expansion; not expanded"
+msgstr ""
+"`%.Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
+
+#: makeinfo/multi.c:116
+#, fuzzy
+msgid "Missing } in @multitable template"
+msgstr "in Inyandikorugero"
+
+#: makeinfo/multi.c:260
+#, fuzzy, c-format
+msgid "ignoring stray text `%s' after @multitable"
+msgstr "Umwandiko Nyuma"
+
+#: makeinfo/multi.c:400
+#, fuzzy, c-format
+msgid "Too many columns in multitable item (max %d)"
+msgstr "Inkingi in Ikintu KININI"
+
+#: makeinfo/multi.c:563
+#, fuzzy, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[Guhitamo Inkingi in"
+
+#: makeinfo/multi.c:592
+#, fuzzy
+msgid "ignoring @tab outside of multitable"
+msgstr "Isunika Hanze Bya"
+
+#: makeinfo/multi.c:640
+#, fuzzy, c-format
+msgid "** Multicolumn output from last row:\n"
+msgstr "**Ibisohoka Bivuye Iheruka Urubariro"
+
+#: makeinfo/multi.c:643
+#, fuzzy, c-format
+msgid "* column #%d: output = %s\n"
+msgstr "*Inkingi Ibisohoka"
+
+#: makeinfo/node.c:279
+#, fuzzy, c-format
+msgid "Node `%s' previously defined at line %d"
+msgstr "ku Umurongo"
+
+#: makeinfo/node.c:647
+#, c-format
+msgid "Formatting node %s...\n"
+msgstr ""
+
+#: makeinfo/node.c:714
+#, fuzzy, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "g."
+
+#: makeinfo/node.c:878
+#, fuzzy, c-format
+msgid "No node name specified for `%c%s' command"
+msgstr "Izina: kugirango Komandi:"
+
+#: makeinfo/node.c:919 makeinfo/node.c:1160
+#, fuzzy, c-format
+msgid "Anchor `%s' and node `%s' map to the same file name"
+msgstr "Na Kuri i IDOSIYE Izina:"
+
+#: makeinfo/node.c:922
+#, fuzzy
+msgid "This @anchor command ignored; references to it will not work"
+msgstr "Agafashi Komandi: Indango Kuri OYA Akazi"
+
+#: makeinfo/node.c:924 makeinfo/node.c:1163
+#, fuzzy
+msgid "Rename this anchor or use the `--no-split' option"
+msgstr "iyi Agafashi Cyangwa Gukoresha i Oya Ihitamo"
+
+#: makeinfo/node.c:954
+#, fuzzy, c-format
+msgid "Unexpected string at end of split-HTML file `%s'"
+msgstr "Ikurikiranyanyuguti ku Impera Bya Gutandukanya IDOSIYE"
+
+#: makeinfo/node.c:1157
+#, fuzzy, c-format
+msgid "Anchors `%s' and `%s' map to the same file name"
+msgstr "Na Kuri i IDOSIYE Izina:"
+
+#: makeinfo/node.c:1162
+#, fuzzy
+msgid "@anchor command ignored; references to it will not work"
+msgstr "@Agafashi Komandi: Indango Kuri OYA Akazi"
+
+#: makeinfo/node.c:1359
+#, fuzzy, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr "%sIndango Kuri"
+
+#: makeinfo/node.c:1459
+#, fuzzy, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr "Umwanya Bya OYA Kuri"
+
+#: makeinfo/node.c:1462
+#, fuzzy, c-format
+msgid "This node (%s) has the bad Prev"
+msgstr "i"
+
+#: makeinfo/node.c:1517
+#, fuzzy, c-format
+msgid "Prev field of node `%s' not pointed to"
+msgstr "Umwanya Bya OYA Kuri"
+
+#: makeinfo/node.c:1521
+#, fuzzy, c-format
+msgid "This node (%s) has the bad Next"
+msgstr "i"
+
+#: makeinfo/node.c:1533
+#, fuzzy, c-format
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr "`%s'Oya Umwanya"
+
+#: makeinfo/node.c:1602
+#, fuzzy, c-format
+msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
+msgstr "Ibikubiyemo Ikintu kugirango Intego"
+
+#: makeinfo/node.c:1634
+#, c-format
+msgid "unreferenced node `%s'"
+msgstr ""
+
+#: makeinfo/node.c:1724
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1728
+#, fuzzy, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Gukuraho... IDOSIYE"
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr ""
+
+#: makeinfo/sectioning.c:467
+#, fuzzy, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Ikosa"
+
+#: makeinfo/sectioning.c:563
+#, fuzzy, c-format
+msgid "Internal error (search_sectioning) \"%s\"!"
+msgstr "Ikosa"
+
+#: makeinfo/sectioning.c:624
+#, fuzzy, c-format
+msgid "%c%s is obsolete; use %c%s instead"
+msgstr "%c%sni Gukoresha"
+
+#: makeinfo/sectioning.c:640
+#, fuzzy, c-format
+msgid "Node with %ctop as a section already exists"
+msgstr "Na: Nka a Icyiciro"
+
+#: makeinfo/sectioning.c:648
+#, fuzzy, c-format
+msgid "Here is the %ctop node"
+msgstr "ni i"
+
+#: makeinfo/sectioning.c:664
+#, fuzzy, c-format
+msgid "%ctop used before %cnode, defaulting to %s"
+msgstr "%ctopMbere Kuri"
+
+#: makeinfo/xml.c:1669
+#, fuzzy, c-format
+msgid "@image file `%s' unreadable: %s"
+msgstr "@Ishusho IDOSIYE"
+
+#: makeinfo/xml.c:2014
+#, fuzzy
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr "@Nka i Iheruka Ikintu Bya Sibyo Inyandiko"
+
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "ya"
+
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "kuri"
+
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr ""
+
+#: makeinfo/xref.c:252
+#, c-format
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr ""
+
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr ""
+
+#: makeinfo/xref.c:390
+#, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr ""
+
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "Kwambukiranya Indango in iyi"
+
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr ""
+
+#: util/texindex.c:223
+#, fuzzy
+msgid "display this help and exit"
+msgstr "Kugaragaza iyi Ifashayobora Na Gusohoka"
+
+#: util/texindex.c:225
+#, fuzzy
+msgid "send output to FILE"
+msgstr "Kohereza Ibisohoka Kuri"
+
+#: util/texindex.c:227
+#, fuzzy
+msgid "display version information and exit"
+msgstr "Kugaragaza Verisiyo Ibisobanuro Na Gusohoka"
+
+#: util/texindex.c:237
+#, c-format
+msgid "Usage: %s [OPTION]... FILE...\n"
+msgstr ""
+
+#: util/texindex.c:238
+#, fuzzy, c-format
+msgid "Generate a sorted index for each TeX output FILE.\n"
+msgstr "a bishunguwe Umubarendanga kugirango Ibisohoka"
+
+#: util/texindex.c:241
+#, fuzzy, c-format
+msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
+msgstr "ni Nka kugirango a Inyandiko"
+
+#: util/texindex.c:243
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Amahitamo:\n"
+
+#: util/texindex.c:743
+#, c-format
+msgid "failure reopening %s"
+msgstr ""
+
+#: util/texindex.c:758 util/texindex.c:786
+#, fuzzy, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s:OYA a Umubarendanga IDOSIYE"
+
+#: util/texindex.c:993
+#, fuzzy, c-format
+msgid "No page number in %s"
+msgstr "Ipaji Umubare in"
+
+#: util/texindex.c:1066
+#, fuzzy, c-format
+msgid "entry %s follows an entry with a secondary name"
+msgstr "Icyinjijwe Icyinjijwe Na: a Izina:"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10 Gushaka Imbere kugirango a Na Guhitamo i in i Komeza>> ukugaragara "
+#~ "ni Byabonetse"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10 Kuri ku Izina: Gicurasi Gushyiramo a Izina ry'idosiye: Nka Nka in"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "\\%-10 Komeza>> Kuri i Komeza>> Bya iyi"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr "\\%-10 Kuri i Kuri"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr "\\%-10 Hejuru: Kuri i Kuri"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10 Gushaka subira inyuma subira inyuma kugirango a Na Guhitamo i in i "
+#~ "Ibanjirije ukugaragara ni Byabonetse"
+
+#, fuzzy
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr "---Urutonde Cyangwa Kuri Gusohoka"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr "\\%-10 Kwimura Kuri X- Ngenderwaho Kuri Ibanjirije Ihuza muri iyi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "in Imiterere Hejuru in Byose ibimenyetso Bya Byose D bushyinguro "
+#~ "Kongeramo Kuri Ukoresha: in F IDOSIYE IDOSIYE Kuri h Ifashayobora "
+#~ "Kugaragaza iyi Ifashayobora Na Gusohoka Umubarendanga Gushaka Gyayo Kuri "
+#~ "ku Umubarendanga Icyinjijwe N in Itangira IDOSIYE o Ibisohoka Ibisohoka "
+#~ "Byahiswemo Kuri Ibisohoka Mburabuzi Oya Ibisohoka Nka Umwandiko Kugarura "
+#~ "Gusoma Bivuye Garagaza Amahitamo Ikoresha: Gyayo Kuri Komandi: Umurongo "
+#~ "Amahitamo Ibisohoka Ibikubiyemo W Ahantu Gucapa Ifatika Ahantu Bya "
+#~ "IDOSIYE Utubuto Gukoresha nka Na Birutwa nka Urufunguzo Ibyafataranyijwe "
+#~ "Verisiyo Kugaragaza Verisiyo Ibisobanuro Na Gusohoka Itangira Ihitamo "
+#~ "NIBA ni i Ibikubiyemo Icyinjijwe Kuri Gutangira Bivuye ni kugirango in "
+#~ "Byose Idosiye ni OYA Ibisobanuro Byose Idosiye Na i Igisubizo ingingo Nka "
+#~ "i Amazina Bya Bifitanye isano Kuri i Ibisobanuro Garagaza Hejuru: urwego "
+#~ "Ibisobanuro Gutangira ku Bivuye Hejuru: urwego Ibisobanuro Gutangira ku "
+#~ "muri Ibisobanuro Garagaza Amahitamo Gutangira ku Na: Komandi: Umurongo "
+#~ "Ibisobanuro F Ibisobanuro Garagaza IDOSIYE Ibisobanuro OYA Ishakisha"
+
+#, fuzzy
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr "a Ibikubiyemo Ikintu Kuri Byahiswemo"
+
+#, fuzzy
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr "Gicurasi Gushyiramo a Izina ry'idosiye: Nka Nka in"
+
+#, fuzzy
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr "%-10ssubira inyuma kugirango a"
+
+#, fuzzy
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "Na Guhitamo i in i Komeza>> ukugaragara ni Byabonetse"
+
+#, fuzzy
+#~ msgid "Selecting first menu item..."
+#~ msgstr "Itangira Ibikubiyemo Ikintu"
+
+#, fuzzy
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "Igihe S Hanyuma"
+
+#, fuzzy
+#~ msgid "Moving Prev in this window."
+#~ msgstr "in iyi Idirishya"
+
+#, fuzzy
+#~ msgid "Moving Up in this window."
+#~ msgstr "in iyi Idirishya"
+
+#, fuzzy
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "Kuri Iheruka Ibikubiyemo Ikintu"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "Umumaro"
+
+#~ msgid "Macro"
+#~ msgstr "Makoro"
+
+#~ msgid "Variable"
+#~ msgstr "Imburabuzi"
+
+#, fuzzy
+#~ msgid "Instance Variable"
+#~ msgstr "Imburabuzi"
+
+#~ msgid "Method"
+#~ msgstr "Uburyo"
+
+# filter/source\xsltdialog\xmlfilterdialogstrings.src:STR_DEFAULT_UI_NAME.text
+#~ msgid "Untitled"
+#~ msgstr "Nta mutwe"
+
+#, fuzzy
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "ni ku Verisiyo Bivuye"
+
+#, fuzzy
+#~ msgid "Next:"
+#~ msgstr "Ibikurikira>"
+
+#, fuzzy
+#~ msgid "Previous:"
+#~ msgstr "Ibanjirije"
+
+# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
+# sc/source\ui\src\menue.src:SCCFG_PLUGINMENU.SUBMENU_EDIT.SUBMENU_FILL.FID_FILL_TO_TOP.text
+# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
+# sc/source\ui\src\menue.src:SCCFG_MENUBAR.SUBMENU_EDIT.SUBMENU_FILL.FID_FILL_TO_TOP.text
+# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
+# sc/source\ui\src\miscdlgs.src:RID_SCDLG_FILLSERIES.BTN_TOP.text
+#, fuzzy
+#~ msgid "Up:"
+#~ msgstr "Hejuru"
+
+#~ msgid "Menu"
+#~ msgstr "Ibikubiyemo"
+
+#~ msgid "Cross"
+#~ msgstr "Kwambukiranya"
+
+#, fuzzy
+#~ msgid "Prev"
+#~ msgstr "Ibanjirije"
+
+#~ msgid "Up"
+#~ msgstr "Hejuru"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "Cyangwa Gusiba Ibyinjijwe Bivuye in i bushyinguro Gusiba Gusiba "
+#~ "Ibyinjijwe kugirango Bivuye Kongeramo Gishya Ibyinjijwe IDOSIYE IDOSIYE "
+#~ "Izina: Bya bushyinguro IDOSIYE ni Kuri ikoresha i Icyinjijwe Kongeramo "
+#~ "Nka bushyinguro Icyinjijwe i Ifishi Bya Ibikubiyemo Ikintu Guteranya Zeru "
+#~ "Cyangwa Birenzeho Birenga Imirongo Na: Birenzeho Icyinjijwe Byose "
+#~ "Kyongewe Ibyinjijwe Bivuye Ibisobanuro in i IDOSIYE Ifashayobora "
+#~ "Kugaragaza iyi Ifashayobora Na Gusohoka Ibisobanuro IDOSIYE IDOSIYE Kuri "
+#~ "Kwinjiza porogaramu in i bushyinguro ni Kuri ikoresha i Ibisobanuro Nka "
+#~ "IDOSIYE Ikintu Nka Icyinjijwe bushyinguro Icyinjijwe ni a Ibikubiyemo "
+#~ "Ikintu Iburira Gukuraho... Nka Gusiba Icyiciro Gushyira iyi Ibyinjijwe in "
+#~ "Icyiciro Bya i bushyinguro Birenzeho Icyiciro Byose i Kyongewe in Bya i "
+#~ "Ibyatoranyijwe Ibyatoranyijwe Bivuye Ibisobanuro in i IDOSIYE Verisiyo "
+#~ "Kugaragaza Verisiyo Ibisobanuro Na Gusohoka"
+
+#, fuzzy
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "Ibikubiyemo Ikintu kugirango IDOSIYE"
+
+#, fuzzy
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr "\\%-10 Ibikubiyemo Itangira Ikintu in Ibikubiyemo"
+
+#, fuzzy
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "Times"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "C ni Gicurasi iyi i Bya i Birenzeho Ibisobanuro Ibyerekeye i Idosiye"
+
+#, fuzzy
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@Gushyiraho akugarizo kugirango UMWE Makoro"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Ishakiro"
+
+#, fuzzy
+#~ msgid "Short Contents"
+#~ msgstr "Ishakiro"
+
+#, fuzzy
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "Gumana: By'igihe gito Idosiye Nyuma Inonosora"
+
+#, fuzzy
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "OYA Gumana: By'igihe gito Idosiye Nyuma Inonosora Mburabuzi"
+
+#, fuzzy
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr "IDOSIYE Na Guhitamo i ku i Itangira Icyinjijwe Byabonetse"
+
+#, fuzzy
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr "ni Gicurasi iyi i Bya i Birenzeho Ibisobanuro Ibyerekeye i Idosiye"
diff --git a/Build/source/utils/texinfo/po/sv.gmo b/Build/source/utils/texinfo/po/sv.gmo
index ab3833a478c..379c79157a9 100644
--- a/Build/source/utils/texinfo/po/sv.gmo
+++ b/Build/source/utils/texinfo/po/sv.gmo
diff --git a/Build/source/utils/texinfo/po/sv.po b/Build/source/utils/texinfo/po/sv.po
index ad89cd65aca..bed73eca024 100644
--- a/Build/source/utils/texinfo/po/sv.po
+++ b/Build/source/utils/texinfo/po/sv.po
@@ -1,180 +1,246 @@
 # Swedish messages for texinfo.
-# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-# Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004.
+# Copyright (C) 2001, 2002, 2003, 2004, 2008 Free Software Foundation, Inc.
+# Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.7.91\n"
+"Project-Id-Version: texinfo 4.11.93\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
-"PO-Revision-Date: 2004-12-12 22:41+0100\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2008-03-09 20:35+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr "Okänt systemfel"
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flaggan \"%s\" är flertydig\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: flaggan \"--%s\" tillåter inget argument\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: flaggan \"%c%s\" tillåter inget argument\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flaggan \"%s\" kräver ett argument\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: okänd flagga \"--%s\"\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: okänd flagga \"%c%s\"\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: otillåten flagga -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ogiltig flagga -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flaggan kräver ett argument -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flaggan \"-W %s\" är flertydig\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "minne slut"
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
-msgstr "Gå ett tecken framåt"
+msgstr "Gå ett tecken framåt"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
-msgstr "Gå ett tecken bakåt"
+msgstr "Gå ett tecken bakåt"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
-msgstr "Gå till början på raden"
+msgstr "Gå till början på raden"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
-msgstr "Gå till slutet på raden"
+msgstr "Gå till slutet på raden"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
-msgstr "Gå ett ord framåt"
+msgstr "Gå ett ord framåt"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
-msgstr "Gå ett ord bakåt"
+msgstr "Gå ett ord bakåt"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
-msgstr "Ta bort tecknet under markören"
+msgstr "Ta bort tecknet under markören"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
-msgstr "Ta bort tecknet bakom markören"
+msgstr "Ta bort tecknet bakom markören"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Avbryt eller avsluta operation"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Acceptera (eller tvinga komplettering av) denna rad"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
-msgstr "Infoga nästa tecken ordagrant"
+msgstr "Infoga nästa tecken ordagrant"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Infoga detta tecken"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Infoga ett TABULATOR-tecken"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Transponera tecken vid punkt"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
-msgstr "Ryck tillbaka innehållet i det senaste dödandet"
+msgstr "Ryck tillbaka innehållet i det senaste dödandet"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
-msgstr "Dödsringen är tom"
+msgstr "Dödsringen är tom"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
-msgstr "Ryck tillbaka ett tidigare dödande"
+msgstr "Ryck tillbaka ett tidigare dödande"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
-msgstr "Döda till slutet på raden"
+msgstr "Döda till slutet på raden"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
-msgstr "Döda till början på raden"
+msgstr "Döda till början på raden"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
-msgstr "Döda ordet efter markören"
+msgstr "Döda ordet efter markören"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
-msgstr "Döda ordet före markören"
+msgstr "Döda ordet före markören"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Inga kompletteringar"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
-msgstr "Inte fullständig"
+msgstr "Inte fullständig"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
-msgstr "Visa möjliga kompletteringar"
+msgstr "Visa möjliga kompletteringar"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "Enda komplettering"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "En komplettering:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d kompletteringar:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "Infoga komplettering"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "Bygger kompletteringar..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
-msgstr "Rulla kompletteringsfönstret"
+msgstr "Rulla kompletteringsfönstret"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "Fotnoter kunde inte visas"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
-msgstr "Visa fotnoterna som är associerade med denna nod i ett annat fönster"
+msgstr "Visa fotnoterna som är associerade med denna nod i ett annat fönster"
 
 #: info/footnotes.h:26
 msgid "---------- Footnotes ----------"
 msgstr "---------- Fotnoter -----------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
-msgstr "Slå upp en sträng i indexet för denna fil"
+msgstr "Slå upp en sträng i indexet för denna fil"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
-msgstr "Söker indexposter..."
+msgstr "Söker indexposter..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "Inga index hittades."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Indexpost: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
-"Gå till nästa matchande indexpost från det senaste \"\\[index-search]\"-"
+"Gå till nästa matchande indexpost från det senaste \"\\[index-search]\"-"
 "kommandot"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
-msgstr "Det finns ingen tidigare indexsöksträng."
+msgstr "Det finns ingen tidigare indexsöksträng."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Inga indexposter."
 
@@ -186,157 +252,189 @@ msgstr "Inga indexposter."
 # Please don't use this type of construct, use two complete sentences
 # instead and an outer if statement.
 #
-#: info/indices.c:375
+#: info/indices.c:374
 #, c-format
 msgid "No %sindex entries containing `%s'."
-msgstr "Inga %sindexposter som innehåller \"%s\"."
+msgstr "Inga %sindexposter som innehåller \"%s\"."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "fler "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "KAN INTE SE DETTA"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
-msgstr "Hittade \"%s\" i %s. (\"\\[next-index-match]\" försöker hitta nästa)."
+msgstr "Hittade \"%s\" i %s. (\"\\[next-index-match]\" försöker hitta nästa)."
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, c-format
 msgid "Scanning indices of `%s'..."
-msgstr "Genomsöker index av \"%s\"..."
+msgstr "Genomsöker index av \"%s\"..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
-msgstr "Inga tillgängliga infofiler har \"%s\" i deras index."
+msgstr "Inga tillgängliga infofiler har \"%s\" i deras index."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
-msgstr "Gräv i alla kända infofilers index efter en sträng och bygg en meny"
+msgstr "Gräv i alla kända infofilers index efter en sträng och bygg en meny"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Index-apropos: "
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, c-format
 msgid ""
 "\n"
 "* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
-"* Meny: Noder vars index innehåller \"%s\":\n"
+"* Meny: Noder vars index innehåller \"%s\":\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
-msgstr "Prova --help för mer information.\n"
+msgstr "Prova --help för mer information.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
 #, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
-msgstr ""
-"Det finns INGEN garanti. Du kan vidaredistribuera denna programvara\n"
-"under villkoren i GNU General Public License.\n"
-"Se filen COPYING för mer information om detta.\n"
-
-#: info/info.c:498
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright © %s Free Software Foundation, Inc.\n"
+"Licens GPLv3+: GNU GPL version 3 eller senare <http://gnu.org/licenses/gpl."
+"html>\n"
+"(Följande text är en informell översättning som enbart tillhandahålls\n"
+" i informativt syfte. För alla juridiska tolkningar gäller den engelska\n"
+" originaltexten.)\n"
+"Det här är fri programvara. Du kan fritt modifiera det och\n"
+"vidaredistribuera det. Det finns INGEN GARANTI, i den omfattning som\n"
+"medges av gällande lag.\n"
+
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
-msgstr "inga indexposter för \"%s\" hittades\n"
-
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr " -b, --speech-friendly        var vänlig mot talsyntesprogram.\n"
+msgstr "inga indexposter för \"%s\" hittades\n"
 
-#: info/info.c:597
+#: info/info.c:598
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
+msgstr ""
+"Användning: %s [FLAGGA]... [MENYPOST...]\n"
 "\n"
+"Läs dokumentation i Info-format.\n"
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+"Flaggor:\n"
+"  -k, --apropos=STRÄNG         slå upp STRÄNG i alla index i alla manualer.\n"
+"  -d, --directory=KATALOG      lägg till KATALOG till INFOPATH.\n"
+"      --dribble=FILNAMN        kom ihåg användarens tangentnedtryckningar i\n"
+"                               FILNAMN.\n"
+"  -f, --file=FILNAMN           ange den Info-fil som ska besökas."
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+"  -h, --help                   visa denna hjälptext och avsluta.\n"
+"      --index-search=STRÄNG    gå till noden som utpekas av indexpost\n"
+"                               STRÄNG.\n"
+"  -n, --node=NODNAMN           ange noder i den först besökta Info-filen.\n"
+"  -o, --output=FILNAMN         skriv ut valda noder till FILNAMN."
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+"  -R, --raw-escapes            skriv ut \"råa\" ANSI-styrkoder (standard).\n"
+"      --no-raw-escapes         skriv ut styrkoder som text.\n"
+"      --restore=FILNAMN        läs initiala tangentnedtryckningar från\n"
+"                               FILNAMN.\n"
+"  -O, --show-options, --usage  gå till noden för kommandoradsflaggor."
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr "  -b, --speech-friendly        var vänlig mot talsyntesprogram."
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+"      --subnodes               skriv ut menyposter rekursivt.\n"
+"      --vi-keys                använd vi- och less-liknande\n"
+"                               snabbtangenter.\n"
+"      --version                visa versionsinformation och avsluta.\n"
+"  -w, --where, --location      skriv ut den fysiska platsen för Info-filen."
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+"\n"
+"Det första argumentet som inte är en flagga är, om det finns, menyposten\n"
+"att börja från. Det söks efter i alla \"dir\"-filer i INFOPATH.\n"
+"Om den inte finns slår info samman alla \"dir\"-filer och visar resultatet.\n"
+"Alla återstående argument betraktas som namnen på menyposter relativa till\n"
+"den först besökta noden."
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Användning: %s [FLAGGA]... [MENYPOST...]\n"
-"\n"
-"Läs dokumentation i Info-format.\n"
 "\n"
-"Flaggor:\n"
-"      --apropos=STRÄNG         slå upp STRÄNG i alla index i alla manualer.\n"
-"  -d, --directory=KATALOG      lägg till KATALOG till INFOPATH.\n"
-"      --dribble=FILNAMN        kom ihåg användarens tangentnedtryckningar i\n"
-"                               FILNAMN.\n"
-"  -f, --file=FILNAMN           ange den Info-fil som ska besökas.\n"
-"  -h, --help                   visa denna hjälptext och avsluta.\n"
-"      --index-search=STRÄNG    gå till noden som utpekas av indexpost\n"
-"                               STRÄNG.\n"
-"  -n, --node=NODNAMN           ange noder i den först besökta Info-filen.\n"
-"  -o, --output=FILNAMN         skriv ut valda noder till FILNAMN.\n"
-"  -R, --raw-escapes            skriv ut \"råa\" ANSI-styrkoder (standard).\n"
-"      --no-raw-escapes         skriv ut styrkoder som text.\n"
-"      --restore=FILNAMN        läs initiala tangentnedtryckningar från\n"
-"                               FILNAMN.\n"
-"  -O, --show-options, --usage  gå till noden för kommandoradsflaggor.\n"
-"%s      --subnodes               skriv ut menyposter rekursivt.\n"
-"  -w, --where, --location      skriv ut den fysiska platsen för Info-filen.\n"
-"      --vi-keys                använd vi- och less-liknande\n"
-"                               snabbtangenter.\n"
-"      --version                visa versionsinformation och avsluta.\n"
-"\n"
-"Det första argumentet som inte är en flagga är, om det finns, menyposten\n"
-"att börja från. Det söks efter i alla \"dir\"-filer i INFOPATH.\n"
-"Om den inte finns slår info samman alla \"dir\"-filer och visar resultatet.\n"
-"Alla återstående argument betraktas som namnen på menyposter relativa till\n"
-"den först besökta noden.\n"
-"\n"
-"Exampel:\n"
-"  info                       visa översta katalogmenyn\n"
-"  info emacs                 börja på emacs-noden från översta katalogen\n"
-"  info emacs buffers         börja på buffertnoden inom emacs-manualen\n"
-"  info --show-options emacs  börja på noden med emacs kommandoradsflaggor\n"
-"  info -f ./foo.info         visa filen ./foo.info, sök inte i katalogen\n"
-
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+"Exempel:\n"
+"  info                       visa översta katalogmenyn\n"
+"  info emacs                 börja på emacs-noden från översta katalogen\n"
+"  info emacs buffers         börja på buffertnoden inom emacs-manualen\n"
+"  info --show-options emacs  börja på noden med emacs kommandoradsflaggor\n"
+"  info --subnodes -o ut.txt emacs  dumpa hela manualen till ut.txt\n"
+"  info -f ./foo.info         visa filen ./foo.info, sök inte i katalogen"
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -345,561 +443,483 @@ msgid ""
 msgstr ""
 "\n"
 "Skicka felrapporter till bug-texinfo@gnu.org,\n"
-"allmänna frågor och diskussion till help-texinfo@gnu.org\n"
-"och synpunkter på översättningen till sv@li.org.\n"
-"Hemsida för texinfo: http://www.gnu.org/software/texinfo/"
+"allmänna frågor och diskussion till help-texinfo@gnu.org\n"
+"och synpunkter på översättningen till sv@li.org.\n"
+"Hemsida för texinfo: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Kan inte hitta noden \"%s\"."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Kan inte hitta noden \"(%s)%s\"."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
-msgstr "Kan inte hitta ett fönster!"
+msgstr "Kan inte hitta ett fönster!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
-msgstr "Punkten finns inte inom detta fönsters nod!"
+msgstr "Punkten finns inte inom detta fönsters nod!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
-msgstr "Kan inte ta bort det sista fönstret."
+msgstr "Kan inte ta bort det sista fönstret."
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "Ingen meny i denna nod."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "Inga fotnoter i denna nod."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "Inga korsreferenser i denna nod."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
-msgstr "Ingen \"%s\"-pekare för denna nod."
+msgstr "Ingen \"%s\"-pekare för denna nod."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
-msgstr "Okänt Info-kommando \"%c\". Prova \"?\" för hjälp."
+msgstr "Okänt Info-kommando \"%c\". Prova \"?\" för hjälp."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
-msgstr "Terminaltypen \"%s\" är inte tillräckligt smart för att köra Info."
+msgstr "Terminaltypen \"%s\" är inte tillräckligt smart för att köra Info."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
-msgstr "Du är redan på sista sidan för denna nod."
+msgstr "Du är redan på sista sidan för denna nod."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
-msgstr "Du är redan på första sidan för denna nod."
+msgstr "Du är redan på första sidan för denna nod."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
-msgstr "Endast ett fönster."
+msgstr "Endast ett fönster."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
-msgstr "Resulterande fönstret skulle bli för litet."
+msgstr "Resulterande fönstret skulle bli för litet."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
-"Inte tillräckligt med utrymme för ett hjälpfönster, ta bort ett fönster."
+"Inte tillräckligt med utrymme för ett hjälpfönster, ta bort ett fönster."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
-msgstr ""
-"Grundläggande kommandon i Info-fönster\n"
-"**************************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
+msgstr "Grundläggande Info-kommandotangenter\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
-msgstr "\\%-10[quit-help]  Avsluta denna hjälp.\n"
+#: info/infodoc.c:47
+msgid "\\%-10[quit-help]  Close this help window.\n"
+msgstr "\\%-10[quit-help]  Stäng detta hjälpfönster.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Avsluta Info helt.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Starta Info-handboken.\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"Välja andra noder:\n"
-"------------------\n"
+#: info/infodoc.c:51
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-node]  Gå en rad uppåt.\n"
+
+#: info/infodoc.c:52
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  Gå en rad nedåt.\n"
+
+#: info/infodoc.c:53
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Rulla en skärmlängd bakåt.\n"
+
+#: info/infodoc.c:54
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Rulla en skärmlängd framåt.\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  Gå till nästa nod från denna nod.\n"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Gå till början på denna nod.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  Gå till föregående nod från denna nod.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Gå upp från denna nod.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Gå till slutet på denna nod.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
-msgstr ""
-"\\%-10[menu-item]  Välj den menypost som anges med namn.\n"
-"              Att välja en menypost gör att en annan nod väljs.\n"
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr "\\%-10[move-to-next-xref]  Hoppa till nästa hypertextlänk.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
-"\\%-10[xref-item]  Följ en korsreferens. Läser namnet på en referens.\n"
+"\\%-10[select-reference-this-line]  Följ hypertextlänken under markören.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
-msgstr "\\%-10[history-node]  Gå till den sista noden i detta fönster.\n"
+#: info/infodoc.c:60
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
+msgstr "\\%-10[history-node]  Gå till den sista noden i detta fönster.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr ""
-"\\%-10[move-to-next-xref]  Hoppa till nästa hypertextlänk i denna nod.\n"
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[global-prev-node]  Gå till föregående nod i dokumentet.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr ""
-"\\%-10[move-to-prev-xref]  Hoppa till nästa hypertextlänk i denna nod.\n"
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[global-next-node]  Gå till nästa nod i dokumentet.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr ""
-"\\%-10[select-reference-this-line]  Följ hypertextlänken under markören.\n"
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Gå till föregående nod på denna nivå.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
-"\\%-10[dir-node]  Gå till \"directory\"-noden. Likvärdigt med \"g (DIR)\".\n"
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Gå till nästa nod på denna nivå.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr ""
-"\\%-10[top-node]  Gå till den översta noden. Likvärdigt med \"g Top\".\n"
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Gå en nivå uppåt.\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"Förflyttning inom en nod:\n"
-"-------------------------\n"
+#: info/infodoc.c:67
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[top-node]  Gå till den översta noden i detta dokument.\n"
+
+#: info/infodoc.c:68
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[dir-node]  GÃ¥ till huvudkatalognoden.\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Gå till början på denna nod.\n"
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "1...9       Välj första...nionde objektet i denna nods meny.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Gå till slutet på denna nod.\n"
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Välj sista objektet i denna nods meny.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "\\%-10[next-line]  Rulla en rad framåt.\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "\\%-10[menu-item]  Välj den namngivna menyposten.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "\\%-10[prev-line]  Rulla en rad bakåt.\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "\\%-10[xref-item]  Följ den namngivna korsreferensen.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Rulla en sida framåt.\n"
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "\\%-10[goto-node]  GÃ¥ till den namngivna noden.\n"
 
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Rulla en sida bakåt.\n"
+#: info/infodoc.c:76
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "\\%-10[search]  Sök framåt efter en angiven sträng.\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr ""
-"Andra kommandon:\n"
-"----------------\n"
+#: info/infodoc.c:77
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[search-previous]  Sök efter föregående förekomst.\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "\\%-10[menu-digit]  Välj första ... nionde objektet i nodens meny.\n"
-
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "\\%-10[last-menu-item]  Välj det sista objektet i nodens meny.\n"
+#: info/infodoc.c:78
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "\\%-10[search-next]  Sök efter nästa förekomst.\n"
 
-#: info/infodoc.c:81
-msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
-msgstr ""
-"\\%-10[index-search]  Sök efter en angiven sträng i indexposterna i denna\n"
-"              Info-fil, och välj noden som refereras av den första posten\n"
-"              som hittas.\n"
-
-#: info/infodoc.c:83
+#: info/infodoc.c:79
 msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
-"\\%-10[goto-node]  Gå till den nod som anges.\n"
-"              Du kan även inkludera ett filnamn, som exempelvis\n"
-"              (FILNAMN)NODNAMN.\n"
+"\\%-10[index-search]  Sök efter en angiven sträng i indexet, och välj\n"
+"              noden som refereras av den första posten som hittas.\n"
 
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  Sök framåt efter en angiven sträng\n"
-"              och välj den nod i vilken nästa förekomst hittas.\n"
+#: info/infodoc.c:81
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "\\%-10[abort-key]  Avbryt pågående åtgärd.\n"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  Sök bakåt efter en angiven sträng\n"
-"              och välj den nod i vilken nästa förekomst hittas.\n"
+"Grundläggande kommandon i Info-fönster\n"
+"**************************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
-msgstr "  %-10s  Avsluta denna hjälp.\n"
+msgstr "  %-10s  Avsluta denna hjälp.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Avsluta Info helt.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Starta Info-handboken.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
-msgstr "  %-10s  Gå till nästa nod från denna nod.\n"
+msgstr "  %-10s  Gå till nästa nod från denna nod.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
-msgstr "  %-10s  Gå till föregående nod från denna nod.\n"
+msgstr "  %-10s  Gå till föregående nod från denna nod.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
-msgstr "  %-10s  Gå upp från denna nod.\n"
+msgstr "  %-10s  Gå upp från denna nod.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:101
 #, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Välj angiven menypost.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
-msgstr "              Att välja en menypost gör att en annan nod väljs.\n"
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"  %-10s  Välj den namngivna menyposten.\n"
+"              Att välja en menypost gör att en annan nod väljs.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
-msgstr "  %-10s  Följ en korsreferens. Läser namnet på en referens.\n"
+msgstr "  %-10s  Följ en korsreferens. Läser namnet på en referens.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
-msgstr "  %-10s  Gå till den sista noden i detta fönster.\n"
+msgstr "  %-10s  Gå till den sista noden i detta fönster.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
-msgstr "  %-10s  Hoppa till nästa hypertextlänk i denna nod.\n"
+msgstr "  %-10s  Hoppa till nästa hypertextlänk i denna nod.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
-msgstr "  %-10s  Följ hypertextlänken under markören.\n"
+msgstr "  %-10s  Följ hypertextlänken under markören.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
-msgstr "  %-10s  Gå till \"directory\"-noden. Likvärdigt med \"g (DIR)\".\n"
+msgstr "  %-10s  Gå till \"directory\"-noden. Likvärdigt med \"g (DIR)\".\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
-msgstr "  %-10s  Gå till den översta noden. Likvärdigt med \"g Top\".\n"
+msgstr "  %-10s  Gå till den översta noden. Likvärdigt med \"g Top\".\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Förflyttning inom en nod:\n"
+"-------------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
-msgstr "  %-10s  Rulla en sida framåt.\n"
+msgstr "  %-10s  Rulla en sida framåt.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
-msgstr "  %-10s  Rulla en sida bakåt.\n"
+msgstr "  %-10s  Rulla en sida bakåt.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
-msgstr "  %-10s  Gå till början på denna nod.\n"
+msgstr "  %-10s  Gå till början på denna nod.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
-msgstr "  %-10s  Gå till slutet på denna nod.\n"
+msgstr "  %-10s  Gå till slutet på denna nod.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
-msgstr "  %-10s  Rulla en rad framåt.\n"
+msgstr "  %-10s  Rulla en rad framåt.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
-msgstr "  %-10s  Rulla en rad bakåt.\n"
+msgstr "  %-10s  Rulla en rad bakåt.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Andra kommandon:\n"
+"----------------\n"
+
+#: info/infodoc.c:121
 #, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
-msgstr "  %-10s  Välj första ... nionde objektet i nodens meny.\n"
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
+msgstr "  %-10s  Välj första...nionde objektet i nodens meny.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
-msgstr "  %-10s  Välj det sista objektet i nodens meny.\n"
+msgstr "  %-10s  Välj det sista objektet i nodens meny.\n"
 
-# This is broken
-#
-#  N_("  %-10s  Search for a specified string in the index entries of this Info\n"),
-#  N_("              file, and select the node referenced by the first entry found.\n"),
-#
-# Please don't split a single sentence like this in multiple messages,
-# use one single message instead. Sentences have to be kept together when
-# translating, you can't split a sentence into parts and mark them for
-# separate translation and expect it to work with word ordering,
-# grammar, and everything else in other languages. Splitting sentences
-# just makes it harder for translators when having not just to translate,
-# but also puzzle the pieces of the sentence together again so that it
-# makes some sense, in order to be able to translate in the first place.
-#
-#: info/infodoc.c:129
+#: info/infodoc.c:125
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr "  %-10s  Sök efter en angiven sträng i indexposterna i denna\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
-"              Info-fil, och välj noden som refereras av den första posten\n"
-"              som hittas.\n"
+"  %-10s  Sök efter en angiven sträng i indexposterna i denna Info-fil,\n"
+"              och välj noden som refereras av den första posten som\n"
+"              hittas.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:127
 #, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Gå till den nod som anges.\n"
-
-#: info/infodoc.c:132
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
-"              Du kan även inkludera ett filnamn, som exempelvis\n"
+"  %-10s  GÃ¥ till den namngivna noden.\n"
+"              Du kan även inkludera ett filnamn, som exempelvis\n"
 "              (FILNAMN)NODNAMN.\n"
 
-# This is broken
-#
-#  N_("  %-10s  Search forward through this Info file for a specified string,\n"),
-#  N_("              and select the node in which the next occurrence is found.\n"),
-#
-# Please don't split a single sentence like this in multiple messages,
-# use one single message instead. Sentences have to be kept together when
-# translating, you can't split a sentence into parts and mark them for
-# separate translation and expect it to work with word ordering,
-# grammar, and everything else in other languages. Splitting sentences
-# just makes it harder for translators when having not just to translate,
-# but also puzzle the pieces of the sentence together again so that it
-# makes some sense, in order to be able to translate in the first place.
-#
-#: info/infodoc.c:133
+#: info/infodoc.c:129
 #, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Sök framåt efter en angiven sträng,\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
-msgstr "              och välj den nod i vilken nästa förekomst hittas.\n"
+msgstr ""
+"  %-10s  Sök framåt efter en angiven sträng\n"
+"              och välj den nod i vilken nästa förekomst hittas.\n"
 
-# This is broken
-#
-#  N_("  %-10s  Search backward in this Info file for a specified string,\n"),
-#  N_("              and select the node in which the next occurrence is found.\n"),
-#
-# Please don't split a single sentence like this in multiple messages,
-# use one single message instead. Sentences have to be kept together when
-# translating, you can't split a sentence into parts and mark them for
-# separate translation and expect it to work with word ordering,
-# grammar, and everything else in other languages. Splitting sentences
-# just makes it harder for translators when having not just to translate,
-# but also puzzle the pieces of the sentence together again so that it
-# makes some sense, in order to be able to translate in the first place.
-#
-#: info/infodoc.c:135
+#: info/infodoc.c:131
 #, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Sök bakåt efter en angiven sträng,\n"
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"  %-10s  Sök bakåt efter en angiven sträng\n"
+"              och välj den nod i vilken nästa förekomst hittas.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
-msgstr "Den aktuella sökvägen är:\n"
+msgstr "Den aktuella sökvägen är:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
 msgstr ""
-"Kommandon som är tillgängliga i Info-fönster:\n"
+"Kommandon som är tillgängliga i Info-fönster:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr ""
-"Kommandon som är tillgängliga i echo-området:\n"
+"Kommandon som är tillgängliga i echo-området:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
 "\n"
 msgstr ""
-"Följande kommandon kan endast startas via %s:\n"
+"Följande kommandon kan endast startas via %s:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
 msgstr ""
-"Följande kommandon kan inte startas alls:\n"
+"Följande kommandon kan inte startas alls:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-"--- Använd \"\\[history-node]\" eller \"\\[kill-node]\" för att avsluta ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
-msgstr "Visa hjälpmeddelande"
+msgstr "Visa hjälpmeddelande"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
-msgstr "Besök Info-noden \"(info)Help\""
+msgstr "Besök Info-noden \"(info)Help\""
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
-msgstr "Visa dokumentationen för NYCKEL"
+msgstr "Visa dokumentationen för NYCKEL"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Beskriv nyckel: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
-msgstr "ESC %s är odefinierad."
+msgstr "ESC %s är odefinierad."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
-msgstr "%s är odefinierad."
+msgstr "%s är odefinierad."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
-msgstr "%s är definierad till %s."
+msgstr "%s är definierad till %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
-msgstr "Visa vad som ska anges för att köra ett angivet kommando"
+msgstr "Visa vad som ska anges för att köra ett angivet kommando"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
-msgstr "Var är kommando: "
+msgstr "Var är kommando: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
-msgstr "\"%s\" finns inte på några tangenter"
+msgstr "\"%s\" finns inte på några tangenter"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s kan endast startas via %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s kan startas via %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Det finns ingen funktion med namnet \"%s\""
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"Det finns INGEN garanti. Du kan vidaredistribuera denna programvara\n"
-"under villkoren i GNU General Public License.\n"
-"Se filen COPYING för mer information om detta.\n"
+"Välja andra noder:\n"
+"------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -908,7 +928,7 @@ msgstr "felaktigt antal argument"
 #: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
-msgstr "kan inte öppna indatafilen \"%s\""
+msgstr "kan inte öppna indatafilen \"%s\""
 
 #: info/infokey.c:215
 #, c-format
@@ -923,11 +943,11 @@ msgstr "fel vid skrivning till \"%s\""
 #: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
-msgstr "fel vid stängning av utdatafilen \"%s\""
+msgstr "fel vid stängning av utdatafilen \"%s\""
 
 #: info/infokey.c:450
 msgid "key sequence too long"
-msgstr "nyckelsekvensen är för lång"
+msgstr "nyckelsekvensen är för lång"
 
 #: info/infokey.c:529
 msgid "missing key sequence"
@@ -935,34 +955,34 @@ msgstr "nyckelsekvens saknas"
 
 #: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
-msgstr "NUL-tecknet (\\000) är inte tillåtet"
+msgstr "NUL-tecknet (\\000) är inte tillåtet"
 
 #: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
-msgstr "NUL-tecknet (^%c) är inte tillåtet"
+msgstr "NUL-tecknet (^%c) är inte tillåtet"
 
 #: info/infokey.c:665
 msgid "missing action name"
-msgstr "åtgärdsnamn saknas"
+msgstr "åtgärdsnamn saknas"
 
 #: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
-msgstr "avsnittet är för långt"
+msgstr "avsnittet är för långt"
 
 #: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
-msgstr "okänd åtgärd \"%s\""
+msgstr "okänd åtgärd \"%s\""
 
 #: info/infokey.c:698
 msgid "action name too long"
-msgstr "åtgärdsnamnet är för långt"
+msgstr "åtgärdsnamnet är för långt"
 
 #: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
-msgstr "extra tecken följer på åtgärden \"%s\""
+msgstr "extra tecken följer på åtgärden \"%s\""
 
 #: info/infokey.c:723
 msgid "missing variable name"
@@ -974,11 +994,11 @@ msgstr "\"=\" saknas direkt efter variabelnamnet"
 
 #: info/infokey.c:741
 msgid "variable name too long"
-msgstr "variabelnamnet är för långt"
+msgstr "variabelnamnet är för långt"
 
 #: info/infokey.c:765
 msgid "value too long"
-msgstr "värdet är för långt"
+msgstr "värdet är för långt"
 
 #: info/infokey.c:890
 #, c-format
@@ -998,115 +1018,115 @@ msgid ""
 "  --help               display this help and exit.\n"
 "  --version            display version information and exit.\n"
 msgstr ""
-"Användning: %s [FLAGGA]... [INDATAFIL]\n"
+"Användning: %s [FLAGGA]... [INDATAFIL]\n"
 "\n"
-"Kompilera infonyckelkällfil till infonyckelfil. Läser INDATAFIL (som\n"
+"Kompilera infonyckelkällfil till infonyckelfil. Läser INDATAFIL (som\n"
 "standard $HOME/.infokey) och skriver (som standard) den kompilerade\n"
 "nyckelfilen till $HOME/.info.\n"
 "\n"
 "Flaggor:\n"
-"  --output FIL         generera till FIL istället för $HOME/.info\n"
-"  --help               visa denna hjälptext och avsluta.\n"
+"  --output FIL         generera till FIL istället för $HOME/.info\n"
+"  --help               visa denna hjälptext och avsluta.\n"
 "  --version            visa versionsinformation och avsluta.\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
-msgstr "Ignorerar ogiltig infonyckelfil \"%s\" - för liten"
+msgstr "Ignorerar ogiltig infonyckelfil \"%s\" - för liten"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
-msgstr "Ignorerar ogiltig infonyckelfil \"%s\" - för stor"
+msgstr "Ignorerar ogiltig infonyckelfil \"%s\" - för stor"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
-msgstr "Fel vid läsning av infonyckelfilen \"%s\" - kort läsning"
+msgstr "Fel vid läsning av infonyckelfilen \"%s\" - kort läsning"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
-"Ogiltig infonyckelfil \"%s\" (felaktiga magiska nummer) -- kör infokey för\n"
+"Ogiltig infonyckelfil \"%s\" (felaktiga magiska nummer) -- kör infokey för\n"
 "att uppdatera den"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
-"Din infonyckelfil \"%s\" är för gammal -- kör infokey för att uppdatera den"
+"Din infonyckelfil \"%s\" är för gammal -- kör infokey för att uppdatera den"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
-"Ogiltig infonyckelfil \"%s\" (felaktig asvnittslängd) -- kör infokey för\n"
+"Ogiltig infonyckelfil \"%s\" (felaktig asvnittslängd) -- kör infokey för\n"
 "att uppdatera den"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
-"ogiltig infonyckelfil \"%s\" (felaktig avsnittskod) -- kör infokey för att\n"
+"ogiltig infonyckelfil \"%s\" (felaktig avsnittskod) -- kör infokey för att\n"
 "uppdatera den"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "Felaktig data i infonyckelfil -- en del bindningar ignorerades"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
-msgstr "Felaktig data i infonyckelfil -- en del inställningar ignorerades"
+msgstr "Felaktig data i infonyckelfil -- en del inställningar ignorerades"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
-msgstr "Läs namnet på ett Info-kommando och beskriv det"
+msgstr "Läs namnet på ett Info-kommando och beskriv det"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Beskriv kommando: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
-msgstr "Läs ett kommandonamn i echo-området och kör det"
+msgstr "Läs ett kommandonamn i echo-området och kör det"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
-msgstr "Kan inte köra ett \"echo-area\"-kommando här."
+msgstr "Kan inte köra ett \"echo-area\"-kommando här."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, c-format
 msgid "Undefined command: %s"
 msgstr "Odefinierat kommando: %s"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
-msgstr "Ställ in höjden på det visade fönstret"
+msgstr "Ställ in höjden på det visade fönstret"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
-msgstr "Ställ in skärmhöjden till (%d): "
+msgstr "Ställ in skärmhöjden till (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
-"   Källkodsfiler som grävdes igenom för att göra att denna fil inkluderar:\n"
+"   Källkodsfiler som grävdes igenom för att göra att denna fil inkluderar:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kunde inte manipulera filen %s.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1115,428 +1135,424 @@ msgid ""
 msgstr ""
 "\n"
 "* Meny:\n"
-"  (Fil)Nod                          Rader   Storl. Innehållande fil\n"
+"  (Fil)Nod                          Rader   Storl. Innehållande fil\n"
 "  --------                          -----   ------ ----------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
 msgstr ""
-"Här är menyn med de noder som du har besökt nyligen.\n"
-"Välj en från denna meny eller använd\"\\[history-node]\" i ett annat "
-"fönster.\n"
+"Här är menyn med de noder som du har besökt nyligen.\n"
+"Välj en från denna meny eller använd\"\\[history-node]\" i ett annat "
+"fönster.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr ""
-"Skapa ett fönster som innehåller en meny med alla nyligen besökta noder"
+"Skapa ett fönster som innehåller en meny med alla nyligen besökta noder"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
-msgstr "Välj en nod som har besökts nyligen i ett synligt fönster"
+msgstr "Välj en nod som har besökts nyligen i ett synligt fönster"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
-msgstr "Välj besökt nod: "
+msgstr "Välj besökt nod: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
-msgstr "Referensen försvann! (%s)."
+msgstr "Referensen försvann! (%s)."
+
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr "fel i reguljärt uttryck: %s"
 
-#: info/session.c:162
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
 "for menu item."
 msgstr ""
-"Välkommen till Info version %s. Skriv in \\[get-help-window] för hjälp, "
-"\\[menu-item] för menypost."
+"Välkommen till Info version %s. Skriv in \\[get-help-window] för hjälp, "
+"\\[menu-item] för menypost."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
-msgstr "Gå ned till nästa rad"
+msgstr "Gå ned till nästa rad"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
-msgstr "Gå upp till föregående rad"
+msgstr "Gå upp till föregående rad"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
-msgstr "Gå till slutet på raden"
+msgstr "Gå till slutet på raden"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
-msgstr "Gå till början på raden"
+msgstr "Gå till början på raden"
 
 # src/menus.c:332
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
-msgstr "Nästa"
-
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Följer nästa-nod..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Väljer första menyposten..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Väljer nästa nod..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "Går upp %d gång(er), sedan Nästa."
+msgstr "Nästa"
 
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "Inga fler noder i detta dokument."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
-msgstr "Ingen \"Föreg\" för denna nod."
-
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Gå till föregående i detta fönster."
+msgstr "Ingen \"Föreg\" för denna nod."
 
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
-msgstr "Inget \"Prev\" eller \"Up\" för denna nod inom detta dokument."
-
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Går upp i detta fönster."
+msgstr "Inget \"Prev\" eller \"Up\" för denna nod inom detta dokument."
 
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Gå till \"Föreg\"s senaste menypost."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
-msgstr "Gå framåt eller nedåt i nodstrukturen"
+msgstr "Gå framåt eller nedåt i nodstrukturen"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
-msgstr "Gå bakåt eller upp i nodstrukturen"
+msgstr "Gå bakåt eller upp i nodstrukturen"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
-msgstr "Rulla framåt i detta fönster"
+msgstr "Rulla framåt i detta fönster"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
-msgstr "Rulla framåt i detta fönster och ställ in standardfönsterstorleken"
+msgstr "Rulla framåt i detta fönster och ställ in standardfönsterstorleken"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
-msgstr "Rulla framåt i detta fönster och stanna inom noden"
+msgstr "Rulla framåt i detta fönster och stanna inom noden"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
-"Rulla framåt i detta fönster och stanna inom noden och ställ in "
-"standardfönsterstorleken"
+"Rulla framåt i detta fönster och stanna inom noden och ställ in "
+"standardfönsterstorleken"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
-msgstr "Rulla bakåt i detta fönster"
+msgstr "Rulla bakåt i detta fönster"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
-msgstr "Rulla bakåt i detta fönster och ställ in standardfönsterstorleken"
+msgstr "Rulla bakåt i detta fönster och ställ in standardfönsterstorleken"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
-msgstr "Rulla bakåt i detta fönster och stanna inom noden"
+msgstr "Rulla bakåt i detta fönster och stanna inom noden"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
-"Rulla bakåt i detta fönster och stanna inom noden och ställ in "
-"standardfönsterstorleken"
+"Rulla bakåt i detta fönster och stanna inom noden och ställ in "
+"standardfönsterstorleken"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
-msgstr "Gå till början på denna nod"
+msgstr "Gå till början på denna nod"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
-msgstr "Gå till slutet på denna nod"
+msgstr "Gå till slutet på denna nod"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
-msgstr "Rulla nedåt radvis"
+msgstr "Rulla nedåt radvis"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
-msgstr "Rulla uppåt radvis"
+msgstr "Rulla uppåt radvis"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
-msgstr "Rulla nedåt med halva skärmstorleken"
+msgstr "Rulla nedåt med halva skärmstorleken"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
-msgstr "Rulla uppåt med halva skärmstorleken"
+msgstr "Rulla uppåt med halva skärmstorleken"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
-msgstr "Välj nästa fönster"
+msgstr "Välj nästa fönster"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
-msgstr "Välj föregående fönster"
+msgstr "Välj föregående fönster"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
-msgstr "Dela aktuellt fönster"
+msgstr "Dela aktuellt fönster"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
-msgstr "Ta bort aktuellt fönster"
+msgstr "Ta bort aktuellt fönster"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
-msgstr "Kan inte ta bort ett permanent fönster"
+msgstr "Kan inte ta bort ett permanent fönster"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
-msgstr "Ta bort alla andra fönster"
+msgstr "Ta bort alla andra fönster"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
-msgstr "Rulla det andra fönstret"
+msgstr "Rulla det andra fönstret"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
-msgstr "Rulla det andra fönstret bakåt"
+msgstr "Rulla det andra fönstret bakåt"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
-msgstr "Väx (eller krymp) detta fönster"
+msgstr "Väx (eller krymp) detta fönster"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
-msgstr "Dela det tillgängliga skärmutrymmet mellan de synliga fönstren"
+msgstr "Dela det tillgängliga skärmutrymmet mellan de synliga fönstren"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
-msgstr "Växla tillståndet för radbrytning i det aktuella fönstret"
+msgstr "Växla tillståndet för radbrytning i det aktuella fönstret"
 
-#: info/session.c:1848
-msgid "Select the Next node"
-msgstr "Välj nästa nod"
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr "Växla användningen av reguljära uttryck i sökningar"
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr "Använder reguljära uttryck i sökningar."
 
 #: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr "Använder ordagranna strängar i sökningar."
+
+#: info/session.c:2027
+msgid "Select the Next node"
+msgstr "Välj nästa nod"
+
+#: info/session.c:2035
 msgid "Select the Prev node"
-msgstr "Välj föregående nod"
+msgstr "Välj föregående nod"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
-msgstr "Välj uppnoden"
+msgstr "Välj uppnoden"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
-msgstr "Välj den sista noden i denna fil"
+msgstr "Välj den sista noden i denna fil"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
-msgstr "Detta fönster har inga ytterligare noder"
+msgstr "Detta fönster har inga ytterligare noder"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
-msgstr "Välj den första noden i denna fil"
+msgstr "Välj den första noden i denna fil"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
-msgstr "Välj det sista objektet i denna nods meny"
+msgstr "Välj det sista objektet i denna nods meny"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
-msgstr "Välj denna menypost"
+msgstr "Välj denna menypost"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Det finns inte %d poster i denna meny."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menypost (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Menypost: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
-msgstr "Följ xref (%s): "
+msgstr "Följ xref (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
-msgstr "Följ xref: "
+msgstr "Följ xref: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
-msgstr "Läs en menypost och välj dess nod"
+msgstr "Läs en menypost och välj dess nod"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
-msgstr "Läs en fotnot eller korsreferens och välj dess nod"
+msgstr "Läs en fotnot eller korsreferens och välj dess nod"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
-msgstr "Gå till början på denna nods meny"
+msgstr "Gå till början på denna nods meny"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
-msgstr "Besök så många menyposter som möjligt samtidigt"
+msgstr "Besök så många menyposter som möjligt samtidigt"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
-msgstr "Läs ett nodnamn och välj det"
+msgstr "Läs ett nodnamn och välj det"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
-msgstr "Gå till nod: "
+msgstr "GÃ¥ till nod: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Ingen meny i noden \"%s\"."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Ingen menypost \"%s\" i noden \"%s\"."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Kan inte hitta noden som refereras av \"%s\" i \"%s\"."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
-msgstr "Läs en lista med menyer som börjar med katalog, och följ dem"
+msgstr "Läs en lista med menyer som börjar med katalog, och följ dem"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
-msgstr "Följ menyer: "
+msgstr "Följ menyer: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Hitta den nod som beskriver start av programmet"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
-msgstr "Hitta programstartnod för [%s]: "
+msgstr "Hitta programstartnod för [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
-msgstr "Läs en referens till manualsida och välj den"
+msgstr "Läs en referens till manualsida och välj den"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
-msgstr "Hämta manualsida: "
+msgstr "Hämta manualsida: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
-msgstr "Välj noden \"Top\" i denna fil"
+msgstr "Välj noden \"Top\" i denna fil"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
-msgstr "Välj noden \"(dir)\""
+msgstr "Välj noden \"(dir)\""
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
-msgstr "Döda noden (%s): "
+msgstr "Döda noden (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
-msgstr "Kan inte döda noden \"%s\""
+msgstr "Kan inte döda noden \"%s\""
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
-msgstr "Kan inte döda den sista noden"
+msgstr "Kan inte döda den sista noden"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
-msgstr "Välj den senast valda noden"
+msgstr "Välj den senast valda noden"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
-msgstr "Döda denna nod"
+msgstr "Döda denna nod"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
-msgstr "Läs namnet på en fil och välj den"
+msgstr "Läs namnet på en fil och välj den"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
-msgstr "Sök fil: "
+msgstr "Sök fil: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Kan inte hitta \"%s\"."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Kunde inte skapa utdatafilen \"%s\"."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
-msgstr "Färdig."
+msgstr "Färdig."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "Skriver noden %s..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
-msgstr "Skicka innehållet i denna nod i rör till INFO_PRINT_COMMAND"
+msgstr "Skicka innehållet i denna nod i rör till INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
-msgstr "Kan inte öppna rör till \"%s\"."
+msgstr "Kan inte öppna rör till \"%s\"."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "Skriver ut noden %s..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr "Sökningen fortsatte från slutet av dokumentet."
+
+#: info/session.c:3738
+msgid "Search continued from the beginning of the document."
+msgstr "Sökningen fortsatte från början av dokumentet."
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
-msgstr "Söker i underfilen %s..."
+msgstr "Söker i underfilen %s..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
-msgstr "Läs en sträng och sök efter den skiftlägeskänsligt"
+msgstr "Läs en sträng och sök efter den skiftlägeskänsligt"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
-msgstr "Läs en sträng och sök efter den"
+msgstr "Läs en sträng och sök efter den"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
-msgstr "Läs en sträng och sök baklänges efter den"
+msgstr "Läs en sträng och sök baklänges efter den"
 
 # This is broken
 #
@@ -1557,271 +1573,497 @@ msgstr "Läs en sträng och sök baklänges efter den"
 # messages themselves. Yes, this will result in many more messages, but
 # those will be translatable, while the current design isn't.
 #
-#: info/session.c:3670 info/session.c:3677
+#: info/session.c:3863 info/session.c:3869
 #, c-format
-msgid "%s%sfor string [%s]: "
-msgstr "%s%sefter stängen [%s]: "
+msgid "%s%s%s [%s]: "
+msgstr "%s%s%s [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
-msgstr "Sök baklänges"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr "Sökning med reguljära uttryck"
 
-#: info/session.c:3672 info/session.c:3678
-msgid "Search"
-msgstr "Sök"
+#: info/session.c:3865 info/session.c:3871
+msgid " case-sensitively"
+msgstr " skiljandes på VERSALER/gemener"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " skiljandes på VERSALER/gemener "
+#: info/session.c:3866 info/session.c:3872
+msgid " backward"
+msgstr " baklänges"
 
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
+#: info/session.c:3870
+msgid "Search"
+msgstr "Sök"
 
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
-msgstr "Sökningen misslyckades."
+msgstr "Sökningen misslyckades."
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
-msgstr "Upprepa den senaste sökningen i samma riktning"
+msgstr "Upprepa den senaste sökningen i samma riktning"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
-msgstr "Ingen tidigare söksträng"
+msgstr "Ingen tidigare söksträng"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
-msgstr "Upprepa den senaste sökningen i omvänd riktning"
+msgstr "Upprepa den senaste sökningen i omvänd riktning"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
-msgstr "Sök interaktivt efter en sträng allteftersom du skriver den"
+msgstr "Sök interaktivt efter en sträng allteftersom du skriver den"
+
+#: info/session.c:4044
+msgid "Regexp I-search backward: "
+msgstr "I-sök med reguljärt uttryck baklänges: "
 
-#: info/session.c:3851
+#: info/session.c:4045
 msgid "I-search backward: "
-msgstr "I-sök baklänges: "
+msgstr "I-sök baklänges: "
+
+#: info/session.c:4047
+msgid "Regexp I-search: "
+msgstr "I-sök med reguljärt uttryck: "
 
-#: info/session.c:3853
+#: info/session.c:4048
 msgid "I-search: "
-msgstr "I-sök: "
+msgstr "I-sök: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "Misslyckas "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
-msgstr "Gå till föregående korsreferens"
+msgstr "Gå till föregående korsreferens"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
-msgstr "Gå till nästa korsreferens"
+msgstr "Gå till nästa korsreferens"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
-msgstr "Välj referens eller menypost som finns på denna rad"
+msgstr "Välj referens eller menypost som finns på denna rad"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
-msgstr "Avbryt aktuell åtgärd"
+msgstr "Avbryt pågående åtgärd"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Avsluta"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
-msgstr "Flytta markören till en specifik rad i fönstret"
+msgstr "Flytta markören till en specifik rad i fönstret"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "Rita om displayen"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
-msgstr "Avsluta användandet av Info"
+msgstr "Avsluta användandet av Info"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
-msgstr "Kör kommando som är knutet till denna tangents gemena variant"
+msgstr "Kör kommando som är knutet till denna tangents gemena variant"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
-msgstr "Okänt kommando (%s)."
+msgstr "Okänt kommando (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
-msgstr "\"%s\" är ogiltigt"
+msgstr "\"%s\" är ogiltigt"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, c-format
 msgid "`%s' is invalid"
-msgstr "\"%s\" är ogiltigt"
+msgstr "\"%s\" är ogiltigt"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
-msgstr "Lägg till denna siffra till det aktuella numeriska argumentet"
+msgstr "Lägg till denna siffra till det aktuella numeriska argumentet"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
-msgstr "Börja (eller multiplicera med 4) det numeriska argumentet"
+msgstr "Börja (eller multiplicera med 4) det numeriska argumentet"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
-msgstr "Används internt av \\[universal-argument]"
+msgstr "Används internt av \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
-msgstr "readline: Slut på virtuellt minne!\n"
+msgstr "readline: Slut på virtuellt minne!\n"
 
 #: info/variables.c:37
 msgid "When \"On\", footnotes appear and disappear automatically"
-msgstr "När detta är \"On\" visas och försvinner fotnoter automatiskt"
+msgstr "När detta är \"On\" visas och försvinner fotnoter automatiskt"
 
 #: info/variables.c:41
 msgid "When \"On\", creating or deleting a window resizes other windows"
 msgstr ""
-"När detta är \"On\" ändrar skapande eller borttagande av ett fönster\n"
-"storleken på andra fönster"
+"När detta är \"On\" ändrar skapande eller borttagande av ett fönster\n"
+"storleken på andra fönster"
 
 #: info/variables.c:45
 msgid "When \"On\", flash the screen instead of ringing the bell"
 msgstr ""
-"När detta är \"On\" blinkar skärmen till istället för att klockan ringer"
+"När detta är \"On\" blinkar skärmen till istället för att klockan ringer"
 
 #: info/variables.c:49
 msgid "When \"On\", errors cause the bell to ring"
-msgstr "När detta är \"On\" gör fel att klockan ringer"
+msgstr "När detta är \"On\" gör fel att klockan ringer"
 
 #: info/variables.c:53
 msgid "When \"On\", Info garbage collects files which had to be uncompressed"
-msgstr "När detta är \"On\" skräpsamlar Info filer som behövde packas upp"
+msgstr "När detta är \"On\" skräpsamlar Info filer som behövde packas upp"
 
 #: info/variables.c:56
 msgid "When \"On\", the portion of the matched search string is highlighted"
-msgstr "När detta är \"On\" markeras delen av den matchade söksträngen"
+msgstr "När detta är \"On\" markeras delen av den matchade söksträngen"
 
 #: info/variables.c:60
 msgid "Controls what happens when scrolling is requested at the end of a node"
-msgstr "Styr vad som händer då rullning begärs i slutet på en nod"
+msgstr "Styr vad som händer då rullning begärs i slutet på en nod"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr "Samma som \"scroll-behaviour\""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
-msgstr "Antalet rader att rulla då markören flyttas utanför fönstret"
+msgstr "Antalet rader att rulla då markören flyttas utanför fönstret"
+
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr "Styr huruvida \"scroll-behavior\" påverkar flyttkommandon för markören"
 
-#: info/variables.c:68
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
-msgstr "När detta är \"On\" accepterar och visar Info ISO Latin-tecken"
+msgstr "När detta är \"On\" accepterar och visar Info ISO Latin-tecken"
 
-#: info/variables.c:74
+#: info/variables.c:81
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr ""
+"Vad som ska göras då ett rullningskommando ges i slutet på den sista noden"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
-msgstr "Förklara användandet av en variabel"
+msgstr "Förklara användandet av en variabel"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Beskriv variabel: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
-msgstr "Ställ in värdet på en Info-variabel"
+msgstr "Ställ in värdet på en Info-variabel"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
-msgstr "Ställ in variabel: "
+msgstr "Ställ in variabel: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
-msgstr "Ställ in %s till värdet (%d): "
+msgstr "Ställ in %s till värdet (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
-msgstr "Ställ in %s till värdet (%s): "
+msgstr "Ställ in %s till värdet (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
-msgstr "--*** För gamla taggar ***"
+msgstr "--*** För gamla taggar ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), rader ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d rader --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d rader --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Underfil: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flaggan \"%s\" är flertydig\n"
+msgid "%s: warning: "
+msgstr "%s: varning: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+# char *s = concat ("", strerror (errno), _(" for %s"));
+#
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"--%s\" tillåter inget argument\n"
+msgid " for %s"
+msgstr " för %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"%c%s\" tillåter inget argument\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tProva \"%s --help\" för en fullständig lista med flaggor.\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:508
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flaggan \"%s\" kräver ett argument\n"
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Användning: %s [FLAGGA]... [INFO-FIL [KATALOGFIL]]\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+"Lägg till eller ta bort poster i INFO-FIL från Info-katalogen KATALOGFIL."
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+"Flaggor:\n"
+" --debug             rapportera vad som görs.\n"
+" --delete            ta bort existerande poster för INFO-FIL från "
+"KATALOGFIL\n"
+"                      och infoga inte några nya poster.\n"
+" --description=TEXT  postens beskrivning är TEXT. Detta används tillsammans\n"
+"                      med flaggan --name för att den ska bli likvärdig med\n"
+"                      flaggan --entry.\n"
+" --dir-file=NAMN     ange filnamnet på Info-katalogfilen. Detta motsvarar\n"
+"                      användning av argumentet KATALOGFIL.\n"
+" --dry-run           samma som --test."
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+" --entry=TEXT        infoga TEXT som en Info-katalogpost.\n"
+"                      TEXT skrivs som en Info-menypostrad som följs av\n"
+"                      noll eller fler extra rader som börjar med tomrum.\n"
+"                     Om du anger mer än en post kommer alla att läggas\n"
+"                      till. Om du inte anger några poster kommer de att\n"
+"                      avgöras från information i själva Info-filen.\n"
+"                     Vid borttagning anger TEXT posten som ska tas bort.\n"
+"                     TEXT tas endast bort som en sista utväg, om den\n"
+"                     post som anges utav Info-filen inte finns och\n"
+"                     basnamnet för Info-filen inte heller kan hittas."
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+" --help              visa denna hjälptext och avsluta.\n"
+" --info-dir=KAT      samma som --dir-file=KAT/dir.\n"
+" --info-file=FIL     ange Info-fil att installera i katalogen.\n"
+"                      Detta motsvarar användning av argumentet INFO-FIL.\n"
+" --item=TEXT         samma som --entry=TEXT.\n"
+" --keep-old          ersätt inte poster och ta inte bort tomma avsnitt.\n"
+" --menuentry=TEXT    samma som --name=TEXT.\n"
+" --name=TEXT         namnet på posten är TEXT. Används tillsammans med\n"
+"                      --description för att bli likvärdigt med flaggan\n"
+"                      --entry.\n"
+" --no-indent         formatera inte nya poster i filen KAT.\n"
+" --quiet             undertryck varningar."
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+" --regex=R           placera denna fils poster i alla avsnitt som matchar\n"
+"                      det reguljära uttrycket R (och ignorera skiftläge).\n"
+" --remove            samma som --delete.\n"
+" --remove-exactly    ta endast bort om Info-filnamnet matchar exakt.\n"
+"                      Filändelser som till exempel .info- och .gz ignoreras\n"
+"                      inte.\n"
+" --section=AVSNITT   placera poster i avsnittet AVSNITT i katalogen. Om du\n"
+"                      anger mer än ett avsnitt kommer alla poster att "
+"läggas\n"
+"                      till i varje avsnitt. Om du inte anger några avsnitt\n"
+"                      kommer de att bestämmas utifrån information i själva\n"
+"                      Info-filen.\n"
+" --section R AVSNITT likvärdigt med --regex=R --section=AVSNITT --add-once."
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+" --silent            undertryck varningar.\n"
+" --test              undertryck uppdatering av KATALOGFIL.\n"
+" --version           visa versionsinformation och avsluta."
+
+#: install-info/install-info.c:570
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"Skicka felrapporter till bug-texinfo@gnu.org,\n"
+"allmänna frågor och diskussion till help-texinfo@gnu.org\n"
+"och synpunkter på översättningen till tp-sv@listor.tp-sv.se.\n"
+"Hemsida för texinfo: http://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: okänd flagga \"--%s\"\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Detta är filen .../info/dir som innehåller den översta noden i\n"
+"Info-hierarkin som kallas (kat)Top.\n"
+"Första gången du använder Info börjar du med denna nod.\n"
+"\n"
+"%s\tDetta är översta noden i INFO-trädet\n"
+"\n"
+"  Denna nod (katalognoden) erbjuder en meny med huvudrubriker.\n"
+"  Att skriva \"q\" avslutar, \"?\" visar alla Info-kommandon, \"d\"\n"
+"  återvänder hit, \"h\" visar en hjälp för förstagångsanvändare,\n"
+"  \"mEmacs<Retur>\" besöker Emacs-manualen, osv.\n"
+"\n"
+"  I Emacs kan du klicka med musknapp 2 på en menypost eller korsreferens\n"
+"  för att välja den.\n"
+"\n"
+"%s\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: okänd flagga \"%c%s\"\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: kunde inte läsa (%s) och kunde inte skapa (%s)\n"
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: otillåten flagga -- %c\n"
+msgid "%s: empty file"
+msgstr "%s: tom fil"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY utan matchande END-INFO-DIR-ENTRY"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY utan matchande START-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ogiltig flagga -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: har redan katalogfilen: %s\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flaggan kräver ett argument -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Ange Info-filen endast en gång.\n"
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flaggan \"-W %s\" är flertydig\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr "Extra reguljärt uttryck angivet, ignorerar \"%s\""
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n"
+msgid "Error in regular expression `%s': %s"
+msgstr "Fel i reguljära uttrycket \"%s\": %s"
+
+#: install-info/install-info.c:2129
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "för många kommandoradsargument \"%s\""
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr "Ingen indatafil angiven; prova --help för mer information."
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr "Ingen katalogfil angiven; prova --help för mer information."
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "ingen info-katalogpost i \"%s\""
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "inga poster hittades för \"%s\"; ingenting togs bort"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr "ferror-fel på standard ut\n"
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr "fflush-fel på standard ut\n"
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "argument till @%s ignorerades"
@@ -1831,611 +2073,614 @@ msgstr "argument till @%s ignorerades"
 # The translator should not need to translate this - it is all present
 # in libc and can be used with nl_langinfo(), strftime() and friends.
 #
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "januari"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "februari"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "mars"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "april"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "maj"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "juni"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "juli"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "augusti"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "september"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "oktober"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "november"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "december"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "osannolikt tecken %c i @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
-"@sc-argumentet är enbart med stora bokstäver, därför har det ingen effekt"
+"@sc-argumentet är enbart med stora bokstäver, därför har det ingen effekt"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
-msgstr "\"{\" förväntades, men såg \"%c\""
+msgstr "\"{\" förväntades, men såg \"%c\""
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "filslut inuti verb-block"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
-msgstr "\"}\" förväntades, men såg \"%c\""
+msgstr "\"}\" förväntades, men såg \"%c\""
 
-# Är det kombinationen "@strong{Note:.." eller bara @strong{} rent allmänt som
+# Är det kombinationen "@strong{Note:.." eller bara @strong{} rent allmänt som
 # orsakar problem?
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
-"@strong{Obs...} skapar en falsk korsreferens i Info; formulera om för att "
+"@strong{Obs...} skapar en falsk korsreferens i Info; formulera om för att "
 "undvika detta"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
-msgstr "%c%s är föråldrat"
+msgstr "%c%s är föråldrat"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
-msgstr "@sp kräver ett positivt numeriskt argument, inte \"%s\""
+msgstr "@sp kräver ett positivt numeriskt argument, inte \"%s\""
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Felaktigt argument till %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
-msgstr "oförändrad"
+msgstr "oförändrad"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "ingen"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Felaktigt argument till @%s"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr "infoga"
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "\"}\" saknas i @def-argumentet"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Funktion"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Makro"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Specialform"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Variabel"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Användarflagga"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Instansvariabel"
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Felaktigt argument till @%s: %s"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Metod"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr "Förväntade @%s on eller off, inte \"%s\""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "av"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr "Endast @%s 10 eller 11 stöds, inte \"%s\""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "på"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "\"}\" saknas i @def-argumentet"
 
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
-msgstr "Måste vara i \"@%s\"-omgivning för att använda \"@%s\""
+msgstr "Måste vara i \"@%s\"-omgivning för att använda \"@%s\""
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
-msgstr "\"%s\" utelämnades innan utdatafilnamnet"
+msgstr "\"%s\" utelämnades innan utdatafilnamnet"
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
-msgstr "\"%s\" utelämnades efter skrivning till standard ut"
+msgstr "\"%s\" utelämnades efter skrivning till standard ut"
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
-msgstr "Utdatabufferten är inte tom."
+msgstr "Utdatabufferten är inte tom."
+
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr "Begärda flyttalstypen \"%s\" har inte tidigare använts"
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Se "
 
-#: makeinfo/footnote.c:150
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
-msgstr "\"%c%s\" behöver ett argument \"{...}\", inte bara \"%s\""
+msgstr "\"%c%s\" behöver ett argument \"{...}\", inte bara \"%s\""
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
-msgstr "Ingen avslutande klammer för fotnoten \"%s\""
+msgstr "Ingen avslutande klammer för fotnoten \"%s\""
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
-msgstr "Fotnoten definierad utan föräldernod"
+msgstr "Fotnoten definierad utan föräldernod"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
-msgstr "Fotnoter inuti fotnoter är inte tillåtet"
+msgstr "Fotnoter inuti fotnoter är inte tillåtet"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "Fotnoter"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
-msgstr "%s: kunde inte öppna --css-fil: %s"
+msgstr "%s: kunde inte öppna --css-fil: %s"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: --css-fil slutade med kommentar"
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "Namnlös"
-
 # to pop?
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
-msgstr "[oväntat] ingen html-tagg att poppa"
+msgstr "[oväntat] ingen html-tagg att poppa"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
-msgstr "[oväntat] ogiltigt nodnamn: \"%s\""
+msgstr "[oväntat] ogiltigt nodnamn: \"%s\""
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
-msgstr "Okänt index \"%s\""
+msgstr "Okänt index \"%s\""
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info kan inte hantera \":\" i indexposten \"%s\""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indexet \"%s\" finns redan"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
-msgstr "Okänt index \"%s\" och/eller \"%s\" i @synindex"
+msgstr "Okänt index \"%s\" och/eller \"%s\" i @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr "(rad )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr "(rad %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
-msgstr "Okänt index \"%s\" i @printindex"
+msgstr "Okänt index \"%s\" i @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
-msgstr "Posten för index \"%s\" är utanför alla noder"
+msgstr "Posten för index \"%s\" är utanför alla noder"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
-msgstr "(utanför alla noder)"
+msgstr "(utanför alla noder)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "Se "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
-msgstr "@item är inte tillåtet i argument till @itemize"
+msgstr "@item är inte tillåtet i argument till @itemize"
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Felaktig typ i insertion_type_pname"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
-msgstr "Uppräkningsstacken har flödat över"
+msgstr "Uppräkningsstacken har flödat över"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
-msgstr "bokstaveringen har flödat över, startar om vid %c"
+msgstr "bokstaveringen har flödat över, startar om vid %c"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
-msgstr "%s kräver ett argument: formateraren för %citem"
+msgstr "%s kräver ett argument: formateraren för %citem"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
-msgstr "%cfloat-omgivningar kan inte nästlas"
+msgstr "%cfloat-omgivningar kan inte nästlas"
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
-msgstr "\"@end\" förväntade \"%s\", men såg \"%s\""
+msgstr "\"@end\" förväntade \"%s\", men såg \"%s\""
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Inget matchande \"%cend %s\""
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
-msgstr "%s kräver bokstav eller siffra"
+msgstr "%s kräver bokstav eller siffra"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "filslut inuti bokstavligt block"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
-msgstr "@%s är inte meningsfullt utanför \"@float\"-omgivning"
+msgstr "@%s är inte meningsfullt utanför \"@float\"-omgivning"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
-msgstr "@menu sågs innan första @node, skapar \"Top\"-nod"
+msgstr "@menu sågs innan första @node, skapar \"Top\"-nod"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
-msgstr "din @top-nod ska kanske packas i @ifnottex istället för @ifinfo?"
+msgstr "din @top-nod ska kanske packas i @ifnottex istället för @ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
-msgstr "@detailmenu sågs innan första noden, skapar \"Top\"-nod"
+msgstr "@detailmenu sågs innan första noden, skapar \"Top\"-nod"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
-"@%s är inte meningsfullt utanför \"@titlepage\"- och \"@quotation\"-omgivning"
+"@%s är inte meningsfullt utanför \"@titlepage\"- och \"@quotation\"-omgivning"
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
-msgstr "@%s är inte meningsfullt utanför \"@titlepage\"-omgivning"
+msgstr "@%s är inte meningsfullt utanför \"@titlepage\"-omgivning"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Ensamt \"%c%s\""
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
-msgstr "\"%c%s\" kräver någonting efter sig"
+msgstr "\"%c%s\" kräver någonting efter sig"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
-msgstr "Felaktigt argument \"%s\" till \"@%s\", använder \"%s\""
+msgstr "Felaktigt argument \"%s\" till \"@%s\", använder \"%s\""
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
-msgstr "@%s är inte meningsfullt inuti \"@%s\"-block"
+msgstr "@%s är inte meningsfullt inuti \"@%s\"-block"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
-msgstr "@itemx är inte meningsfullt inuti \"%s\"-block"
+msgstr "@itemx är inte meningsfullt inuti \"%s\"-block"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
-msgstr "%c%s hittades utanför ett insättningsblock"
+msgstr "%c%s hittades utanför ett insättningsblock"
+
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr "inget standardterritorium är känt för språket \"%s\""
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
-msgstr "%s är inte en giltig landskod enligt ISO 639"
+msgstr "%s är inte en giltig landskod enligt ISO 639"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, c-format
 msgid "unrecognized encoding name `%s'"
-msgstr "okänt kodningsnamn \"%s\""
+msgstr "okänt kodningsnamn \"%s\""
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
-msgstr "tyvärr, kodningen \"%s\" stöds inte"
+msgstr "tyvärr, kodningen \"%s\" stöds inte"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ogiltigt kodat tecken \"%s\""
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
-msgstr "%c%s förväntar \"i\" eller \"j\" som argument, inte \"%c\""
+msgstr "%c%s förväntar \"i\" eller \"j\" som argument, inte \"%c\""
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
-msgstr "%c%s förväntar ett ensamt tecken \"i\" eller \"j\" som argument"
+msgstr "%c%s förväntar ett ensamt tecken \"i\" eller \"j\" som argument"
 
 #: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
-msgstr "makrot \"%s\" är redan definierat"
+msgstr "makrot \"%s\" är redan definierat"
 
 #: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
-msgstr "här är den tidigare definitionen av \"%s\""
+msgstr "här är den tidigare definitionen av \"%s\""
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
-msgstr "\\ i makroutökning följdes av \"%s\" istället för parameternamn"
+msgstr "\\ i makroutökning följdes av \"%s\" istället för parameternamn"
 
 #: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
-msgstr "Makrot \"%s\" anropades på rad %d med för många argument"
+msgstr "Makrot \"%s\" anropades på rad %d med för många argument"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "Makrot %cend hittades inte"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg är endast användbart för makron med ett argument"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr "@allow-recursion är föråldrat; använd @rmacro istället"
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr "@quote-arg är föråldrat; argument är citerade som standard"
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s och @%s passar inte"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
-msgstr "För många fel! Gav upp.\n"
+msgstr "För många fel! Gav upp.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: varning: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "Felplacerat %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "Prova \"%s --help\" för mer information.\n"
+msgstr "Prova \"%s --help\" för mer information.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
-msgstr "Användning: %s [FLAGGA]... TEXINFO-FIL...\n"
+msgstr "Användning: %s [FLAGGA]... TEXINFO-FIL...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
-"Översätt Texinfo-källdokumentation till diverse andra format, som standard\n"
-"infofiler som är lämpliga för läsning med Emacs eller GNU Info.\n"
+"Översätt Texinfo-källdokumentation till diverse andra format, som standard\n"
+"infofiler som är lämpliga för läsning med Emacs eller GNU Info.\n"
 
-#: makeinfo/makeinfo.c:350
+#: makeinfo/makeinfo.c:354
 #, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
-"Allmänna flaggor:\n"
-"      --error-limit=ANTAL     avsluta efter ANTAL fel (standardvärde %d).\n"
-"      --force                 bevara utdata även om fel.\n"
-"      --help                  visa denna hjälptext och avsluta.\n"
+"Allmänna flaggor:\n"
+"      --error-limit=ANTAL     avsluta efter ANTAL fel (standardvärde %d).\n"
+"      --document-language=STR lokal att använda vid översättning av\n"
+"                                Texinfo-nyckelord för utdatadokumentet\n"
+"                                (standardvärde C).\n"
+"      --force                 bevara utdata även om fel.\n"
+"      --help                  visa denna hjälptext och avsluta.\n"
 "      --no-validate           undertryck korsreferensvalidering av noder.\n"
 "      --no-warn               undertryck varningar (men inte fel).\n"
-"      --reference-limit=ANTAL varna vid som mest ANTAL referenser\n"
-"                              (standardvärde %d).\n"
-"  -v, --verbose               förklara vad som görs.\n"
+"  -v, --verbose               förklara vad som görs.\n"
 "      --version               visa versionsinformation och avsluta.\n"
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
-msgstr ""
-"Val av utdataformat (standard är att producera Info):\n"
-"      --docbook             generera Docbook XML istället för Info.\n"
-"      --html                generera HTML istället för Info.\n"
-"      --xml                 generera Texinfo XML istället för Info.\n"
-"      --plaintext           generera vanlig text istället för Info.\n"
-
-#: makeinfo/makeinfo.c:372
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
+msgstr ""
+"Val av utdataformat (standard är att producera Info):\n"
+"      --docbook               generera Docbook XML istället för Info.\n"
+"      --html                  generera HTML istället för Info.\n"
+"      --xml                   generera Texinfo XML istället för Info.\n"
+"      --plaintext             generera vanlig text istället för Info.\n"
+
+#: makeinfo/makeinfo.c:377
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
-msgstr ""
-"Allmänna utdataflaggor:\n"
-"  -E, --macro-expand FIL    generera makroexpanderad källkod till FIL,\n"
-"                            ignorera alla @setfilename.\n"
-"      --no-headers          undertryck nodseparatorer, Node:-rader och\n"
-"                              menyer från Info-utdata (och skapa därigenom\n"
-"                              vanlig text) eller från HTML (och producera\n"
-"                              därigenom kortare utdata). Skriv även till\n"
-"                              standard ut som standard.\n"
-"      --no-split            undertryck delning av Info eller HTML-utdata,\n"
-"                            generera endast en utdatafil.\n"
-"      --number-sections     generera kapitel- och avsnittsnummer.\n"
-"  -o, --output=FIL          generera till FIL (katalog om delad HTML),\n"
-
-#: makeinfo/makeinfo.c:386
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
+msgstr ""
+"Allmänna utdataflaggor:\n"
+"  -E, --macro-expand=FIL      generera makroexpanderad källkod till FIL,\n"
+"                              ignorera alla @setfilename.\n"
+"      --no-headers            undertryck nodseparatorer, Node:-rader och\n"
+"                                menyer från Info-utdata (och skapa\n"
+"                                därigenom vanlig text) eller från HTML\n"
+"                                (och producera därigenom kortare utdata).\n"
+"                                Skriv även till standard ut som standard.\n"
+"      --no-split              undertryck delning av Info eller HTML-utdata,\n"
+"                              generera endast en utdatafil.\n"
+"      --number-sections       generera kapitel- och avsnittsnummer.\n"
+"  -o, --output=FIL            generera till FIL (katalog om delad HTML).\n"
+
+#: makeinfo/makeinfo.c:391
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
 "                                `asis', preserve existing indentation.\n"
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
-"Flaggor för Info och vanlig text:\n"
-"      --enable-encoding       generera tecken med accent och specialtecken\n"
-"                                i Info-utdata baserat på @documentencoding.\n"
+"Flaggor för Info och vanlig text:\n"
+"      --disable-encoding      generera inte tecken med accent och\n"
+"                                specialtecken i Info-utdata baserat på\n"
+"                                @documentencoding.\n"
+"      --enable-encoding       åsidosätt --disable-encoding (standard).\n"
 "      --fill-column=ANTAL     radbryt Info-rader vid ANTAL tecken\n"
-"                                (standardvärde %d).\n"
-"      --footnote-style=STIL   generera fotnoter i Info som följer STIL:\n"
-"                                \"separate\" för att placera fotnoter i sin\n"
+"                                (standardvärde %d).\n"
+"      --footnote-style=STIL   generera fotnoter i Info som följer STIL:\n"
+"                                \"separate\" för att placera fotnoter i sin\n"
 "                                egen nod,\n"
-"                                \"end\" för att placera fotnoter i slutet\n"
-"                                av den nod där de är definierade\n"
+"                                \"end\" för att placera fotnoter i slutet\n"
+"                                av den nod där de är definierade\n"
 "                                (standardalternativ).\n"
-"      --paragraph-indent=VÄRDE gör indrag i Info-stycken med VÄRDE\n"
-"                                blanksteg (standardvärde %d).\n"
-"                                Om VÄRDE är \"none\" görs inga indrag; om\n"
-"                                VÄRDE är \"asis\" bevaras befintliga\n"
+"      --paragraph-indent=VÄRDE gör indrag i Info-stycken med VÄRDE\n"
+"                                blanksteg (standardvärde %d).\n"
+"                                Om VÄRDE är \"none\" görs inga indrag; om\n"
+"                                VÄRDE är \"asis\" bevaras befintliga\n"
 "                                indrag.\n"
 "      --split-size=ANTAL      dela upp Info-filer vid storleken ANTAL\n"
-"                                (standardvärde %d).\n"
+"                                (standardvärde %d).\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
-"Flaggor för HTML:\n"
-"      --css-include=FIL          inkludera FIL i HTML <style>-utdata;\n"
-"                                   läs standard in om FIL är -.\n"
+"Flaggor för HTML:\n"
+"      --css-include=FIL       inkludera FIL i HTML <style>-utdata;\n"
+"                                läs standard in om FIL är -.\n"
+"      --css-ref=URL           generera referens till en CSS-fil.\n"
+"      --transliterate-file-names\n"
+"                              producera filnamn i ASCII-translitteration.\n"
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
-"Flaggor för XML och Docbook:\n"
-"      --output-indent=VÄRDE     dra in XML-element med VÄRDE blanksteg\n"
-"                                  (standard %d). Om VÄRDE är 0 kastas\n"
-"                                  mellanrum som kan ignoreras.\n"
+"Flaggor för XML och Docbook:\n"
+"      --output-indent=VÄRDE   dra in XML-element med VÄRDE blanksteg\n"
+"                                (standard %d). Om VÄRDE är 0 kastas\n"
+"                                mellanrum som kan ignoreras.\n"
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2444,17 +2689,17 @@ msgid ""
 "  -P DIR                        prepend DIR to the @include search path.\n"
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
-"Flaggor för indatafil:\n"
-"      --commands-in-node-names   tillåt @-kommandon i nodnamn.\n"
+"Flaggor för indatafil:\n"
+"      --commands-in-node-names   tillåt @-kommandon i nodnamn.\n"
 "  -D VARIABEL                    definiera variabeln VARIABEL, som med "
 "@set.\n"
-"  -I KATALOG                     lägg till KATALOG till @include-sökvägen.\n"
-"  -P KATALOG                     lägg till KATALOG först i @include-"
-"sökvägen.\n"
+"  -I KATALOG                     lägg till KATALOG till @include-sökvägen.\n"
+"  -P KATALOG                     lägg till KATALOG först i @include-"
+"sökvägen.\n"
 "  -U VARIABEL                    odefiniera variabeln VARIABEL, som med "
 "@clear.\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2474,13 +2719,13 @@ msgid ""
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 "Villkorlig behandling i indata:\n"
-"  --ifdocbook       behandla @ifdocbook och @docbook även om inte\n"
+"  --ifdocbook       behandla @ifdocbook och @docbook även om inte\n"
 "                      Docbook genereras.\n"
-"  --ifhtml          behandla @ifhtml och @html även om inte HTML genereras.\n"
-"  --ifinfo          behandla @ifinfo-text även om inte Info genereras.\n"
-"  --ifplaintext     behandla @ifplaintext även om inte vanlig text\n"
+"  --ifhtml          behandla @ifhtml och @html även om inte HTML genereras.\n"
+"  --ifinfo          behandla @ifinfo-text även om inte Info genereras.\n"
+"  --ifplaintext     behandla @ifplaintext även om inte vanlig text\n"
 "                    genereras.\n"
-"  --iftex           behandla @iftex och @tex-text; medför --no-split.\n"
+"  --iftex           behandla @iftex och @tex-text; medför --no-split.\n"
 "  --ifxml           behandla @ifxml och @xml.\n"
 "  --no-ifdocbook    behandla inte @ifdocbook- och @docbook-text.\n"
 "  --no-ifhtml       behandla inte @ifhtml- och @html-text.\n"
@@ -2489,9 +2734,9 @@ msgstr ""
 "  --no-iftex        behandla inte @iftex- och @tex-text.\n"
 "  --no-ifxml        behandla inte @ifxml- och @xml-text.\n"
 "\n"
-"  Dessutom, för flaggorna --no-ifFORMAT, behandla @ifnotFORMAT-text.\n"
+"  Dessutom, för flaggorna --no-ifFORMAT, behandla @ifnotFORMAT-text.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2499,371 +2744,336 @@ msgid ""
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
-"  Standardvärdena för @if...-villkoren beror på utdataformatet:\n"
-"  om HTML genereras är --ifhtml på och de andra av;\n"
-"  om Info genereras är --ifinfo på och de andra av;\n"
-"  om vanlig text genereras är --ifplaintext på och de andra av;\n"
-"  om XML genereras är --ifxml på och de andra av.\n"
+"  Standardvärdena för @if...-villkoren beror på utdataformatet:\n"
+"  om HTML genereras är --ifhtml på och de andra av;\n"
+"  om Info genereras är --ifinfo på och de andra av;\n"
+"  om vanlig text genereras är --ifplaintext på och de andra av;\n"
+"  om XML genereras är --ifxml på och de andra av.\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "Exempel:\n"
-"  makeinfo apa.texi                     skriv Info till apas @setfilename\n"
-"  makeinfo --html apa.texi              skriv HTML till @setfilename\n"
-"  makeinfo --xml apa.texi               skriv Texinfo XML till @setfilename\n"
-"  makeinfo --docbook apa.texi           skriv DocBook XML till @setfilename\n"
-"  makeinfo --no-headers apa.texi        skriv vanlig text till standard ut\n"
-"  makeinfo --html --no-headers apa.texi skriv html utan nodrader och menyer\n"
-"  makeinfo --number-sections apa.texi   skriv Info med numrerade avsnitt\n"
-"  makeinfo --no-split apa.texi          skriv en Info-fil hur stor den än "
-"är\n"
-
-#: makeinfo/makeinfo.c:603
+"  makeinfo apa.texi                      skriv Info till apas @setfilename\n"
+"  makeinfo --html apa.texi               skriv HTML till @setfilename\n"
+"  makeinfo --xml apa.texi                skriv Texinfo XML till "
+"@setfilename\n"
+"  makeinfo --docbook apa.texi            skriv DocBook XML till "
+"@setfilename\n"
+"  makeinfo --no-headers apa.texi         skriv vanlig text till standard ut\n"
+"  makeinfo --html --no-headers apa.texi  skriv html utan nodrader och "
+"menyer\n"
+"  makeinfo --number-sections apa.texi    skriv Info med numrerade avsnitt\n"
+"  makeinfo --no-split apa.texi           skriv en Info-fil hur stor den än "
+"är\n"
+
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
-msgstr "%s: Ignorerar okänt TEXINFO_OUTPUT_FORMAT-värde \"%s\".\n"
+msgstr "%s: Ignorerar okänt TEXINFO_OUTPUT_FORMAT-värde \"%s\".\n"
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
-msgstr "%s: argumentet %s måste vara numeriskt, inte \"%s\".\n"
+msgstr "%s: argumentet %s måste vara numeriskt, inte \"%s\".\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
-msgstr "%s: kunde inte öppna makroexpansionsutdata \"%s\""
+msgstr "%s: kunde inte öppna makroexpansionsutdata \"%s\""
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s: ignorerar andra makroexpansionsutdata \"%s\".\n"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
-"%s: argumentet --paragraph-indent måste vara numeriskt/\"none\"/\"asis\", "
+"%s: argumentet --paragraph-indent måste vara numeriskt/\"none\"/\"asis\", "
 "inte \"%s\".\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
-"%s: argumentet --footnote-style måste vara \"separate\" eller \"end\", inte "
+"%s: argumentet --footnote-style måste vara \"separate\" eller \"end\", inte "
 "\"%s\".\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: filargument saknas.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
-msgstr "Flerradskommandot %c%s används felaktigt"
+msgstr "Flerradskommandot %c%s används felaktigt"
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
-msgstr "\"%s\" förväntades"
+msgstr "\"%s\" förväntades"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kan inte skapa katalogen \"%s\": %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Inget \"%s\" hittades i \"%s\""
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
-"%s: Hoppar över makroexpansionen till standard ut eftersom Info-utdatan går "
+"%s: Hoppar över makroexpansionen till standard ut eftersom Info-utdatan går "
 "dit.\n"
 
 # printf (_("Making %s file `%s' from `%s'.\n"),
 #         no_headers ? "text" : (html ? "HTML" : "info"),
 #         output_filename, input_filename);
 #
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
-msgstr "Skapar %s-fil \"%s\" från \"%s\".\n"
+msgstr "Skapar %s-fil \"%s\" från \"%s\".\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "Detta är %s, skapad av makeinfo version %s från %s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
-"%s: Tar bort makroutdatafilen \"%s\" på grund av fel; använd --force för att "
+"%s: Tar bort makroutdatafilen \"%s\" på grund av fel; använd --force för att "
 "bevara.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
-"%s: Tar bort utdatafilen \"%s\" på grund av fel; använd --force för att "
+"%s: Tar bort utdatafilen \"%s\" på grund av fel; använd --force för att "
 "bevara.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
-msgstr "Okänt kommando \"%s\""
+msgstr "Okänt kommando \"%s\""
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
-msgstr "Använd klamrar för att ge ett komamndo som ett argument till @%s"
+msgstr "Använd klamrar för att ge ett komamndo som ett argument till @%s"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, c-format
 msgid "%c%s expected braces"
-msgstr "%c%s förväntade klamrar"
+msgstr "%c%s förväntade klamrar"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "Ensam }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "INGET_NAMN!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s saknar avslutande klammer"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
-msgstr "@image-filen \"%s\" (för HTML) är oläslig: %s"
+msgstr "@image-filen \"%s\" (för HTML) är oläslig: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, c-format
 msgid "No such file `%s'"
-msgstr "Det finns ingen sådan fil \"%s\""
+msgstr "Det finns ingen sådan fil \"%s\""
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
-msgstr "@image-filen \"%s\" (för text) är oläslig: %s"
+msgstr "@image-filen \"%s\" (för text) är oläslig: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "@image saknar filnamnsargument"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr "odefinierad flagga: %s"
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
-msgstr "{Inget värde för \"%s\"}"
+msgstr "{Inget värde för \"%s\"}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
-msgstr "%c%s kräver ett namn"
+msgstr "%c%s kräver ett namn"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
-msgstr "Nådde filslut innan matchande @end %s"
+msgstr "NÃ¥dde filslut innan matchande @end %s"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
-msgstr "\"%.40s...\" är för lång för expansion; inte expanderad"
+msgstr "\"%.40s...\" är för lång för expansion; inte expanderad"
 
 #: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr "Ett } saknas i @multitable-mall"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
-msgstr "ignorerar lös text \"%s\" efter @multitable"
+msgstr "ignorerar lös text \"%s\" efter @multitable"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
-msgstr "För många kolumner i multitabellsobjekt (max %d)"
+msgstr "För många kolumner i multitabellsobjekt (max %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
-msgstr "[oväntat] kan inte välja kolumn %d i multitabell"
+msgstr "[oväntat] kan inte välja kolumn %d i multitabell"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
-msgstr "ignorerar @tab utanför multitabell"
+msgstr "ignorerar @tab utanför multitabell"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
-msgstr "** Utdata på flera kolumner från senaste raden:\n"
+msgstr "** Utdata på flera kolumner från senaste raden:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolumn %d: utdata = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
-msgstr "Noden \"%s\" är tidigare definierad på rad %d"
+msgstr "Noden \"%s\" är tidigare definierad på rad %d"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Formaterar noden %s...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
-msgstr "Noden \"%s\" kräver ett kommando för avsnittsindelning (t.ex. %c%s)"
+msgstr "Noden \"%s\" kräver ett kommando för avsnittsindelning (t.ex. %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
-msgstr "Inget nodnamn angivet för kommandot \"%c%s\""
+msgstr "Inget nodnamn angivet för kommandot \"%c%s\""
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Ankaret \"%s\" och noden \"%s\" mappas till samma filnamn"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 "Detta @anchor-kommando ignoreras; referenser till det kommer inte att fungera"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
-msgstr "Byt namn på detta ankare eller använd flaggan \"--no-split\""
+msgstr "Byt namn på detta ankare eller använd flaggan \"--no-split\""
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
-msgstr "Oväntad sträng vid slutet på den delade HTML-filen \"%s\""
-
-# src/menus.c:332
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "Nästa:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Föregående:"
+msgstr "Oväntad sträng vid slutet på den delade HTML-filen \"%s\""
 
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "Upp:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Ankarna \"%s\" och \"%s\" mappas till samma filnamn"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 "@anchor-kommandot ignoreras; referenser till det kommer inte att fungera"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 "%s-referens till ickeexisterande noden \"%s\" (kanske felaktig "
 "avsnittsindelning?)"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "Meny"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Kors"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
-"Nästa fält i noden \"%s\" pekas inte till (kanske felaktig "
+"Nästa fält i noden \"%s\" pekas inte till (kanske felaktig "
 "avsnittsindelning?)"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
-msgstr "Denna nod (%s) har den felaktiga föregående-noden"
-
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "Föreg"
+msgstr "Denna nod (%s) har den felaktiga föregående-noden"
 
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
-msgstr "Föregående-fältet i noden \"%s\" pekas inte till"
+msgstr "Föregående-fältet i noden \"%s\" pekas inte till"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
-msgstr "Denna nod (%s) har den felaktiga nästa-noden"
+msgstr "Denna nod (%s) har den felaktiga nästa-noden"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
-msgstr "\"%s\" har inget upp-fält (kanske felaktig avsnittsindelning?)"
+msgstr "\"%s\" har inget upp-fält (kanske felaktig avsnittsindelning?)"
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "Upp"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
-msgstr "Noden \"%s\" saknar menypost för \"%s\" trots att den är dess Upp-mål"
-
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "noden \"%s\" har refererats %d gånger"
+msgstr "Noden \"%s\" saknar menypost för \"%s\" trots att den är dess Upp-mål"
 
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "orefererad nod \"%s\""
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr "Tar bort %s\n"
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Kan inte ta bort filen \"%s\": %s"
@@ -2878,263 +3088,106 @@ msgstr "Appendix %c"
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "Internt fel (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Internt fel (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
-msgstr "%c%s är föråldrat; använd %c%s istället"
+msgstr "%c%s är föråldrat; använd %c%s istället"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
-msgstr "En nod med %ctop som en sektion finns redan"
+msgstr "En nod med %ctop som ett avsnitt finns redan"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
-msgstr "Här är %ctop-noden"
+msgstr "Här är %ctop-noden"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
-msgstr "%ctop användes innan %cnode, använder %s som standard"
-
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Innehållsförteckning"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Kort innehållsförteckning"
+msgstr "%ctop användes innan %cnode, använder %s som standard"
 
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
-msgstr "@image-filen \"%s\" är oläslig: %s"
+msgstr "@image-filen \"%s\" är oläslig: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 "@headitem som det sista objektet i @multitable genererar ogiltiga Docbook-"
 "dokument"
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: varning: "
-
-# char *s = concat ("", strerror (errno), _(" for %s"));
-#
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " för %s"
-
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\tProva \"%s --help\" för en fullständig lista med flaggor.\n"
-
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Användning: %s [FLAGGA]... [INFO-FIL [KATALOGFIL]]\n"
-"\n"
-"Installera eller ta bort katalogposter från INFO-FIL i Info-katalogfilen\n"
-"KATALOGFIL.\n"
-"\n"
-"Flaggor:\n"
-" --delete          ta bort existerande poster för INFO-FIL från KATALOGFIL;\n"
-"                     infoga inte några nya poster.\n"
-" --dir-file=NAMN   ange filnamnet på Info-katalogfilen.\n"
-"                     Detta motsvarar användning av argumentet KATALOGFIL.\n"
-" --entry=TEXT      infoga TEXT som en Info-katalogpost.\n"
-"                     TEXT bör vara i formen av en Info-menypostsrad plus\n"
-"                     noll eller fler extra rader som börjar med tomrum.\n"
-"                     Om du anger mer än en post kommer alla att läggas\n"
-"                     till. Om du inte anger några poster kommer de att\n"
-"                     avgöras från information i själva Info-filen.\n"
-" --help            visa denna hjälptext och avsluta.\n"
-" --info-file=FIL   ange Info-fil att installera i katalogen.\n"
-"                     Detta motsvarar användning av argumentet INFO-FIL.\n"
-" --info-dir=KAT    samma som --dir-file=KAT/kat.\n"
-" --item=TEXT       samma som --entry TEXT.\n"
-"                     En Info-katalogpost är egentligen en menypost.\n"
-" --quiet           undertryck varningar.\n"
-" --remove          samma som --delete.\n"
-" --section=AVSNITT placera denna fils poster i avsnittet AVSNITT i\n"
-"                     katalogen. Om du anger mer än ett avsnitt kommer alla\n"
-"                     poster att läggas till i varje sektion. Om du inte\n"
-"                     anger några avsnitt kommer de att bestämmas från\n"
-"                     information i själva Info-filen.\n"
-" --version         visa versionsinformation och avsluta.\n"
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
-msgstr ""
-"Detta är filen .../info/dir som innehåller den översta noden i\n"
-"Info-hierarkin som kallas (kat)Top.\n"
-"Första gången du använder Info börjar du med denna nod.\n"
-"\n"
-"%s\tDetta är översta noden i INFO-trädet\n"
-"\n"
-"  Denna nod (katalognoden) erbjuder en meny med huvudrubriker.\n"
-"  Att skriva \"q\" avslutar, \"?\" visar alla Info-kommandon, \"d\"\n"
-"  återvänder hit, \"h\" visar en hjälp för förstagångsanvändare,\n"
-"  \"mEmacs<Retur>\" besöker Emacs-manualen, osv.\n"
-"\n"
-"  I Emacs kan du klicka med musknapp 2 på en menypost eller korsreferens\n"
-"  för att välja den.\n"
-"\n"
-"%s\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: kunde inte läsa (%s) och kunde inte skapa (%s)\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: tom fil"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY utan matchande END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY utan matchande START-INFO-DIR-ENTRY"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "av"
 
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr "%s: har redan katalogfilen: %s\n"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "på"
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Ange Info-filen endast en gång.\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "Första argumentet till korsreferens kan inte vara tomt"
 
-#: util/install-info.c:1284
+#: makeinfo/xref.c:252
 #, c-format
-msgid "excess command line argument `%s'"
-msgstr "för många kommandoradsargument \"%s\""
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr "Tomt filnamn för HTML-korsreferens i \"%s\""
 
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
-msgstr "Ingen indatafil angiven; prova --help för mer information."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr "Slutet på filen nåddes då \".\" eller \",\" eftersöktes"
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr "Ingen katalogfil angiven; prova --help för mer information."
-
-#: util/install-info.c:1313
+#: makeinfo/xref.c:390
 #, c-format
-msgid "no info dir entry in `%s'"
-msgstr "ingen info-katalogpost i \"%s\""
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "\".\" eller \",\" måste följa på @%s, inte \"%c\""
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "menyposten \"%s\" finns redan, för filen \"%s\""
+#: makeinfo/xref.c:392
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "använd @pxref för korsreferenser inuti parenteser"
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "inga poster hittades för \"%s\"; ingenting togs bort"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "Första argumentet till @inforef kan inte vara tomt"
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
-msgstr "visa denna hjälptext och avsluta"
-
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "behåll temporära filer efter behandling"
+msgstr "visa denna hjälptext och avsluta"
 
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "behåll inte temporära filer efter behandling (standardalternativ)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "skicka utdata till FIL"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "visa versionsinformation och avsluta"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
-msgstr "Användning: %s [FLAGGA]... FIL...\n"
+msgstr "Användning: %s [FLAGGA]... FIL...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
-msgstr "Generera ett sorterat index för varje TeX-utdataFIL.\n"
+msgstr "Generera ett sorterat index för varje TeX-utdataFIL.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
-"Vanligtvis anges FIL... som \"apa.%c%c\" för ett dokument \"apa.texi\".\n"
+"Vanligtvis anges FIL... som \"apa.%c%c\" för ett dokument \"apa.texi\".\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3143,29 +3196,454 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
+#: util/texindex.c:743
 #, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: inte en texinfo-indexfil"
+msgid "failure reopening %s"
+msgstr "misslyckande vid återöppnande av %s"
 
-#: util/texindex.c:968
+#: util/texindex.c:758 util/texindex.c:786
 #, c-format
-msgid "failure reopening %s"
-msgstr "misslyckande vid återöppnande av %s"
+msgid "%s: not a texinfo index file"
+msgstr "%s: inte en texinfo-indexfil"
 
-#: util/texindex.c:1218
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "Inget sidnummer i %s"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
-msgstr "posten %s följer på en post med ett sekundärt namn"
+msgstr "posten %s följer på en post med ett sekundärt namn"
+
+#~ msgid "Cancel the current operation"
+#~ msgstr "Avbryt aktuell åtgärd"
+
+#~ msgid "Search backward"
+#~ msgstr "Sök baklänges"
+
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "Användning: %s [FLAGGA]... [MENYPOST...]\n"
+#~ "\n"
+#~ "Läs dokumentation i Info-format.\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "      --apropos=STRÄNG         slå upp STRÄNG i alla index i alla "
+#~ "manualer.\n"
+#~ "  -d, --directory=KATALOG      lägg till KATALOG till INFOPATH.\n"
+#~ "      --dribble=FILNAMN        kom ihåg användarens tangentnedtryckningar "
+#~ "i\n"
+#~ "                               FILNAMN.\n"
+#~ "  -f, --file=FILNAMN           ange den Info-fil som ska besökas.\n"
+#~ "  -h, --help                   visa denna hjälptext och avsluta.\n"
+#~ "      --index-search=STRÄNG    gå till noden som utpekas av indexpost\n"
+#~ "                               STRÄNG.\n"
+#~ "  -n, --node=NODNAMN           ange noder i den först besökta Info-"
+#~ "filen.\n"
+#~ "  -o, --output=FILNAMN         skriv ut valda noder till FILNAMN.\n"
+#~ "  -R, --raw-escapes            skriv ut \"råa\" ANSI-styrkoder "
+#~ "(standard).\n"
+#~ "      --no-raw-escapes         skriv ut styrkoder som text.\n"
+#~ "      --restore=FILNAMN        läs initiala tangentnedtryckningar från\n"
+#~ "                               FILNAMN.\n"
+#~ "  -O, --show-options, --usage  gå till noden för kommandoradsflaggor.\n"
+#~ "%s      --subnodes               skriv ut menyposter rekursivt.\n"
+#~ "  -w, --where, --location      skriv ut den fysiska platsen för Info-"
+#~ "filen.\n"
+#~ "      --vi-keys                använd vi- och less-liknande\n"
+#~ "                               snabbtangenter.\n"
+#~ "      --version                visa versionsinformation och avsluta.\n"
+#~ "\n"
+#~ "Det första argumentet som inte är en flagga är, om det finns, menyposten\n"
+#~ "att börja från. Det söks efter i alla \"dir\"-filer i INFOPATH.\n"
+#~ "Om den inte finns slår info samman alla \"dir\"-filer och visar "
+#~ "resultatet.\n"
+#~ "Alla återstående argument betraktas som namnen på menyposter relativa "
+#~ "till\n"
+#~ "den först besökta noden.\n"
+#~ "\n"
+#~ "Exampel:\n"
+#~ "  info                       visa översta katalogmenyn\n"
+#~ "  info emacs                 börja på emacs-noden från översta katalogen\n"
+#~ "  info emacs buffers         börja på buffertnoden inom emacs-manualen\n"
+#~ "  info --show-options emacs  börja på noden med emacs "
+#~ "kommandoradsflaggor\n"
+#~ "  info --subnodes -o ut.txt emacs  dumpa hela manualen till ut.txt\n"
+#~ "  info -f ./foo.info         visa filen ./foo.info, sök inte i katalogen\n"
+
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr ""
+#~ "\\%-10[move-to-prev-xref]  Hoppa till föregående hypertextlänk [*].\n"
+
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr ""
+#~ "\\%-10[dir-node]  Gå till \"directory\"-noden. Likvärdigt med \"g (DIR)"
+#~ "\".\n"
+
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr ""
+#~ "\\%-10[top-node]  Gå till den översta noden. Likvärdigt med \"g Top\".\n"
+
+#~ msgid ""
+#~ "[*]    Command acts within this node or the entire document, depending "
+#~ "on\n"
+#~ "the value of cursor-movement-scrolls variable\n"
+#~ msgstr ""
+#~ "[*]    Kommandot agerar inuti denna nod eller hela dokumentet, beroende "
+#~ "på\n"
+#~ "värdet av variabeln cursor-movement-scrolls\n"
+
+#~ msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+#~ msgstr "\\%-10[prev-line]  Rulla en rad bakåt.\n"
+
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10[search]  Sök framåt efter en angiven sträng\n"
+#~ "              och välj den nod i vilken nästa förekomst hittas.\n"
+
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10[search-backward]  Sök bakåt efter en angiven sträng\n"
+#~ "              och välj den nod i vilken nästa förekomst hittas.\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr "              Att välja en menypost gör att en annan nod väljs.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "              Du kan även inkludera ett filnamn, som exempelvis\n"
+#~ "              (FILNAMN)NODNAMN.\n"
+
+# This is broken
+#
+#  N_("  %-10s  Search backward in this Info file for a specified string,\n"),
+#  N_("              and select the node in which the next occurrence is found.\n"),
+#
+# Please don't split a single sentence like this in multiple messages,
+# use one single message instead. Sentences have to be kept together when
+# translating, you can't split a sentence into parts and mark them for
+# separate translation and expect it to work with word ordering,
+# grammar, and everything else in other languages. Splitting sentences
+# just makes it harder for translators when having not just to translate,
+# but also puzzle the pieces of the sentence together again so that it
+# makes some sense, in order to be able to translate in the first place.
+#
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr "  %-10s  Sök bakåt efter en angiven sträng,\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "              och välj den nod i vilken nästa förekomst hittas.\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr ""
+#~ "--- Använd \"\\[history-node]\" eller \"\\[kill-node]\" för att avsluta "
+#~ "---\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "Följer nästa-nod..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "Väljer första menyposten..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "Väljer nästa nod..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "Går upp %d gång(er), sedan Nästa."
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "Gå till föregående i detta fönster."
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "Går upp i detta fönster."
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "Gå till \"Föreg\"s senaste menypost."
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "Funktion"
+
+#~ msgid "Macro"
+#~ msgstr "Makro"
+
+#~ msgid "Special Form"
+#~ msgstr "Specialform"
+
+#~ msgid "Variable"
+#~ msgstr "Variabel"
+
+#~ msgid "User Option"
+#~ msgstr "Användarflagga"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Instansvariabel"
+
+#~ msgid "Method"
+#~ msgstr "Metod"
+
+#~ msgid "Untitled"
+#~ msgstr "Namnlös"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "Detta är %s, skapad av makeinfo version %s från %s.\n"
+
+# src/menus.c:332
+#~ msgid "Next:"
+#~ msgstr "Nästa:"
+
+#~ msgid "Previous:"
+#~ msgstr "Föregående:"
+
+#~ msgid "Up:"
+#~ msgstr "Upp:"
+
+#~ msgid "Menu"
+#~ msgstr "Meny"
+
+#~ msgid "Cross"
+#~ msgstr "Kors"
+
+#~ msgid "Prev"
+#~ msgstr "Föreg"
+
+#~ msgid "Up"
+#~ msgstr "Upp"
+
+#~ msgid "see "
+#~ msgstr "se "
+
+#~ msgid "See section ``%s'' in "
+#~ msgstr "Se avsnittet \"%s\" i "
+
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "Användning: %s [FLAGGA]... [INFO-FIL [KATALOGFIL]]\n"
+#~ "\n"
+#~ "Installera eller ta bort katalogposter från INFO-FIL i Info-katalogfilen\n"
+#~ "KATALOGFIL.\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ " --debug           rapportera vad som görs.\n"
+#~ " --delete          ta bort existerande poster för INFO-FIL från "
+#~ "KATALOGFIL;\n"
+#~ "                     infoga inte några nya poster.\n"
+#~ " --dir-file=NAMN   ange filnamnet på Info-katalogfilen.\n"
+#~ "                     Detta motsvarar användning av argumentet "
+#~ "KATALOGFIL.\n"
+#~ " --entry=TEXT      infoga TEXT som en Info-katalogpost.\n"
+#~ "                     TEXT bör vara i formen av en Info-menypostsrad plus\n"
+#~ "                     noll eller fler extra rader som börjar med tomrum.\n"
+#~ "                     Om du anger mer än en post kommer alla att läggas\n"
+#~ "                     till. Om du inte anger några poster kommer de att\n"
+#~ "                     avgöras från information i själva Info-filen.\n"
+#~ " --help            visa denna hjälptext och avsluta.\n"
+#~ " --info-file=FIL   ange Info-fil att installera i katalogen.\n"
+#~ "                     Detta motsvarar användning av argumentet INFO-FIL.\n"
+#~ " --info-dir=KAT    samma som --dir-file=KAT/kat.\n"
+#~ " --item=TEXT       samma som --entry TEXT.\n"
+#~ "                     En Info-katalogpost är egentligen en menypost.\n"
+#~ " --quiet           undertryck varningar.\n"
+#~ " --remove          samma som --delete.\n"
+#~ " --remove-exactly  ta endast bort om Info-filnamnet matchar exakt.\n"
+#~ "                     .info- och/eller .gz-filändelser ignoreras inte.\n"
+#~ " --section=AVSNITT placera denna fils poster i avsnittet AVSNITT i\n"
+#~ "                     katalogen. Om du anger mer än ett avsnitt kommer "
+#~ "alla\n"
+#~ "                     poster att läggas till i varje avsnitt. Om du inte\n"
+#~ "                     anger några avsnitt kommer de att bestämmas från\n"
+#~ "                     information i själva Info-filen.\n"
+#~ " --section-regex=R om en post läggs till i ett avsnitt som saknas,\n"
+#~ "                     leta efter ett avsnitt som matchar det "
+#~ "grundläggande\n"
+#~ "                     reguljära uttrycket R (och ignorera skiftläge) "
+#~ "innan\n"
+#~ "                     ett nytt avsnitt påbörjas.\n"
+#~ " --test            undertryck varning av KATALOGFIL.\n"
+#~ " --silent          undertryck varningar.\n"
+#~ " --version         visa versionsinformation och avsluta.\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "menyposten \"%s\" finns redan, för filen \"%s\""
+
+#~ msgid "virtual memory exhausted"
+#~ msgstr "virtuellt minne slut"
+
+#~ msgid "Same as scroll-behavior"
+#~ msgstr "Samma som \"scroll-behavior\""
+
+#~ msgid "off"
+#~ msgstr "av"
+
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "Det finns INGEN garanti. Du kan vidaredistribuera denna programvara\n"
+#~ "under villkoren i GNU General Public License.\n"
+#~ "Se filen COPYING för mer information om detta.\n"
+
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr ""
+#~ "\\%-10[menu-digit]  Välj första ... nionde objektet i nodens meny.\n"
+
+# This is broken
+#
+#  N_("  %-10s  Search for a specified string in the index entries of this Info\n"),
+#  N_("              file, and select the node referenced by the first entry found.\n"),
+#
+# Please don't split a single sentence like this in multiple messages,
+# use one single message instead. Sentences have to be kept together when
+# translating, you can't split a sentence into parts and mark them for
+# separate translation and expect it to work with word ordering,
+# grammar, and everything else in other languages. Splitting sentences
+# just makes it harder for translators when having not just to translate,
+# but also puzzle the pieces of the sentence together again so that it
+# makes some sense, in order to be able to translate in the first place.
+#
+#~ msgid ""
+#~ "  %-10s  Search for a specified string in the index entries of this Info\n"
+#~ msgstr "  %-10s  Sök efter en angiven sträng i indexposterna i denna\n"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr ""
+#~ "              Info-fil, och välj noden som refereras av den första "
+#~ "posten\n"
+#~ "              som hittas.\n"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright © %s Free Software Foundation, Inc.\n"
+#~ "Det finns INGEN garanti. Du kan vidaredistribuera denna programvara\n"
+#~ "under villkoren i GNU General Public License.\n"
+#~ "Se filen COPYING för mer information om detta.\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-arg är endast användbart för makron med ett argument"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "noden \"%s\" har refererats %d gånger"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Innehållsförteckning"
+
+#~ msgid "Short Contents"
+#~ msgstr "Kort innehållsförteckning"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "behåll temporära filer efter behandling"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "behåll inte temporära filer efter behandling (standardalternativ)"
 
 #~ msgid "%s: Specify the Info directory only once.\n"
-#~ msgstr "%s: Ange Info-katalogen endast en gång.\n"
+#~ msgstr "%s: Ange Info-katalogen endast en gång.\n"
 
 #~ msgid "(line)"
 #~ msgstr "(rad)"
@@ -3186,60 +3664,45 @@ msgstr "posten %s följer på en post med ett sekundärt namn"
 #~ msgstr "Appendix %c "
 
 #~ msgid "\"\" is invalid"
-#~ msgstr "\"\" är ogiltigt"
+#~ msgstr "\"\" är ogiltigt"
 
 #~ msgid "%s is an invalid ISO code, using %c"
-#~ msgstr "%s är en ogiltig ISO-kod, använder %c"
+#~ msgstr "%s är en ogiltig ISO-kod, använder %c"
 
 #~ msgid "Cannot specify more than one macro expansion output"
-#~ msgstr "Kan inte ange mer än en makroexpansionsutdata"
+#~ msgstr "Kan inte ange mer än en makroexpansionsutdata"
 
 #~ msgid "File exists, but is not a directory"
-#~ msgstr "Filen finns men är ingen katalog"
-
-#~ msgid "First argument to cross-reference may not be empty"
-#~ msgstr "Första argumentet till korsreferens kan inte vara tomt"
-
-#~ msgid "see "
-#~ msgstr "se "
-
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "\".\" eller \",\" måste följa på korsreferens, inte %c"
-
-#~ msgid "First argument to @inforef may not be empty"
-#~ msgstr "Första argumentet till @inforef kan inte vara tomt"
+#~ msgstr "Filen finns men är ingen katalog"
 
 #~ msgid "Node:"
 #~ msgstr "Nod:"
 
 #~ msgid "%s: TOC should be here, but it was not found"
-#~ msgstr "%s: Innehållsförteckningen skulle vara här, men hittades inte"
-
-#~ msgid "virtual memory exhausted"
-#~ msgstr "virtuellt minne slut"
+#~ msgstr "%s: Innehållsförteckningen skulle vara här, men hittades inte"
 
 #~ msgid "No `%s.png' or `.jpg', and no extension supplied"
-#~ msgstr "Ingen \"%s.png\" eller \".jpg\" och ingen filändelse angiven"
+#~ msgstr "Ingen \"%s.png\" eller \".jpg\" och ingen filändelse angiven"
 
 #~ msgid "%s; for file `%s'.\n"
-#~ msgstr "%s; för filen \"%s\".\n"
+#~ msgstr "%s; för filen \"%s\".\n"
 
 #~ msgid "`%s' has no Up field"
-#~ msgstr "\"%s\" har inget upp-fält"
+#~ msgstr "\"%s\" har inget upp-fält"
 
 #~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-#~ msgstr "\\%-10[scroll-forward]  Rulla en rad framåt.\n"
+#~ msgstr "\\%-10[scroll-forward]  Rulla en rad framåt.\n"
 
 #~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-#~ msgstr "\\%-10[scroll-backward]  Rulla en rad bakåt.\n"
+#~ msgstr "\\%-10[scroll-backward]  Rulla en rad bakåt.\n"
 
 #~ msgid ""
 #~ "Email bug reports to bug-texinfo@gnu.org,\n"
 #~ "general questions and discussion to help-texinfo@gnu.org."
 #~ msgstr ""
 #~ "Skicka felrapporter till bug-texinfo@gnu.org,\n"
-#~ "allmänna frågor och diskussion till help-texinfo@gnu.org\n"
-#~ "och synpunkter på översättningen till sv@li.org."
+#~ "allmänna frågor och diskussion till help-texinfo@gnu.org\n"
+#~ "och synpunkter på översättningen till sv@li.org."
 
 #~ msgid "%s' argument to @image command not found"
 #~ msgstr "%s argument till @image-kommandot hittades inte"
@@ -3277,35 +3740,35 @@ msgstr "posten %s följer på en post med ett sekundärt namn"
 #~ " --iftex                   process @iftex and @tex text.\n"
 #~ "                            implies --no-split.\n"
 #~ msgstr ""
-#~ "Användning: %s [FLAGGA]... TEXINFO-FIL...\n"
+#~ "Användning: %s [FLAGGA]... TEXINFO-FIL...\n"
 #~ "\n"
-#~ "Översätt Texinfo-källdokumentation till diverse andra format:\n"
-#~ "Info-filer som är lämpliga för läsning på skärm med Emacs eller separat\n"
+#~ "Översätt Texinfo-källdokumentation till diverse andra format:\n"
+#~ "Info-filer som är lämpliga för läsning på skärm med Emacs eller separat\n"
 #~ "GNU Info (standardalternativ), vanlig text (med --no-headers), eller\n"
 #~ "HTML (med --html).\n"
 #~ "\n"
 #~ "Flaggor:\n"
-#~ " --commands-in-node-names  tillåt @-kommandon i nodnamn.\n"
+#~ " --commands-in-node-names  tillåt @-kommandon i nodnamn.\n"
 #~ " -D VARIABEL               definiera en variabel, som med @set.\n"
-#~ "--docbook                  generera DocBook istället för Info-format.\n"
-#~ " -E, --macro-expand FIL    generera makroexpanderad källkod till FIL.\n"
+#~ "--docbook                  generera DocBook istället för Info-format.\n"
+#~ " -E, --macro-expand FIL    generera makroexpanderad källkod till FIL.\n"
 #~ " --error-limit=ANTAL       avsluta efter ANTAL fel (standard %d).\n"
 #~ " --fill-column=ANTAL       radbryt Info-rader vid ANTAL tecken (standard %"
 #~ "d).\n"
 #~ " --footnote-style=STIL     generera fotnoter enligt STIL:\n"
-#~ "                            \"separate\" för att placera fotnoter i sin\n"
+#~ "                            \"separate\" för att placera fotnoter i sin\n"
 #~ "                            egen nod,\n"
-#~ "                            \"end\" för att placera fotnoter i slutet på\n"
-#~ "                            den nod där de är definierade (standard).\n"
-#~ " --force                   bevara utdata även om fel påträffas.\n"
-#~ " --help                    visa denna hjälptext och avsluta.\n"
-#~ " --html                    generera HTML istället för Info-format.\n"
-#~ " -I KATALOG                lägg till KATALOG till @include-sökvägen.\n"
-#~ " --ifhtml                  behandla @ifhtml- och @html-text även om inte\n"
+#~ "                            \"end\" för att placera fotnoter i slutet på\n"
+#~ "                            den nod där de är definierade (standard).\n"
+#~ " --force                   bevara utdata även om fel påträffas.\n"
+#~ " --help                    visa denna hjälptext och avsluta.\n"
+#~ " --html                    generera HTML istället för Info-format.\n"
+#~ " -I KATALOG                lägg till KATALOG till @include-sökvägen.\n"
+#~ " --ifhtml                  behandla @ifhtml- och @html-text även om inte\n"
 #~ "                            HTML genereras.\n"
-#~ " --ifinfo                  behandla @ifinfo-text även då HTML genereras.\n"
+#~ " --ifinfo                  behandla @ifinfo-text även då HTML genereras.\n"
 #~ " --iftex                   behandla @iftex- och @tex-text.\n"
-#~ "                            medför --no-split.\n"
+#~ "                            medför --no-split.\n"
 
 #~ msgid ""
 #~ " --no-headers              suppress Info node separators and Node: "
@@ -3352,18 +3815,18 @@ msgstr "posten %s följer på en post med ett sekundärt namn"
 #~ "utdata.\n"
 #~ " -o, --output=FIL          skriv till FIL (katalog om delad HTML),\n"
 #~ "                            ignorerar alla @setfilename.\n"
-#~ " -P KATALOG                lägg till KATALOG till @include-sökvägen.\n"
-#~ " --paragraph-indent=VÄRDE  gör indrag i Info-stycken med VÄRDE blanksteg\n"
-#~ "                            (standardvärde %d).\n"
-#~ "                            om VÄRDE är \"none\" görs inget indrag;\n"
-#~ "                            om VÄRDE är \"asis\" bevaras befintlig "
+#~ " -P KATALOG                lägg till KATALOG till @include-sökvägen.\n"
+#~ " --paragraph-indent=VÄRDE  gör indrag i Info-stycken med VÄRDE blanksteg\n"
+#~ "                            (standardvärde %d).\n"
+#~ "                            om VÄRDE är \"none\" görs inget indrag;\n"
+#~ "                            om VÄRDE är \"asis\" bevaras befintlig "
 #~ "indragning.\n"
-#~ " --reference-limit=ANTAL   varna om högst ANTAL referenser\n"
-#~ "                            (standardvärde %d).\n"
+#~ " --reference-limit=ANTAL   varna om högst ANTAL referenser\n"
+#~ "                            (standardvärde %d).\n"
 #~ " --split-size=ANTAL        dela i filer vid storleken ANTAL\n"
-#~ "                            (standardvärde %d).\n"
+#~ "                            (standardvärde %d).\n"
 #~ " -U VARIABEL               odefiniera en variabel, som med @clear.\n"
-#~ " -v, --verbose             förklara vad som görs.\n"
+#~ " -v, --verbose             förklara vad som görs.\n"
 #~ " --version                 visa versionsinformation och avsluta.\n"
-#~ " --xml                     generera XML (TexinfoML) istället för Info-"
+#~ " --xml                     generera XML (TexinfoML) istället för Info-"
 #~ "format.\n"
diff --git a/Build/source/utils/texinfo/po/texinfo.pot b/Build/source/utils/texinfo/po/texinfo.pot
index 90756421544..fdca7142ada 100644
--- a/Build/source/utils/texinfo/po/texinfo.pot
+++ b/Build/source/utils/texinfo/po/texinfo.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: texinfo 4.12\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\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"
@@ -16,132 +16,198 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr ""
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr ""
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr ""
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr ""
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr ""
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr ""
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr ""
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr ""
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr ""
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr ""
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr ""
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr ""
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr ""
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr ""
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr ""
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr ""
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr ""
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr ""
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr ""
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr ""
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr ""
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr ""
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr ""
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr ""
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr ""
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr ""
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr ""
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr ""
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr ""
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr ""
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr ""
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr ""
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr ""
 
@@ -149,143 +215,169 @@ msgstr ""
 msgid "---------- Footnotes ----------"
 msgstr ""
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr ""
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr ""
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr ""
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr ""
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr ""
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr ""
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr ""
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr ""
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr ""
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, c-format
 msgid "Scanning indices of `%s'..."
 msgstr ""
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr ""
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr ""
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, c-format
 msgid ""
 "\n"
 "* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr ""
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
 #, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr ""
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-
-#: info/info.c:597
+#: info/info.c:598
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
 
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -293,470 +385,446 @@ msgid ""
 "Texinfo home page: http://www.gnu.org/software/texinfo/"
 msgstr ""
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr ""
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr ""
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr ""
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr ""
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr ""
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr ""
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr ""
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr ""
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr ""
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr ""
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ""
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr ""
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr ""
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr ""
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr ""
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
+#: info/infodoc.c:47
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr ""
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr ""
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr ""
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
+#: info/infodoc.c:51
+msgid "\\%-10[prev-line]  Move up one line.\n"
 msgstr ""
 
-#: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
+#: info/infodoc.c:52
+msgid "\\%-10[next-line]  Move down one line.\n"
 msgstr ""
 
-#: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
+#: info/infodoc.c:53
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr ""
+
+#: info/infodoc.c:54
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
 msgstr ""
 
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
+#: info/infodoc.c:55
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr ""
+
+#: info/infodoc.c:56
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
 msgstr ""
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr ""
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
 msgstr ""
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
 msgstr ""
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
 msgstr ""
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
 msgstr ""
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
+msgid "\\%-10[up-node]  Go up one level.\n"
 msgstr ""
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
+#: info/infodoc.c:67
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr ""
+
+#: info/infodoc.c:68
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
 msgstr ""
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
 msgstr ""
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
 msgstr ""
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
 msgstr ""
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
 msgstr ""
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
 msgstr ""
 
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+#: info/infodoc.c:76
+msgid "\\%-10[search]  Search forward for a specified string.\n"
 msgstr ""
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
+#: info/infodoc.c:77
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
 msgstr ""
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:78
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
 msgstr ""
 
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr ""
-
-#: info/infodoc.c:81
+#: info/infodoc.c:79
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
+#: info/infodoc.c:81
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
 msgstr ""
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr ""
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr ""
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr ""
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr ""
 
-#: info/infodoc.c:107
+#: info/infodoc.c:101
 #, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr ""
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr ""
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr ""
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr ""
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr ""
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr ""
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr ""
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr ""
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr ""
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr ""
 
-#: info/infodoc.c:127
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+
+#: info/infodoc.c:121
 #, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:129
+#: info/infodoc.c:125
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
 
-#: info/infodoc.c:131
+#: info/infodoc.c:127
 #, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr ""
-
-#: info/infodoc.c:132
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 
-#: info/infodoc.c:133
+#: info/infodoc.c:129
 #, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr ""
-
-#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 
-#: info/infodoc.c:135
+#: info/infodoc.c:131
 #, c-format
-msgid "  %-10s  Search backward for a specified string\n"
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
 msgstr ""
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr ""
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr ""
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr ""
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr ""
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr ""
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr ""
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr ""
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr ""
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr ""
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr ""
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr ""
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr ""
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr ""
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr ""
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
 
 #: info/infokey.c:170
@@ -857,95 +925,95 @@ msgid ""
 "  --version            display version information and exit.\n"
 msgstr ""
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr ""
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr ""
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr ""
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr ""
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr ""
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr ""
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr ""
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, c-format
 msgid "Undefined command: %s"
 msgstr ""
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr ""
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr ""
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr ""
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -953,532 +1021,536 @@ msgid ""
 "  ----------                        -----   ----   ---------------"
 msgstr ""
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
 msgstr ""
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr ""
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr ""
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr ""
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr ""
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
 "for menu item."
 msgstr ""
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr ""
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr ""
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr ""
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr ""
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr ""
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr ""
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr ""
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr ""
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr ""
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr ""
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr ""
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr ""
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr ""
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr ""
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr ""
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr ""
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr ""
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr ""
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr ""
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr ""
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr ""
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr ""
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr ""
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr ""
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr ""
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr ""
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr ""
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr ""
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr ""
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr ""
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr ""
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr ""
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr ""
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr ""
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr ""
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr ""
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr ""
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr ""
 
-#: info/session.c:1848
-msgid "Select the Next node"
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
 msgstr ""
 
 #: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
+msgid "Select the Next node"
+msgstr ""
+
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr ""
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr ""
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr ""
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr ""
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr ""
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr ""
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr ""
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr ""
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr ""
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr ""
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr ""
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr ""
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr ""
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr ""
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr ""
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr ""
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr ""
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr ""
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr ""
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr ""
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr ""
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr ""
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr ""
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr ""
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr ""
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr ""
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr ""
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr ""
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr ""
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr ""
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr ""
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr ""
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr ""
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr ""
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr ""
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr ""
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr ""
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr ""
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr ""
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr ""
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr ""
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr ""
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr ""
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+msgid "Search continued from the beginning of the document."
+msgstr ""
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr ""
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr ""
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr ""
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr ""
 
-#: info/session.c:3670 info/session.c:3677
+#: info/session.c:3863 info/session.c:3869
 #, c-format
-msgid "%s%sfor string [%s]: "
+msgid "%s%s%s [%s]: "
 msgstr ""
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
 msgstr ""
 
-#: info/session.c:3672 info/session.c:3678
-msgid "Search"
+#: info/session.c:3865 info/session.c:3871
+msgid " case-sensitively"
 msgstr ""
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
+#: info/session.c:3866 info/session.c:3872
+msgid " backward"
 msgstr ""
 
-#: info/session.c:3674 info/session.c:3679
-msgid " "
+#: info/session.c:3870
+msgid "Search"
 msgstr ""
 
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr ""
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr ""
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr ""
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr ""
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr ""
 
-#: info/session.c:3851
+#: info/session.c:4044
+msgid "Regexp I-search backward: "
+msgstr ""
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr ""
 
-#: info/session.c:3853
+#: info/session.c:4047
+msgid "Regexp I-search: "
+msgstr ""
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr ""
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr ""
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr ""
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr ""
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr ""
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr ""
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr ""
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr ""
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr ""
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr ""
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr ""
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr ""
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, c-format
 msgid "`%s' is invalid"
 msgstr ""
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr ""
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr ""
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr ""
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr ""
@@ -1511,272 +1583,395 @@ msgstr ""
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr ""
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr ""
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr ""
 
-#: info/variables.c:74
+#: info/variables.c:81
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr ""
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr ""
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr ""
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr ""
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr ""
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr ""
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr ""
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr ""
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr ""
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr ""
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr ""
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr ""
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: warning: "
 msgstr ""
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid " for %s"
 msgstr ""
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr ""
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:508
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr ""
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
 msgstr ""
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:570
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
 msgstr ""
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr ""
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: empty file"
+msgstr ""
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr ""
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr ""
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
 msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "Extra regular expression specified, ignoring `%s'"
 msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: install-info/install-info.c:2129
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr ""
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ""
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr ""
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr ""
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
 msgstr ""
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr ""
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr ""
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr ""
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr ""
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr ""
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr ""
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr ""
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr ""
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr ""
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr ""
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr ""
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr ""
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr ""
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr ""
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
 msgstr ""
 
-#: makeinfo/defun.c:424
-msgid "Method"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
 msgstr ""
 
 #: makeinfo/defun.c:711
@@ -1784,247 +1979,254 @@ msgstr ""
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr ""
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr ""
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr ""
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr ""
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr ""
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr ""
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr ""
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr ""
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr ""
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr ""
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr ""
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr ""
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr ""
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr ""
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr ""
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr ""
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr ""
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr ""
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr ""
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr ""
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr ""
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr ""
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr ""
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr ""
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr ""
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr ""
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr ""
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr ""
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr ""
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr ""
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr ""
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr ""
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr ""
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr ""
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr ""
@@ -2039,7 +2241,7 @@ msgstr ""
 msgid "here is the previous definition of `%s'"
 msgstr ""
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
@@ -2049,104 +2251,114 @@ msgstr ""
 msgid "Macro `%s' called on line %d with too many args"
 msgstr ""
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr ""
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
 msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
+
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr ""
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr ""
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:350
+#: makeinfo/makeinfo.c:354
 #, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:386
+#: makeinfo/makeinfo.c:391
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2154,24 +2366,27 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2181,7 +2396,7 @@ msgid ""
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2201,7 +2416,7 @@ msgid ""
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2210,171 +2425,167 @@ msgid ""
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr ""
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, c-format
 msgid "%c%s expected braces"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, c-format
 msgid "No such file `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
@@ -2383,161 +2594,128 @@ msgstr ""
 msgid "Missing } in @multitable template"
 msgstr ""
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr ""
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr ""
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr ""
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr ""
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr ""
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr ""
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr ""
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr ""
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr ""
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr ""
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr ""
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr ""
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr ""
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr ""
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr ""
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr ""
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr ""
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr ""
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr ""
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr ""
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr ""
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr ""
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr ""
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr ""
@@ -2552,236 +2730,125 @@ msgstr ""
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr ""
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr ""
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr ""
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr ""
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr ""
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr ""
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr ""
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr ""
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr ""
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr ""
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr ""
-
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr ""
-
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
-msgstr ""
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr ""
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
+#: makeinfo/xml.c:2150
+msgid "of"
 msgstr ""
 
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+#: makeinfo/xml.c:2155
+msgid "on"
 msgstr ""
 
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
 msgstr ""
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: makeinfo/xref.c:252
 #, c-format
-msgid "%s: already have dir file: %s\n"
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
 msgstr ""
 
-#: util/install-info.c:1284
+#: makeinfo/xref.c:390
 #, c-format
-msgid "excess command line argument `%s'"
+msgid "`.' or `,' must follow @%s, not `%c'"
 msgstr ""
 
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
+#: makeinfo/xref.c:392
+msgid "for cross-references in parentheses, use @pxref"
 msgstr ""
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:1313
-#, c-format
-msgid "no info dir entry in `%s'"
-msgstr ""
-
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr ""
-
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr ""
-
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr ""
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr ""
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr ""
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr ""
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr ""
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
+#: util/texindex.c:743
 #, c-format
-msgid "%s: not a texinfo index file"
+msgid "failure reopening %s"
 msgstr ""
 
-#: util/texindex.c:968
+#: util/texindex.c:758 util/texindex.c:786
 #, c-format
-msgid "failure reopening %s"
+msgid "%s: not a texinfo index file"
 msgstr ""
 
-#: util/texindex.c:1218
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr ""
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr ""
diff --git a/Build/source/utils/texinfo/po/tr.gmo b/Build/source/utils/texinfo/po/tr.gmo
index 09fa6558c68..5ffb58eb0c1 100644
--- a/Build/source/utils/texinfo/po/tr.gmo
+++ b/Build/source/utils/texinfo/po/tr.gmo
diff --git a/Build/source/utils/texinfo/po/tr.po b/Build/source/utils/texinfo/po/tr.po
index 6745a02f04f..f6e5fd85760 100644
--- a/Build/source/utils/texinfo/po/tr.po
+++ b/Build/source/utils/texinfo/po/tr.po
@@ -1,147 +1,213 @@
-# translation of texinfo-4.7.92.po to Turkish
-# texinfo-4.7.92 Türkçe Çevirisi
-# Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# translation of texinfo-4.9.92.po to Turkish
+# Copyright (C) 2002, 2004, 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the texinfo package.
-# Eyüp Hakan Duran <hakan_duran@hotmail.com>, 2002, 2004.
+# texinfo-4.9.92 Türkçe Çevirisi
+# Eyüp Hakan Duran <hakan_duran@hotmail.com>, 2002, 2004, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo-4.7.92\n"
+"Project-Id-Version: texinfo 4.9.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
-"PO-Revision-Date: 2004-12-21 21:22+0200\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2007-10-20 22:20-0500\n"
 "Last-Translator: Eyüp Hakan Duran <hakan_duran@hotmail.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr "Bilinmeyen sistem hatasý"
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s' seçeneði belirsiz\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: `--%s' seçeneði argümansýz kullanýlýr\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: `%c%s' seçeneði argümansýz kullanýlýr\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: `--%s' seçeneði bilinmiyor\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: `%c%s' seçeneði bilinmiyor\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: kuraldýþý seçenek -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: geçersiz seçenek -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: seçenek bir argümanla kullanýlýr -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' seçeneði belirsiz\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: `-W %s' seçeneði argümansýz kullanýlýr\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "bellek tükendi"
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "Bir karakter ileri gider"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "Bir karakter geri gider"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "Satýrýn baþlangýcýna gider"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "Satýrýn sonuna gider"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "Bir kelime ileri gider"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "Bir kelime geri gider"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Ýmlecin altýndaki karakteri siler"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "Ýmleçden önceki karakteri siler"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Ýþlemi keser ya da çýkar"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Bu satýrý kabul eder (ya da tamamlanmasý için zorlar)"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Sonraki karakteri aynen yerleþtirir"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Bu karakteri yerleþtirir"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Bir TAB karakteri yerleþtirir"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Verilen yerde karakterleri yer deðiþtirir"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Son silinenin içeriði kadar geri çeker"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "Silinen zincir boþ"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Bir önceki silinen kadar geri çeker"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "Satýrýn sonuna kadar siler"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "Satýrýn baþýna kadar siler"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "Ýmleçten sonraki kelimeyi siler"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "Ýmleçten önceki kelimeyi siler"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "Tamamlama yok"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "Bitmedi"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "Olasý tamamlamalarý listeler"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "Tek tamamlama"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "Bir tamamlama:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d tamamlama:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "Tamamlamayý yerleþtir"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "Tamamlamalarý oluþturuyor..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "Tamamlama penceresini kaydýrýr"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "Dipnotlar gösterilemedi"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr "Diðer penceredeki bu düðümle iliþkili dipnotlarý gösterir"
 
@@ -149,76 +215,76 @@ msgstr "Diðer penceredeki bu düðümle iliþkili dipnotlarý gösterir"
 msgid "---------- Footnotes ----------"
 msgstr "----------- Dipnotlar ---------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "Bu dosyada indeks içinde bir dizgeyi arar"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "indeks girdilerini buluyor..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "Hiç indis yok."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "indeks giriþi: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Son `\\[index-search]'komutundan bir sonraki eþleþen indeks öðesine gider"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "Daha önce bir indeks arama dizgesi yok."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Hiç indeks girdisi yok."
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "`%s' içeren %sindex girdisi yok."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "daha"
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "BU GÖRÜLMEZ"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "`%s' bulundu - %s içinde. (`\\[next-index-match]' sonrakini bulmayý dener.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "`%s' indislerini tarýyor..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "Mevcut bilgi dosyalarýndan hiçbirisinin indisinde `%s' yok."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Bir dizge için tüm bilinen bilgi dosyalarýnýn indislerinide ekleyerek bir "
 "menu oluþturur"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Ýndeks hakkýnda:"
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, c-format
 msgid ""
 "\n"
@@ -227,113 +293,104 @@ msgstr ""
 "\n"
 "* Menü: `%s' indislerini içeren düðümler:\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Daha fazla bilgi için --help seçeneðini kullanýn.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
 #, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Garanti yoktur. Bu yazýlýmý GNU Genel Kamu Lisansý koþullarý\n"
-"altýnda daðýtabilirsiniz. Bu konuda daha fazla bilgi için\n"
-"COPYING isimli dosyaya bakýn.\n"
+"Telif Hakký (C) %s Özgür Yazýlým Vakfý Inc.\n"
+"Lisans GPLv3+: GNU GPL sürüm 3 ya da sonrasý <http://gnu.org/licenses/gpl."
+"html>\n"
+"Bu özgür yazýlýmdýr: deðiþtirip daðýtma özgürlüðüne sahipsiniz.\n"
+"Yasalarýn elverdiði ölçüde HÝÇBÝR GARANTÝ yoktur.\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "`%s' için indeks girdisi yok.\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-"  -b, --speech-friendly       konuþma sentezcilerine dostça davranýr.\n"
-
-#: info/info.c:597
+#: info/info.c:598
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+#, fuzzy
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+"  -b, --speech-friendly       konuþma sentezcilerine dostça davranýr.\n"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Kullaným: %s [SEÇENEK]... [MENÜ-ÖÐESÝ...]\n"
-"\n"
-"Info biçeminde belge okur\n"
-"\n"
-"Seçenekler:\n"
-"      --apropos=DÝZGE          DÝZGE'yi tüm elkitaplarýnýn tüm indislerinde "
-"ara.\n"
-"  -d, --directory=DIR          DIR'ý INFOPATH'a ekle.\n"
-"      --dribble=DOSYAADI       DOSYAADI'ndaki kullanýcý tuþbasýmlarýný "
-"anýmsa.\n"
-"  -f, --file=DOSYAADI          uðranacak Info dosyasýný belirle.\n"
-"  -h, --help                   bu yardýmý görüntüle ve çýk.\n"
-"      --index-search=DÝZGE     DÝZGE indeks giriþince iþaret edilen düðüme "
-"git.\n"
-"  -n, --node=DÜÐÜMADI          ilk uðranan Info dosyasýndaki düðümleri "
-"belirle.\n"
-"  -o, --output=DOSYAADI        seçili düðümleri DOSYAADI'na çýkar.\n"
-"  -R, --raw-escapes            klavuz sayfalarýndan ANSI kaçýþlarýný (esc) "
-"silme.\n"
-"      --restore=DOSYAADI       ilk tuþ vuruþlarýný DOSYAADI'ndan oku.\n"
-"  -O, --show-options, --usage  komut-satýrý seçenekler düðümüne git.\n"
-"%s      --subnodes               menü öðelerini özyinelemeli çýkar.\n"
-"      --vi-keys                vi ve less benzeri tuþ baðlayýcýlarý kullan.\n"
-"      --version                sürüm bilgisini göster ve çýk.\n"
-"\n"
-"Eðer mevcutsa, ilk seçenek-olmayan argüman, baþlanacak menü giriþidir;\n"
-"INFOPATH boyunca tüm `dir' dosyalarýnda aranýr.\n"
-"Mevcut deðilse, bilgi tüm `dir' dosyalarýný birleþtirip sonucu gösterir.\n"
-"Kalan tüm argümanlar, ilk uðranan düðüme göreceli olarak\n"
-"menü öðesi adlarý muamelesi görür.\n"
-"\n"
-"Örnekler:\n"
-"  info                       üst-düzey dir menüsünü göster\n"
-"  info emacs                 üst-düzey dir'den emacs düðümünde baþla\n"
-"  info emacs buffers         emacs klavuzu içindeki tampon düðümden baþla\n"
-"  info --show-options emacs  emacs'ýn komut satýrý seçenekleri olan düðümden "
-"baþla\n"
-"  info -f ./foo.info         dir'i aramadan ./foo.info dosyasýný göster\n"
-
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -345,407 +402,411 @@ msgstr ""
 "genel soru ve tartýþmalarý help-texinfo@gnu.org'a gönderiniz.\n"
 "Texinfo anasayfasý: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "`%s' düðümü bulunamadý."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "`(%s)%s' düðümü bulunamadý."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "Bir pencere bulunamadý!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "Orasý bu pencerenin düðümü gibi görünmüyor!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "Son pencere silinemez."
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "Bu düðümde menü yok."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "Bu düðümde dipnot yok."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "Bu düðümde çapraz baþvuru yok."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Bu düðüm için `%s' yer gösterici yok."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Info komutu `%c' bilinmiyor; yardým almak için `?' deneyin."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "`%s' terminal türü Info çalýþtýrmak için yeterince akýllý deðil."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "Zaten bu düðümün son sayfasýndasýnýz."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "Zaten bu düðümün ilk sayfasýndasýnýz."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "Sadece bir pencere."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "Pencere çok küçük olacaktý."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Bir yardým penceresi için yer yok, lütfen bir pencere silin."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
-"Info Pencerelerindeki Temel Komutlar\n"
-"************************************\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "\\%-10[quit help]  Bu yardýmdan çýkar \n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Info'dan büsbütün çýkar.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Info öðreticiyi çaðýrýr.\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"Diðer düðümleri seçme:\n"
-"----------------------\n"
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-line]  Bir satýr geri kaydýrýr.\n"
+
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  Bir satýr ileri kaydýrýr.\n"
+
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Geriye doðru bir sayfa kaydýrýr.\n"
+
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Ýleriye doðru bir sayfa kaydýrýr.\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  Bu düðümün \"next\" düðümüne gider.\n"
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Bu düðümün baþlangýcýna gider.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  Bu düðümün \"previous\" düðümüne gider.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Bu düðümden \"up\" gider.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Bu düðümün sonuna gider.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
-"\\%-10[menu-item]  Ýsmini belirterek menü öðesi seçin.\n"
-"              Menü öðesi seçmek, bir baþka düðümün seçilmesine yolaçar.\n"
+"\\%-10[move-to-next-xref]  Bu düðüm içinde sonraki yardýmlý metin linkine "
+"[*] atlar.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
+#, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
-"\\%-10[xref-item]  Bir çapraz baþvuruyu izler.  Baþvurunun adýný okur.\n"
+"\\%-10[select-reference-this-line]  Ýmleç altýndaki URL linkini izler.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr "\\%-10[history-node]  Bu pencerede görünen en son düðüme gider.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr ""
-"\\%-10[move-to-next-xref]  Bu düðüm içinde sonraki URL linkine atlar.\n"
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[prev-node]  Bu düðümün \"previous\" düðümüne gider.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr "\\%-10[move-to-prev-xref]  Bu düðüm içinde önceki URL linkine atlar.\n"
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[next-node]  Bu düðümün \"next\" düðümüne gider.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr ""
-"\\%-10[select-reference-this-line]  Ýmleç altýndaki URL linkini izler.\n"
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Bu düðümün \"previous\" düðümüne gider.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
-"\\%-10[dir-node]  `dizin' düðümüne gider.  `\\[goto-node] (DIR)'a eþdeðer.\n"
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Bu düðümün \"next\" düðümüne gider.\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr ""
-"\\%-10[top-node]  En üst düðüme gider.  `\\[goto-node] Top'a eþdeðer.\n"
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Bu düðümden \"up\" gider.\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"Bir düðüm içinde dolaþým:\n"
-"-------------------------\n"
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[end-of-node]  Bu düðümün sonuna gider.\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[end-of-node]  Bu düðümün sonuna gider.\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Bu düðümün baþlangýcýna gider.\n"
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "1...9       Bu düðümün menüsündeki ilk...dokuzuncu öðeyi seçer.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Bu düðümün sonuna gider.\n"
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Düðümün menüsündeki son öðeyi seçer.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "\\%-10[next-line]  Bir satýr ileri kaydýrýr.\n"
+#, fuzzy
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  Ýsmi ile belirtilen menü öðesini seçer.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "\\%-10[prev-line]  Bir satýr geri kaydýrýr.\n"
+#, fuzzy
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr ""
+"\\%-10[xref-item]  Bir çapraz baþvuruyu izler.  Baþvurunun adýný okur.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Ýleriye doðru bir sayfa kaydýrýr.\n"
-
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Geriye doðru bir sayfa kaydýrýr.\n"
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  ismiyle belirtilen düðüme gider.\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr ""
-"Diðer komutlar:\n"
-"---------------\n"
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  Belirli bir dizgeyi geriye doðru arar\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "\\%-10[menu-digit]  Düðümün menüsündeki ilk ...inci öðeyi seçer.\n"
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[prev-node]  Bu düðümün \"previous\" düðümüne gider.\n"
 
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "\\%-10[last-menu-item]  Düðümün menüsündeki son öðeyi seçer.\n"
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "  %-10s  Belirli bir dizgeyi geriye doðru arar\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
+#, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 "\\%-10[index-search]  Bu Info dosyasýndaki indeks girdileri içinde belirli "
 "bir dizgeyi arar\n"
 "              ve bulunan ilk girdi tarafýndan gönderme yapýlan düðümü "
 "seçer.\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  Ýsmiyle belirtilen düðüme gider.\n"
-"              (DOSYAADI)DÜÐÜMADI þeklinde bir dosya adý da "
-"ekleyebilirsiniz.\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  Belirli bir dizgeyi ileriye doðru arar\n"
-"              ve sonraki bulunanýn içinde olduðu düðümü seçer.\n"
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "Mevcut iþlemi iptal eder"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  Belirli bir dizgeyi geriye doðru arar\n"
-"              ve önceki bulunanýn içinde olduðu düðümü seçer.\n"
+"Info Pencerelerindeki Temel Komutlar\n"
+"************************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Bu yardým penceresinden çýkar.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Info büsbütün çýkar.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Info öðreticiyi yardýma çaðýrýr.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Bu düðümün `sonraki' düðümüne gider.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Bu düðümün `önceki' düðümüne gider.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Bu düðümden `yukarý' gider.\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Ýsmi ile belirtilen menü öðesini seçer.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr ""
-"              Diðer düðümün seçilmesine sebep olan bir menü öðesini "
-"seçiyor.\n"
+"\\%-10[menu-item]  Ýsmini belirterek menü öðesi seçin.\n"
+"              Menü öðesi seçmek, bir baþka düðümün seçilmesine yolaçar.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Bir çapraz baþvuruyu izler. Baþvuru ismini okur.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Bu pencerede görünen son düðüme gider.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Bu düðümün içinden sonraki URL baðýna atlar.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Ýmleç altýndaki URL baðýný izler.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  `dizin' düðümüne gider. `g (DÝZÝN)' ile eþdeðer.\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Üst düðüme gider. `g Top' ile eþdeðer.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Bir düðüm içinde dolaþým:\n"
+"-------------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Bir sayfa ileri kaydýrýr.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Bir sayfa geri kaydýrýr.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Bu düðümün baþlangýcýna gider.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Bu düðümün sonuna gider.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Bir satýr ileri kaydýrýr.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Bir satýr geri kaydýrýr.\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Diðer komutlar:\n"
+"---------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  Önce seçer ... düðüm menüsündeki dokuzuncu öðe.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Düðüm menüsündeki son öðeyi seçer.\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:125
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr "  %-10s  Bu Info'nun indeks girdilerinde belirtilen bir dizgeyi arar\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
-"              dosyasý ve bulunan ilk girdi tarafýndan baðýntýlanan düðümü "
+"  %-10s  Bu Info dosyasýndaki indeks girdileri içinde belirli bir dizgeyi "
+"arar\n"
+"              ve bulunan ilk girdi tarafýndan gönderme yapýlan düðümü "
 "seçer.\n"
 
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  ismiyle belirtilen düðüme gider.\n"
-
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
-"              (DOSYAÝSMÝ)DÜÐÜMÝSMÝ þeklinde bir dosyayý dahil "
-"edebilirsiniz.\n"
+"\\%-10[goto-node]  Ýsmiyle belirtilen düðüme gider.\n"
+"              (DOSYAADI)DÜÐÜMADI þeklinde bir dosya adý da "
+"ekleyebilirsiniz.\n"
 
-#: info/infodoc.c:133
+#: info/infodoc.c:129
 #, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Belirli bir dizgeyi ileriye doðru arar,\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
-msgstr "              ve bulunan sonraki oluþumdaki düðümü seçer.\n"
+msgstr ""
+"  %-10s  Belirli bir dizgeyi ileriye doðru arar\n"
+"              ve sonraki bulunanýn içinde olduðu düðümü seçer.\n"
 
-#: info/infodoc.c:135
-#, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Belirli bir dizgeyi geriye doðru arar\n"
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"  %-10s  Belirli bir dizgeyi ileriye doðru arar\n"
+"              ve sonraki bulunanýn içinde olduðu düðümü seçer.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "Þu anki arama yolu:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -753,7 +814,7 @@ msgstr ""
 "Info pencerelerinde kullanýlabilecek komutlar:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -761,7 +822,7 @@ msgstr ""
 "Eko alanýnda kullanýlabilecek komutlar:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -770,90 +831,79 @@ msgstr ""
 "Aþaðýdaki komutlar yalnýzca %s aracýlýðýyla çaðrýlabilirler:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
 msgstr "  tümü\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-"--- Çýkmak için `\\[geçmiþ-düðüm]' ya da `\\[kaldýrýlan-düðüm]' kullanýn "
-"---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "Bu yardým iletisini gösterir"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "Info düðümünü `(info)Help' ziyaret eder"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "KEY ile ilgili belgeleri basar"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Tuþ açýklamasý: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s atanmamýþ."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s atanmamýþ."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s %s olarak atanmýþ."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Verilen komutu çalýþtýracak türü gösterir"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr "Komutun yeri: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' bir tuþ üzerinde deðil"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s sadece %s üzerinden çaðrýlabilir."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s, %s üzerinden çaðrýlabilir."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "`%s' isimli bir iþlev yok"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"Kopyahakký (C) %s Free Software Foundation, Inc.\n"
-"Garanti yoktur. Bu yazýlýmý GNU Genel Kamu Lisansý koþullarý\n"
-"altýnda daðýtabilirsiniz. Bu konuda daha fazla bilgi için\n"
-"COPYING isimli dosyaya bakýn.\n"
+"Diðer düðümleri seçme:\n"
+"----------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -963,22 +1013,22 @@ msgstr ""
 "  --help                bu yardýmý gösterir ve çýkar\n"
 "  --version             sürüm bilgisini gösterir ve çýkar.\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Geçersiz infokey dosyasý `%s' yoksayýlýyor - çok küçük"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Geçersiz infokey dosyasý `%s' yoksayýlýyor - çok büyük"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "infokey dosyasý `%s' okumada hata - çok kýsa"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -986,12 +1036,12 @@ msgstr ""
 "Geçersiz infokey dosyasý `%s' (hatalý sihirli numaralar) -- güncellemek için "
 "infokey yürütün"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr "infokey dosyanýz `%s' eskimiþ -- güncellemek için infokey yürütün"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -999,7 +1049,7 @@ msgstr ""
 "Geçersiz infokey dosyasý `%s' (hatalý bölüm uzunluðu) -- güncellemek için "
 "infokey yürütün"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -1007,45 +1057,45 @@ msgstr ""
 "Geçersiz infokey dosyasý `%s' (hatalý bölüm kodu) -- güncellemek için "
 "infokey yürütün"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "Infokey dosyasýnda hatalý veri -- bazý tuþ baðlantýlarý yoksayýldý"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr "Infokey dosyasýnda hatalý veri -- bazý deðiþken ayarlarý yoksayýldý"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "Bir Info komut ismini okur ve onu açýklar"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Komut açýklamasý: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "Eko alanýndan komut ismini okur ve onu çalýþtýrýr"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Bir `eko-alaný' komutu burada çalýþtýrýlamaz."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, c-format
 msgid "Undefined command: %s"
 msgstr "tanýmlanmamýþ komut: %s"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "Gösterilen pencerenin yüksekliði belirtilir"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Ekran yüksekliðini (%d) ye ayarlar: "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1055,12 +1105,12 @@ msgstr ""
 "dosyalar:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "%s dosyasý manipüle edilemedi.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1072,7 +1122,7 @@ msgstr ""
 "  (Dosya)Düðüm                     Satýr   Boyut   Ýçerdiði Dosya\n"
 "  ------------                     -----   -----   --------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1080,26 +1130,31 @@ msgstr ""
 "Son zamanlarda uðradýðýnýz düðüm menüsünü görmektesiniz.\n"
 "Ya bu menüden seçin, ya da baþka bir pencerede `\\[history-node]' kullanýn.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr ""
 "Son zamanlarda uðradýðýnýz tüm düðümlerin menüsünü içeren bir pencere "
 "oluþturur"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Daha önce, görünür bir pencereden uðradýðýnýz bir düðüm seçiniz"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Uðramýþ olduðunuz düðümü seçiniz: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Referans yokoldu! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1108,506 +1163,511 @@ msgstr ""
 "Info sürüm %s'e hoþgeldiniz. Yardým için \\[get-help-window], menü öðesi "
 "için \\[menu-item] yazýnýz."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "Sonraki satýra (aþaðý) gider"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "Önceki satýra (yukarý) gider"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "Satýr sonuna gider"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "Satýr baþýna gider"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "Sonraki"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Sonraki düðümü izliyor..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Ýlk menü öðesi seçiliyor..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Sonraki düðüm seçiliyor..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "%d kez Yukarý gidip, Sonrakine geçiliyor."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "Bu belge içinde baþka düðüm yok."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "Bu düðüm için baþka `Önceki' yok."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Bu pencerede Öncekine gidiliyor."
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "Bu belge içinde, bu düðüm için `Önceki' ya da `Yukarý' yok."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Bu pencere içinde Yukarýya gidiliyor."
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "`Önceki'nin son menü öðesine gidiliyor."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "Düðüm yapýsý içinde ileriye ya da aþaðýya gider"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "Düðüm yapýsý içinde geriye ya da yukarýya gider"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "Bu pencerede ileriye doðru kaydýrýr"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 "Bu pencerede ileriye doðru kaydýrýr ve öntanýmlý pencere boyutuna ayarlar"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr "Bu pencerede, düðüm içinde kalarak ileriye doðru kaydýrýr"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "Bu pencerede, düðüm içinde kalarak ileriye doðru kaydýrýr ve öntanýmlý "
 "pencere boyutunu ayarlar"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "Bu pencerede geriye doðru kaydýrýr"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
 "Bu pencerede geriye doðru kaydýrýr ve öntanýmlý pencere boyutunu ayarlar"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr "Bu pencerede, düðüm içinde kalarak geriye doðru kaydýrýr"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr "geri ve set öntanýmlý"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "Bu düðümün baþlangýcýna gider"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "Bu düðümün sonuna gider"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "Aþaðýya doðru satýr kaydýrýr"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "Yukarýya doðru satýr kaydýrýr"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "Aþaðýya doðru yarým ekran boyutu kaydýrýr"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "Yukarýya doðru yarým ekran boyutu kaydýrýr"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "Sonraki pencereyi seçer"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "Önceki pencereyi seçer"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "Mevcut pencereyi böler"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "Mevcut pencereyi siler"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "Kalýcý bir pencere silinemez"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "Diðer tüm pencereleri siler"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "Diðer pencereyi kaydýrýr"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "Diðer pencereyi geriye doðru kaydýrýr"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "Bu pencereyi büyütür (ya da küçültür)"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "Mevcut ekran boþluðunu görünür pencereler arasýnda bölüþtürür"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Mevcut penceredeki satýr sarma durumunu deðiþtirir"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+#, fuzzy
+msgid "Using regular expressions for searches."
+msgstr "Düzenli ifadede hata `%s': %s"
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "Sonraki düðümü seçer"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "Önceki düðümü seçer"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "Üstteki düðümü seçer"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "Bu dosyadaki son düðümü seçer"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "Bu pencerenin baþka düðümü yok"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "Bu dosyadaki ilk düðümü seçer"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "Bu düðümün menüsündeki son öðeyi seçer"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "Bu menü öðesini seçer"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Bu menüde %d adet öðe yok."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menü öðesi (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "Menü öðesi: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Ýzlenecek xref (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "Ýzlenecek xref: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "Bir menü öðesini okur ve düðümünü seçer"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Oku yada ve select"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "Bu düðüm menüsünün baþlangýcýna gider"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "Tek seferde mümkün olan en fazla sayýda menü öðesine uðrar"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "Bir düðüm adý okur ve seçer"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "Düðüme gider: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Menüsü olmayan düðüm `%s'."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "`%2$s' düðümünde `%1$s' menü öðesi yok."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "`%2$s''de `%1$s' tarafýndan baþvurulan düðüm bulunamadý."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Dizinden baþlayarak bir menü listesini oku ve izle"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "Menüleri izle: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Program çaðýrmayý açýklayan düðümü bulur"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "[%s]'in çaðýrma düðümünü bulur: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "Bir klavuz sayfasý baþvurusunu okur ve seçer"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "Alýnacak klavuz sayfasý: "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "Bu dosyadaki `En Üst' düðümü seç"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "`(dizin)' düðümünü seç"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Düðümü öldür (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Öldürülemeyen düðüm `%s' "
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "Son düðüm öldürülemiyor"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "En son seçilen düðümü seçer"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "Bu düðümü öldürür"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "Bir dosyanýn adýný okur ve seçer"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Dosyayý bul: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "`%s' bulunamýyor."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Çýktý dosyasý `%s' oluþturulamýyor."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Bitti."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "%s düðümü yazýlýyor..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "Bu düðümün içeriðini INFO_PRINT_COMMAND üzerinden veri yolla"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Veri yolu `%s''e açýlamýyor."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "%s düðümü yazdýrýlýyor..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "Satýrýn baþýna kadar siler"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "%s altdosyasý aranýyor ..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr "Bir dizge okur ve onu büyük/küçük harf duyarlý þekilde arar"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "Bir dizge okur ve (onu) arar"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "Bir dizge okur ve (onu) geriye doðru arar"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "%s%s için dizge [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr " büyük/küçük harf duyarlý þekilde "
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "Geriye doðru ara"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "Ara"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " büyük/küçük harf duyarlý þekilde "
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "Arama baþarýsýz"
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "Son aramayý ayný yönde yineler"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "Daha önceden arama dizgesi yok"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "Son aramayý ters yönde yineler"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "Bir dizgeyi siz yazarken etkileþimli þekilde arar"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "I-arama, geriye doðru: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "I-arama, geriye doðru: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "I-arama: "
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "I-arama: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "Baþarýlamýyor "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "Önceki çapraz baþvuruya gider"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "Sonraki çapraz baþvuruya gider"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "Bu satýrdaki referans ya da menü öðesini seçer"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "Mevcut iþlemi iptal eder"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Çýk"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "Ýmleci pencerenin belirli bir satýrýna taþýr"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "Görüntüyü yeniden çizer"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Info'dan çýkar"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr "Bu tuþun küçük harfine atanmýþ komutu yürütür"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Bilinmeyen komut (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" geçersiz"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, c-format
 msgid "`%s' is invalid"
 msgstr "`%s' geçersiz"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "Mevcut sayýsal argümana bu sayýyý ekle"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Mevcut sayýsal argümaný baþlat (ya da 4'le çarp)"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "Dahili olarak \\[universal argument] tarafýndan kullanýlýyor"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "okuma-satýrý: Sanal bellek tükendi!\n"
@@ -1644,196 +1704,366 @@ msgstr "\"Açýk\" olduðunda, arama dizgesinin eþleþen kýsmý ýþýklandýrýlýr"
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "Bir düðüm sonunda kaydýrma istendiðinde ne olacaðýný kontrol eder"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr "Metin kaydýrma davranýþýyla ayný"
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "Ýmleç penceere dýþýna taþýndýðýnda kaydýrýlacak satýr sayýsý"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+"Metin kaydýrma davranýþýnýn imleç hareket komutlarýný etkileyip "
+"etkilemeyeceðini kontrol eder"
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr ""
 "\"Açýk\" olduðunda Info, ISO Latin karakterleri kabul eder ve görüntüler"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "Bir düðüm sonunda kaydýrma istendiðinde ne olacaðýný kontrol eder"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "Bir deðiþkenin kullanýmýný açýklar"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Açýklanacak deðiþken: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Bir Info deðiþkeninin deðerini belirler"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Deðiþkeni ata: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "%s'e atanacak deðer (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "%s'e atanacak deðer (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "..*** Eskimiþ Etiketler ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), satýr ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d satýr --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d satýr --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " Altdosya: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: `%s' seçeneði belirsiz\n"
+msgid "%s: warning: "
+msgstr "%s: uyarý: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: `--%s' seçeneði argümansýz kullanýlýr\n"
+msgid " for %s"
+msgstr " %s için"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: `%c%s' seçeneði argümansýz kullanýlýr\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tSeçeneklerin tam bir listesi için `%s --help''i deneyiniz.\n"
+
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Kullaným: %s [SEÇENEK]... TEXINFO-DOSYASI...\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Yazýlým hatalarýný bug-texinfo@gnu.org'a,\n"
+"genel soru ve tartýþmalarý help-texinfo@gnu.org'a gönderiniz.\n"
+"Texinfo anasayfasý: http://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Bu, .../info/dir dosyasý olup, (dir)Üst adý verilen, Info\n"
+"hiyerarþisinin en üst düðümünü içerir.\n"
+"Info'yu ilk çalýþtýrdýðýnýzda bu düðüme bakarak baþlýyor olursunuz.\n"
+"\n"
+"%s\tBu, INFO aðacýnýn tepesidir\n"
+"\n"
+"  Bu (Dizin düðümü), temel konularýn bir menüsünü verir.\n"
+"  \"q\" tuþuyla çýkar, \"?\" ile tüm Info komutlarýný listeler, \"d\" ile "
+"buraya döner,\n"
+"  \"h\" ile yeni baþlayanlar için bir klavuz alabilir,\n"
+"  \"mEmacs<Return>\" ile Emacs klavuzunu ziyaret edebilirsiniz, vs.\n"
+"\n"
+"  Emacs'ta, bir menü öðesi ya da çapraz baþvuru üzerinde sað fare tuþunu\n"
+"  týklayarak seçim yapabilirsiniz.\n"
+"\n"
+"%s\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: `--%s' seçeneði bilinmiyor\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%1$s: (%2$s) okunamýyor ve (%3$s) oluþturulamýyor\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: `%c%s' seçeneði bilinmiyor\n"
+msgid "%s: empty file"
+msgstr "%s: boþ dosya"
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "Eþleþen END-INFO-DIR-ENTRY'siz START-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "Eþleþen START-INFO-DIR-ENTRY'siz END-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: kuraldýþý seçenek -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: zaten dir dosyasý var: %s\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: geçersiz seçenek -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Info dosyasýný yalnýzca bir kez belirtin.\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: seçenek bir argümanla kullanýlýr -- %c\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr "Bir baþka düzenli ifade belirlendi, `%s' yok sayýlýyor"
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `-W %s' seçeneði belirsiz\n"
+msgid "Error in regular expression `%s': %s"
+msgstr "Düzenli ifadede hata `%s': %s"
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' seçeneði argümansýz kullanýlýr\n"
+msgid "excess command line argument `%s'"
+msgstr "fazladan komut satýrý argümaný `%s'"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr "Girdi dosyasý belirtilmemiþ; daha fazla bilgi için --help deneyin."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr "dizin dosyasý belirtilmemiþ; daha fazla bilgi için --help deneyin."
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "`%s' içinde info dizin girdisi yok"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "`%s' için girdi bulunamadý; hiçbir þey silinmedi"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr "stdout'da ferror\n"
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr "stdout'da fflush hatasý\n"
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "@%s'ye argümanlar yok sayýldý"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "Ocak"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "Þubat"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "Mart"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "Nisan"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "Mayýs"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "Haziran"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "Temmuz"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "Aðustos"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "Eylül"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "Ekim"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "Kasým"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "Aralýk"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "@var içinde düþük olasýlýklý karakter %c"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc argümaný tamamen büyükharf(le yazýlmýþ), etkisiz"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`{' beklenirdi, `%c' görüldü"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "fiil bloðu içinde dosya sonu"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`}' beklenirdi, `%c' görüldü"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1841,328 +2071,312 @@ msgstr ""
 "@strong{Not...} Info'da sahte bir çapraz-baþvuru oluþturur; bundan kaçýnmak "
 "için yazýmý deðiþtirin"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s kullanýmdan kalkmýþ"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp pozitif bir sayýsal argüman gerektirir, `%s' deðil"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "%c%s'ye hatalý argüman"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "yok"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "@%s'ye hatalý argüman"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr "ekle"
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "@def arg'da kayýp `}'"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Ýþlev"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Makro"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Özel Form"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Deðiþken"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Kullanýcý Seçeneði"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Durum Deðiþkeni"
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "@%s:%s'ye hatalý argüman"
 
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Yöntem"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr "%1$s'de açýk ya da kapalý bakleniyordu, `%2$s' deðil"
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "kapalý"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr "Yalnýzca @%1$s 10 ya da 11 destekleniyor, `%2$s' deðil"
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "açýk"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "@def arg'da kayýp `}'"
 
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "`@%s' kullanmak için `@%s' ortamý içinde ol(un)malýdýr"
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr "`%s' çýktý dosya adýndan önce yok sayýldý"
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr "stdout'a yazýlýyor olduðundan `%s' yok sayýldý"
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr "Çýktý tamponu boþ deðil"
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr "Ýstenen yüzer türü `%s' daha önce kullanýlmadý"
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Bkz "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "`%c%s' bir argüman gereksinir `{   }', yalnýzca `%s' deðil"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "Dipnot `%s' için kapama } yok"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "Dipnot, ebeveyn düðümsüz tanýmlanmýþ"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Dipnot içi dipnotlara izin verilmez"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "Dipnotlar"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: açýlamayan --css-dosyasý: %s"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: --css-dosyasý yorum içinde sonlandý"
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "Adsýz"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr "hayýr :"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[beklenmeyen] geçersiz düðüm ismi: `%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Bilinmeyen indeks `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info, `%s' indeks girdisindeki `:''yi kullanamýyor"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Ýndeks `%s' zaten mevcut"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Bilinmeyen indeks `%1$s' ve/veya @synindex içinde `%2$s'"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr "(satýr )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr "(satýr %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex içinde bilinmeyen indeks `%s'"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "`%s' indeks girdisi tüm düðümlerin dýþýnda"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(tüm düðümlerin dýþýnda)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "Bkz "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr "@item, @itemize'a argüman olarak kullanýlamaz"
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "insertion_type_pname içinde Kýrýk-Tip"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "Numaralandýrma yýðýn taþmasý"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "harflendirme taþmasý, %c'den yeniden baþlanýyor"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s bir argüman gerektirir: %c öðesi için biçimlendirici"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr "%cfloat çevreler içiçelendirilemez"
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "`@end'  `%1$s' beklerdi, `%2$s' gördü"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Eþleþen `%cend %s' yok"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s harf ya da rakam gerektirir"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "verbatim bloðu içinde dosya sonu"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "`@float' çevresi dýþýnda @%s anlamlý deðil"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "önce Üst"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "belki de sizin @top düðümünüz, @ifinfo'dan ziyade @ifnottex içine "
 "sarýlmalýdýr?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu ilk düðümden önce görüldü, `En Üst' düðüm oluþturuluyor"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr "`@titlepage' ve `@quotation' çevreleri dýþýnda @%s anlamlý deðil"
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "`@titlepage' çevresi dýþýnda @%s anlamlý deðil"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Eþleþmeyen `%c%s'"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "`%c%s' sonrasýnda birþeyler gereklidir"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "`%2$s''e hatalý argüman, `%1$s', `%3$s' kullanýlýyor"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "`@%s' bloðu içinde @%s anlamlý deðil"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "`%s' bloðunun içinde @itemx anlamlý deðil"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s, bir ekleme bloðunun dýþýnda bulundu"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr "`%s' dili için bilinen öntanýmlý bölge yok"
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s geçerli bir ISO 639 dil kodu deðildir"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "tanýnmayan kodlama adý `%s'"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "üzgünüm, `%s' kodlamasý desteklenmiyor"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "geçersiz kodlanmýþ karakter `%s'"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s argüman olarak `i' ya da `j' gerektirir, %c deðil"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s argüman olarak tek karakter, `i' ya da `j' gerektirir"
@@ -2177,7 +2391,7 @@ msgstr "makro `%s' daha önce tanýmlanmýþ"
 msgid "here is the previous definition of `%s'"
 msgstr "iþte `%s''nin önceki tanýmý"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "makro geniþlemesindeki \\'i, parametre adý yerine `%s' izliyor"
@@ -2187,46 +2401,51 @@ msgstr "makro geniþlemesindeki \\'i, parametre adý yerine `%s' izliyor"
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makro `%s', %d satýrýnda çok sayýda arg.la çaðrýldý"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cson makrosu bulunamadý"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote arg.ý yalnýzca tek argümanlý makrolarda yararlý"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr "@allow-recursion kullanýlmýyor; lütfen yerine @rmacro kullanýnýz"
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
+"@quote-arg kullanýlmýyor; argümanlar öntanýmlý olarak týrnak içine alýnýyor"
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@%s ile eþleþmeyen @end %s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Çok sayýda hata!  Vazgeçildi.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: uyarý: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "Yanlýþ yerleþtirilmiþ %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazýn.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Kullaným: %s [SEÇENEK]... TEXINFO-DOSYASI...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2235,59 +2454,66 @@ msgstr ""
 "Info dosyalarý çevrimiçi Emacs ya da tek baþýna GNU Info'yla okunmak için "
 "uygundur.\n"
 
-#: makeinfo/makeinfo.c:350
+#: makeinfo/makeinfo.c:354
 #, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
 "Genel seçenekler:\n"
 "      --error-limit=ADET      ADET hatadan sonra çýkar (öntanýmlý %d).\n"
+"      --document-language=STR Çýktý belgesi için Texinfo anahtar "
+"sözcüklerini \n"
+"                                çevirmekte kullanýlacak yerel (öntanýmlý "
+"C).\n"
 "      --force                 hatalarda dahi çýktýyý korur.\n"
 "      --help                  bu yardýmý görüntüler ve çýkar.\n"
 "      --no-validate           düðüm çapraz-baþvuru onaylamasýný baskýlar.\n"
 "      --no-warn               uyarýlarý baskýlar (fakat hatalarý deðil).\n"
-"      --reference-limit=ADET  en fazla ADET referansta uyar (öntanýmlý %d).\n"
 "  -v, --verbose               ne yapýlýyor olduðunu açýklar.\n"
 "      --version               sürüm bilgisini görüntüler ve çýkar.\n"
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 "Çýktý biçem seçimi (öntanýmlýsý Info üretmektir):\n"
-"      --docbook              Info yerine DocBook çýktýsý üretir.\n"
+"      --docbook              Info yerine DocBook XML çýktýsý üretir.\n"
 "      --html                 Info yerine HTML çýktýsý üretir.\n"
-"      --xml                  Info yerine XML (TexinfoML) çýktýsý üretir.\n"
+"      --xml                  Info yerine Texinfo XML çýktýsý üretir.\n"
 "      --plaintext            Info yerine salt metin çýktýsý üretir.\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
+#, fuzzy
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 "Genel çýktý seçenekleri:\n"
 "  -E, --macro-expand DOSYA   makro-geniþletilmiþ kaynak çýktýsýný herhangi "
@@ -2305,18 +2531,21 @@ msgstr ""
 "  -o, --output=DOSYA         çýktýyý DOSYA'ya yazar (bölünmüþ HTML ise "
 "dizine).\n"
 
-#: makeinfo/makeinfo.c:386
+#: makeinfo/makeinfo.c:391
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2324,9 +2553,11 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 "Info ve salt metin için seçenekler:\n"
-"      --enable-encoding       aksanlý ve özel karakterlerin çýktýsýný "
+"      --disable-encoding      aksanlý ve özel karakterlerin çýktýsýný "
 "@documentencoding'e\n"
-"                                dayalý olarak Info çýktýsýna yazar.\n"
+"                                dayalý olarak Info çýktýsýna yazmaz.\n"
+"      --enable-encoding       --disable encoding'i (öntanýmlý) geçersiz "
+"kýlar.\n"
 "      --fill-column=ADET       Info satýrlarýný ADET karakterde bitir "
 "(öntanýmlý %d)\n"
 "      --footnote-style=STÝL   Info'da dipnotlarýn çýktýsýný STÝL'e göre "
@@ -2334,39 +2565,46 @@ msgstr ""
 "                                 kendi düðümlerine koymak için `separate';\n"
 "                                 tanýmlandýklarý düðümün sonuna koymak için\n"
 "                                 `end' (öntanýmlý).\n"
-"      --paragraph-indet=DEG   Info paragraflarýný DEG boþluk girintiler "
+"      --paragraph-indent=DEG   Info paragraflarýný DEG boþluk girintiler "
 "(öntanýmlý %d).\n"
 "                                Eðer DEG `none' ise girintilemez; eðer DEG\n"
 "                                `asis' ise mevcut girintiyi korur.\n"
 "      --spilt-size=NUM        Info dosyalarýný NUM boyutuna böler (öntanýmlý "
 "%d).\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 "HTML seçenekleri:\n"
 "      --css-include=DOSYA        DOSYA'yý HTML <style> çýktýsýnda içer;\n"
 "                                   eðer DOSYA - ise stdin'i oku.\n"
+"      --css-ref=URL           bir CSS dosyasýna baþvuru oluþtur.\n"
+"      --transliterate-file-names\n"
+"                              dosya isimlerini ASCII alfabesine dönüþtürerek "
+"üret.\n"
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 "XML ve Docbook için seçenekler:\n"
 "      --output-indent=DEÐER        XML elementlerini DEÐER kadar boþluk "
 "girintilendir (öntanýmlý %d).\n"
 "                                     eðer DEÐER 0 ise yok sayýlabilen beyaz "
-"boþluk silinir..\n"
+"boþluk silinir.\n"
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2384,7 +2622,7 @@ msgstr ""
 "  -U VAR                         VAR deðiþkeninin tanýmýný, @clear ile "
 "olduðu gibi geri alýr.\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2420,7 +2658,7 @@ msgstr ""
 "\n"
 "  Ayrýca --no-ifFORMAT seçenekleri için ifnotFORMAT metnini iþler.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2434,19 +2672,20 @@ msgstr ""
 "  eðer salt metin oluþturuluyorsa, --ifplaintext açýk, diðerleri kapalýdýr;\n"
 "  eðer XML oluþturuluyorsa, --ifxml açýk, deiðerleri kapalýdýr.\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "Örnekler:\n"
 "  makeinfo foo.texi                     foo'nun @setfilename'ine Info yazar\n"
@@ -2456,88 +2695,83 @@ msgstr ""
 "  makeinfo --no-headers foo.texi        standart çýktýya salt metin yazar\n"
 "\n"
 "  makeinfo --html --no-headres foo.texi düðüm çizgisiz, menüsüz html yazar\n"
-"  makeinfe --number-sections foo.texi   numaralanmýþ kýsýmlarý olan Info "
+"  makeinfo --number-sections foo.texi   numaralanmýþ kýsýmlarý olan Info "
 "yazar\n"
 "  makeinfo --no-split foo.texi          ne büyüklükte olursa olsun tek Info "
 "dosyasý yazar\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr "%s: Tanýnamayan TEXINFO_OUTPUT_FORMAT deðeri `%s' yok sayýlýyor.\n"
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%1$s: %2$s arg sayýsal olmalýdýr, `%3$s' deðil.\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s:makro geniþleme çýktýsý `%s' açýlamadý"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s: ikinci makro geniþleme çýktýsý yok sayýlýyor `%s'.\n"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%1$s: --paragraph-indent arg. sayýsal/`none'/`asis' olmalýdýr, `%2$s' "
 "deðil.\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%1$s: --footnote-style arg. `separate' ya da `end' olmalýdýr, `%2$s' deðil.\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: dosya argümaný eksik.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Çok satýrlý komut %c%s uygunsuz kullanýldý"
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "`%s' gerekir"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "`%1$s' dizini oluþturulamýyor: %2$s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%2$s' içinde `%1$s' yok"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Makro geniþlemesini, Info çýktýsý da oraya gittiðinden, stdout'a "
 "atlatýyor.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "`%3$s''den %1$s dosya `%2$s' yapýlýyor.\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "Bu %1$s, makeinfo sürümü %2$s tarafýndan, %3$s'den üretilmiþtir.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2545,81 +2779,81 @@ msgstr ""
 "%1$s: Makro çýktý dosyasý `%2$s' hatalardan dolayý siliniyor; korumak için --"
 "force kullanýnýz.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%1$s: Çýktý dosyasý `%2$s' hatalardan dolayý siliniyor; korumak için --force "
 "kullanýnýz.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Bilinmeyen komut `%s'"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "@%s'e argüman olarak bir komut vermek için {} kullanýn"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s küme parantezi bekledi"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "Eþleþmemiþ }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "ÝSÝMSÝZ!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s eksik kapama }"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image dosyasý `%1$s' (HTML için) okunamýyor: %2$s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, c-format
 msgid "No such file `%s'"
 msgstr "`%s' adýnda dosya yok"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image dosyasý `%1$s' (metin için) okunamýyor: %2$s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "@image eksik dosyaadý argümaný"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr "tanýmlanmamýþ bayrak: %s"
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "(`%s' için deðer yok)"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s bir isim gerektirir"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Eþleþen @end %s'den önce dosya sonuna ulaþýldý"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' geniþleme için çok uzun; geniþletilmedi"
@@ -2628,165 +2862,132 @@ msgstr "`%.40s...' geniþleme için çok uzun; geniþletilmedi"
 msgid "Missing } in @multitable template"
 msgstr "@multitable þablonunda eksik }"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "@multitable'dan sonraki baþýboþ metin `%s' yoksayýlýyor"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Çok-tablolu öðede, çok fazla sütun (maks %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[beklenmeyen] çok-tabloluda sütun #%d seçilemiyor"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "çok-tablolunun dýþýndaki @tab yoksayýlýyor"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "**Son satýrdan çok-sütunlu çýktý:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* sütun #%d: çýktý = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Düðüm `%s' daha önce satýr %d'de tanýmlandý"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Düðüm %s biçimleniyor...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Düðüm `%s' bir bölümleme komutu gerektirir (ör: %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "`%c%s' komutu için bir düðüm adý belirtilmedi"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Çýpa `%1$s' ve düðüm `%2$s' ayný dosya adýna yönlendiriyor"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "Bu @anchor komutu yoksayýldý; buraya yönelik baþvurular çalýþmayacak"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Bu çýpayý yeniden adlandýrýn ya da `--no-split' seçeneðini kullanýn"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "Bölünmüþ-HTML dosyasýnýn sonunda beklenmeyen dizge `%s'"
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "Sonraki:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Önceki:"
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "Yukarý:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "`%1$s' ve `%2$s' çýpalarý ayný dosya adýna yönlendiriyor"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor komutu yoksayýldý; buraya yönelik baþvurular çalýþmayacak"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s baþvuru mevcut olmayan düðüme `%s' (yanlýþ bölümleme nedeniyle?)"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "Menü"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Çapraz"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 "Düðüm `%s''in sonraki alaný þuraya iþaret etmiyor (yanlýþ bölümleme "
 "nedeniyle?)"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Bu düðüm (%s) hatalý Önceki'ne sahip"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "Önceki"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Düðüm `%s''in önceki alaný þuraya iþaret etmiyor"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Bu düðüm (%s) hatalý Sonraki'ne sahip"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "`%s''in Yukarý alaný yok (yanlýþ bölümleme nedeniyle?)"
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "Yukarý"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 "Düðüm `%s', Yukarý hedefi olmasýna karþýn, `%s' için eksik menü öðesi "
 "içeriyor"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "düðüm `%s''e %d kez baþvuruldu"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "baþvurulmamýþ düðüm `%s'"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr "%s siliniyor\n"
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "`%s' dosyasý silinemiyor: %s"
@@ -2801,265 +3002,105 @@ msgstr "Ek %c "
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "Dahili hata (search_sectioning) `%s'!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Dahili hata (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s kullanýmdan kalkmýþ; yerine %c%s kullanýn"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "%cüst'lü düðüm bir bölüm olarak zaten var"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Ýþte %cüst düðüm"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%cüst, %cdüðümden önce kullanýldý, %s'e öntanýmlanýyor"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Ýçindekiler Tablosu"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Kýsa Ýçerik"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image dosyasý `%1$s' okunamýyor: %2$s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr "@multitable'ýn son öðesi @headitem geçersiz Docbook belgeleri üretiyor"
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: uyarý: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " %s için"
-
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\tSeçeneklerin tam bir listesi için `%s --help''i deneyiniz.\n"
-
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Kullaným: %s [SEÇENEK]... [INFO-DOSYASI [DIR-DOSYASI]]\n"
-"\n"
-"Info dizin dosyasý DIR-DOSYASI içindeki INFO-DOSYASI'ndan dizin girdilerini\n"
-"kurar ya da siler.\n"
-"\n"
-"Seçenekler:\n"
-" --delete          INFO-DOSYASI için mevcut girdileri DIR-DOSYASI'ndan "
-"siler;\n"
-"                     yeni girdi eklemez.\n"
-" --dir-file=ÝSÝM   Info dizin dosyasýnýn adýný belirler.\n"
-"                     Bu, DIR-DOSYASI argümanýný kullanmaya eþdeðerdir.\n"
-" --entry=METÝN     METÝN'i bir Info dizin girdisi olarak ekler.\n"
-"                     METÝN, bir Info öðe satýrý þeklinde olmalý\n"
-"                     artý, boþlukla baþlayan sýfýr ya da daha çok fazladan "
-"satýrý bulunmalýdýr.\n"
-"                     Birden fazla girdi belirtirseniz hepsi eklenir.\n"
-"                     Hiç girdi belirtmezseniz, (girdiler) Info dosyasýndaki "
-"bilgiden\n"
-"                     belirlenir.\n"
-" --help            bu yardýmý görüntüler ve çýkar.\n"
-" --info-file=DOSYA dizine kurulacak Info dosyasýný belirler.\n"
-"                     Bu, INFO-DOSYASI argümanýný kullanmaya eþdeðerdir.\n"
-" --info-dir=DIR    --dir-file=DIR/dir ile ayný.\n"
-" --item=METÝN      --entry METÝN ile ayný.\n"
-"                     Bir Info dizin girdisi, gerçekte bir menü öðesidir.\n"
-" --quiet           uyarýlarý baskýlar.\n"
-" --remove          --delete ile ayný.\n"
-" --section=KIS     bu dosyanýn girdilerini dizinin KIS bölümüne koyar.\n"
-"                     Bir bölümden fazlasýný belirtirseniz, tüm girdiler\n"
-"                     herbir bölüme eklenir.\n"
-"                     Hiçbir bölüm belirtmezseniz, (bölümler) Info "
-"dosyasýndaki bilgiden\n"
-"                     belirlenir.\n"
-" --version           sürüm bilgisini görüntüler ve çýkar.\n"
-
-#: util/install-info.c:488
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
-msgstr ""
-"Bu, .../info/dir dosyasý olup, (dir)Üst adý verilen, Info\n"
-"hiyerarþisinin en üst düðümünü içerir.\n"
-"Info'yu ilk çalýþtýrdýðýnýzda bu düðüme bakarak baþlýyor olursunuz.\n"
-"\n"
-"%s\tBu, INFO aðacýnýn tepesidir\n"
-"\n"
-"  Bu (Dizin düðümü), temel konularýn bir menüsünü verir.\n"
-"  \"q\" tuþuyla çýkar, \"?\" ile tüm Info komutlarýný listeler, \"d\" ile "
-"buraya döner,\n"
-"  \"h\" ile yeni baþlayanlar için bir klavuz alabilir,\n"
-"  \"mEmacs<Return>\" ile Emacs klavuzunu ziyaret edebilirsiniz, vs.\n"
-"\n"
-"  Emacs'ta, bir menü öðesi ya da çapraz baþvuru üzerinde sað fare tuþunu\n"
-"  týklayarak seçim yapabilirsiniz.\n"
-"\n"
-"%s\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%1$s: (%2$s) okunamýyor ve (%3$s) oluþturulamýyor\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: boþ dosya"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "Eþleþen END-INFO-DIR-ENTRY'siz START-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "Eþleþen START-INFO-DIR-ENTRY'siz END-INFO-DIR-ENTRY"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "kapalý"
 
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr "%s: zaten dir dosyasý var: %s\n"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "açýk"
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Info dosyasýný yalnýzca bir kez belirtin.\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "Çapraz baþvuru kurulacak ilk argüman boþ olmayabilir"
 
-#: util/install-info.c:1284
+#: makeinfo/xref.c:252
 #, c-format
-msgid "excess command line argument `%s'"
-msgstr "fazladan komut satýrý argümaný `%s'"
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr "`%s' deHTML çapraz baþvurusu için boþ dosya adý"
 
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
-msgstr "Girdi dosyasý belirtilmemiþ; daha fazla bilgi için --help deneyin."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr "`.' ya da `,'ararken dosya sonuna ulaþýldý"
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr "dizin dosyasý belirtilmemiþ; daha fazla bilgi için --help deneyin."
-
-#: util/install-info.c:1313
+#: makeinfo/xref.c:390
 #, c-format
-msgid "no info dir entry in `%s'"
-msgstr "`%s' içinde info dizin girdisi yok"
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "`.' ya da `,' @%s'i izlemelidir, `%c'yi deðil"
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "`%2$s' dosyasý için menü öðesi `%1$s' zaten mevcut"
+#: makeinfo/xref.c:392
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "parantez içindeki çapraz baþvurular için @pxref kullanýnýz"
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "`%s' için girdi bulunamadý; hiçbir þey silinmedi"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "@inforef'e ilk argüman boþ olmayabilir"
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "bu yardýmý görüntüler ve çýkar"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "iþlemden sonra geçici dosyalarý etrafta bulundurur"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "iþlemden sonra geçici dosyalarý etrafta bulundurmaz (öntanýmlý)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "çýktýyý DOSYA'ya gönderir"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "sürüm bilgisini görüntüler ve çýkar"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Kullaným: %s [SEÇENEK]... DOSYA...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Her TeX çýktý DOSYAsý için sýralanmýþ bir indeks oluþturur.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 "Genellikle DOSYA... bir `foo.texi' belgesi için `foo.%c%c' olarak "
 "belirtilir.\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3068,56 +3109,355 @@ msgstr ""
 "\n"
 "Seçenekler:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: bir texinfo indeks dosyasý deðil"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "%s'i yeniden açmada hata"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: bir texinfo indeks dosyasý deðil"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "%s'de sayfa numarasý yok"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "%s girdisi, ikincil isimli bir girdiyi takip ediyor"
 
-#~ msgid "\"\" is invalid"
-#~ msgstr "\"\" geçersiz"
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10[search]  Belirli bir dizgeyi ileriye doðru arar\n"
+#~ "              ve sonraki bulunanýn içinde olduðu düðümü seçer.\n"
+
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10[goto-node]  Ýsmiyle belirtilen düðüme gider.\n"
+#~ "              (DOSYAADI)DÜÐÜMADI þeklinde bir dosya adý da "
+#~ "ekleyebilirsiniz.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "\\%-10[next-node]  Bu düðümün \"next\" düðümüne gider.\n"
+
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr ""
+#~ "\\%-10[dir-node]  `dizin' düðümüne gider.  `\\[goto-node] (DIR)'a "
+#~ "eþdeðer.\n"
+
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr ""
+#~ "\\%-10[top-node]  En üst düðüme gider.  `\\[goto-node] Top'a eþdeðer.\n"
+
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10[search-backward]  Belirli bir dizgeyi geriye doðru arar\n"
+#~ "              ve önceki bulunanýn içinde olduðu düðümü seçer.\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr ""
+#~ "--- Çýkmak için `\\[geçmiþ-düðüm]' ya da `\\[kaldýrýlan-düðüm]' kullanýn "
+#~ "---\n"
+
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr ""
+#~ "\\%-10[move-to-prev-xref]  Bu düðüm içinde önceki yardýmlý metin linkine "
+#~ "[*] atlar.\n"
+
+#~ msgid ""
+#~ "[*]    Command acts within this node or the entire document, depending "
+#~ "on\n"
+#~ "the value of cursor-movement-scrolls variable\n"
+#~ msgstr ""
+#~ "[*]    Ýmleç hareketi, metin kaydýrma deðiþkeni deðerine baðlý olarak\n"
+#~ "komut bu düðüm ya da tüm belgede etki yaratýr\n"
+
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "Kullaným: %s [SEÇENEK]... [MENÜ-ÖÐESÝ...]\n"
+#~ "\n"
+#~ "Info biçeminde belge okur\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "      --apropos=DÝZGE          DÝZGE'yi tüm elkitaplarýnýn tüm "
+#~ "indislerinde ara.\n"
+#~ "  -d, --directory=DIR          DIR'ý INFOPATH'a ekle.\n"
+#~ "      --dribble=DOSYAADI       DOSYAADI'ndaki kullanýcý tuþbasýmlarýný "
+#~ "anýmsa.\n"
+#~ "  -f, --file=DOSYAADI          uðranacak Info dosyasýný belirle.\n"
+#~ "  -h, --help                   bu yardýmý görüntüle ve çýk.\n"
+#~ "      --index-search=DÝZGE     DÝZGE indeks giriþince iþaret edilen "
+#~ "düðüme git.\n"
+#~ "  -n, --node=DÜÐÜMADI          ilk uðranan Info dosyasýndaki düðümleri "
+#~ "belirle.\n"
+#~ "  -o, --output=DOSYAADI        seçili düðümleri DOSYAADI'na çýkar.\n"
+#~ "  -R, --raw-escapes            \"ham\" ANSI kaçýþlarýný (esc) çýkar "
+#~ "(öntanýmlý).\n"
+#~ "      --no-raw-escapes         kaçýþlarý (esc) metin olarak çýkar.\n"
+#~ "      --restore=DOSYAADI       ilk tuþ vuruþlarýný DOSYAADI'ndan oku.\n"
+#~ "  -O, --show-options, --usage  komut-satýrý seçenekler düðümüne git.\n"
+#~ "%s      --subnodes               menü öðelerini özyinelemeli çýkar.\n"
+#~ "  -w, --where, --location      Info dosyasýnýn fiziksel konumunu yazdýr.\n"
+#~ "      --vi-keys                vi ve less benzeri tuþ baðlayýcýlarý "
+#~ "kullan.\n"
+#~ "      --version                sürüm bilgisini göster ve çýk.\n"
+#~ "\n"
+#~ "Eðer mevcutsa, ilk seçenek-olmayan argüman, baþlanacak menü giriþidir;\n"
+#~ "INFOPATH boyunca tüm `dir' dosyalarýnda aranýr.\n"
+#~ "Mevcut deðilse, info tüm `dir' dosyalarýný birleþtirip sonucu gösterir.\n"
+#~ "Kalan tüm argümanlar, ilk uðranan düðüme göreceli olarak\n"
+#~ "menü öðesi adlarý muamelesi görür.\n"
+#~ "\n"
+#~ "Örnekler:\n"
+#~ "  info                       üst-düzey dir menüsünü göster\n"
+#~ "  info emacs                 üst-düzey dir'den emacs düðümünde baþla\n"
+#~ "  info emacs buffers         emacs klavuzu içindeki tampon düðümden "
+#~ "baþla\n"
+#~ "  info --show-options emacs  emacs'ýn komut satýrý seçenekleri olan "
+#~ "düðümden baþla\n"
+#~ "  info --subnodes -o out.txt emacs  tüm el kitabýný out.txt'e yönlendir\n"
+#~ "  info -f ./foo.info         dir'i aramadan ./foo.info dosyasýný göster\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr ""
+#~ "              Diðer düðümün seçilmesine sebep olan bir menü öðesini "
+#~ "seçiyor.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "              (DOSYAÝSMÝ)DÜÐÜMÝSMÝ þeklinde bir dosyayý dahil "
+#~ "edebilirsiniz.\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "              ve bulunan sonraki oluþumdaki düðümü seçer.\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "Sonraki düðümü izliyor..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "Ýlk menü öðesi seçiliyor..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "Sonraki düðüm seçiliyor..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "%d kez Yukarý gidip, Sonrakine geçiliyor."
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "Bu pencerede Öncekine gidiliyor."
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "Bu pencere içinde Yukarýya gidiliyor."
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "`Önceki'nin son menü öðesine gidiliyor."
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "Ýþlev"
+
+#~ msgid "Macro"
+#~ msgstr "Makro"
+
+#~ msgid "Special Form"
+#~ msgstr "Özel Form"
+
+#~ msgid "Variable"
+#~ msgstr "Deðiþken"
+
+#~ msgid "User Option"
+#~ msgstr "Kullanýcý Seçeneði"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Durum Deðiþkeni"
+
+#~ msgid "Method"
+#~ msgstr "Yöntem"
+
+#~ msgid "Untitled"
+#~ msgstr "Adsýz"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "Bu %1$s, makeinfo sürümü %2$s tarafýndan, %3$s'den üretilmiþtir.\n"
+
+#~ msgid "Next:"
+#~ msgstr "Sonraki:"
+
+#~ msgid "Previous:"
+#~ msgstr "Önceki:"
+
+#~ msgid "Up:"
+#~ msgstr "Yukarý:"
 
-#~ msgid "%s is an invalid ISO code, using %c"
-#~ msgstr "%s geçersiz bir ISO kodu, %c kullanýlýyor"
+#~ msgid "Menu"
+#~ msgstr "Menü"
 
-#~ msgid "Cannot specify more than one macro expansion output"
-#~ msgstr "Birden fazla makro geniþleme çýktýsý belirtilemez"
+#~ msgid "Cross"
+#~ msgstr "Çapraz"
 
-#~ msgid "File exists, but is not a directory"
-#~ msgstr "Dosya mevcut, ancak bir dizin deðil"
+#~ msgid "Prev"
+#~ msgstr "Önceki"
 
-#~ msgid "First argument to cross-reference may not be empty"
-#~ msgstr "Çapraz baþvuru kurulacak ilk argüman boþ olmayabilir"
+#~ msgid "Up"
+#~ msgstr "Yukarý"
 
 #~ msgid "see "
 #~ msgstr "bkz "
 
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "`.' ya da `,' çapraz baþvuruyu izlemelidir, %c'yi deðil"
-
-#~ msgid "First argument to @inforef may not be empty"
-#~ msgstr "@inforef'e ilk argüman boþ olmayabilir"
-
-#~ msgid "Node:"
-#~ msgstr "Düðüm:"
-
-#~ msgid "%s: TOC should be here, but it was not found"
-#~ msgstr "%s: Ýçindekiler burada olmalýydý, ama bulunamadý"
-
-#~ msgid "%s: Specify the Info directory only once.\n"
-#~ msgstr "%s: Info dizinini yalnýzca bir kez belirtin.\n"
+#~ msgid "See section ``%s'' in "
+#~ msgstr "``%s'' bölümüne bakýnýz:"
+
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "Kullaným: %s [SEÇENEK]... [INFO-DOSYASI [DIR-DOSYASI]]\n"
+#~ "\n"
+#~ "Info dizin dosyasý DIR-DOSYASI içindeki INFO-DOSYASI'ndan dizin "
+#~ "girdilerini\n"
+#~ "kurar ya da siler.\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ " --debug           yapýlmakta olanlarý rapor eder.\n"
+#~ " --delete          INFO-DOSYASI için mevcut girdileri DIR-DOSYASI'ndan "
+#~ "siler;\n"
+#~ "                     yeni girdi eklemez.\n"
+#~ " --dir-file=ÝSÝM   Info dizin dosyasýnýn adýný belirler.\n"
+#~ "                     Bu, DIR-DOSYASI argümanýný kullanmaya eþdeðerdir.\n"
+#~ " --entry=METÝN     METÝN'i bir Info dizin girdisi olarak ekler.\n"
+#~ "                     METÝN, bir Info öðe satýrý þeklinde olmalý\n"
+#~ "                     artý, boþlukla baþlayan sýfýr ya da daha çok "
+#~ "fazladan satýrý bulunmalýdýr.\n"
+#~ "                     Birden fazla girdi belirtirseniz hepsi eklenir.\n"
+#~ "                     Hiç girdi belirtmezseniz, (girdiler) Info "
+#~ "dosyasýndaki bilgiden\n"
+#~ "                     belirlenir.\n"
+#~ " --help            bu yardýmý görüntüler ve çýkar.\n"
+#~ " --info-file=DOSYA dizine kurulacak Info dosyasýný belirler.\n"
+#~ "                     Bu, INFO-DOSYASI argümanýný kullanmaya eþdeðerdir.\n"
+#~ " --info-dir=DIR    --dir-file=DIR/dir ile ayný.\n"
+#~ " --item=METÝN      --entry METÝN ile ayný.\n"
+#~ "                     Bir Info dizin girdisi, gerçekte bir menü öðesidir.\n"
+#~ " --quiet           uyarýlarý baskýlar.\n"
+#~ " --remove          --delete ile ayný.\n"
+#~ " --remove-exactly  yalnýzca info dosya adý tam olarak uyarsa sil;\n"
+#~ "                     .info ve/veya .gz sonekleri yok sayýlmaz.\n"
+#~ " --section=KIS     bu dosyanýn girdilerini dizinin KIS bölümüne koyar.\n"
+#~ "                     Bir bölümden fazlasýný belirtirseniz, tüm girdiler\n"
+#~ "                     herbir bölüme eklenir.\n"
+#~ "                     Hiçbir bölüm belirtmezseniz, (bölümler) Info "
+#~ "dosyasýndaki bilgiden\n"
+#~ "                     belirlenir.\n"
+#~ " --section-regex=R mevcut olmayan bir bölüme bir girdi eklenirse,\n"
+#~ "                     (ve büyük/küçük harf yok sayarak) yeni bir bölüme "
+#~ "baþlamadan önce\n"
+#~ "                     temel tüzenli ifade R'ye uyan bir bölüm arar.\n"
+#~ " --test            DIR-DOSYASInýn güncellenmesini baskýlar.\n"
+#~ " --silent          uyarýlarý baskýlar.\n"
+#~ " --version           sürüm bilgisini görüntüler ve çýkar.\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "`%2$s' dosyasý için menü öðesi `%1$s' zaten mevcut"
diff --git a/Build/source/utils/texinfo/po/vi.gmo b/Build/source/utils/texinfo/po/vi.gmo
new file mode 100644
index 00000000000..1a2a0369174
--- /dev/null
+++ b/Build/source/utils/texinfo/po/vi.gmo
diff --git a/Build/source/utils/texinfo/po/vi.po b/Build/source/utils/texinfo/po/vi.po
new file mode 100644
index 00000000000..3e587ebe185
--- /dev/null
+++ b/Build/source/utils/texinfo/po/vi.po
@@ -0,0 +1,3220 @@
+# Vietnamese translation for TexInfo.
+# Copyright © 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the texinfo-4.11.93 package.
+# Clytie Siddall <clytie@riverland.net.au>, 2006-2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: texinfo 4.11.93\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
+"PO-Revision-Date: 2008-03-10 18:13+1030\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.7b3\n"
+
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr "Lỗi hệ thống không rõ"
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: tùy ch�n « %s » là mơ hồ\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: tùy ch�n « --%s » không cho phép đối số\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: tùy ch�n « %c%s » không cho phép đối số\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: tùy ch�n « %s » cần đến đối số\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: không nhận ra tùy ch�n « --%s »\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: không nhận ra tùy ch�n « %c%s »\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: không cho phép tùy ch�n « -- %c »\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: tùy ch�n không hợp lệ « -- %c »\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: tùy ch�n cần đến đối số « -- %c »\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: tùy ch�n « -W %s » là mơ hồ\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: tùy ch�n « -W %s » không cho phép đối số\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "hết bộ nhớ hoàn toàn"
+
+#: info/echo-area.c:283 info/session.c:735
+msgid "Move forward a character"
+msgstr "Tiếp một ký tự"
+
+#: info/echo-area.c:295 info/session.c:767
+msgid "Move backward a character"
+msgstr "Lùi một ký tự"
+
+#: info/echo-area.c:307
+msgid "Move to the start of this line"
+msgstr "V� đầu dòng này"
+
+#: info/echo-area.c:312
+msgid "Move to the end of this line"
+msgstr "Tới cuối dòng này"
+
+#: info/echo-area.c:320 info/session.c:808
+msgid "Move forward a word"
+msgstr "Tiếp một từ"
+
+#: info/echo-area.c:360 info/session.c:881
+msgid "Move backward a word"
+msgstr "Lùi một từ"
+
+#: info/echo-area.c:400
+msgid "Delete the character under the cursor"
+msgstr "Xóa ký tự dưới con tr�"
+
+#: info/echo-area.c:430
+msgid "Delete the character behind the cursor"
+msgstr "Xóa ký tự ở sau con tr�"
+
+#: info/echo-area.c:451
+msgid "Cancel or quit operation"
+msgstr "Thao tác thôi hay thoát"
+
+#: info/echo-area.c:466
+msgid "Accept (or force completion of) this line"
+msgstr "Chấp nhận (hoặc buộc kết thúc) dòng này"
+
+#: info/echo-area.c:471
+msgid "Insert next character verbatim"
+msgstr "Chèn ký tự kế tiếp đúng nguyên văn"
+
+#: info/echo-area.c:479
+msgid "Insert this character"
+msgstr "Chèn ký tự này"
+
+#: info/echo-area.c:497
+msgid "Insert a TAB character"
+msgstr "Chèn ký tự TAB"
+
+#: info/echo-area.c:504
+msgid "Transpose characters at point"
+msgstr "�ổi chỗ hai ký tự tại điểm"
+
+#: info/echo-area.c:555
+msgid "Yank back the contents of the last kill"
+msgstr "Lấy lại nội dung của thao tác giết cuối cùng"
+
+#: info/echo-area.c:562
+msgid "Kill ring is empty"
+msgstr "Vòng giết rỗng"
+
+#: info/echo-area.c:575
+msgid "Yank back a previous kill"
+msgstr "Lấy lại một thao tác giết trước"
+
+#: info/echo-area.c:608
+msgid "Kill to the end of the line"
+msgstr "Giết đến cuối dòng"
+
+#: info/echo-area.c:621
+msgid "Kill to the beginning of the line"
+msgstr "Giết v� đầu dòng"
+
+#: info/echo-area.c:633
+msgid "Kill the word following the cursor"
+msgstr "Giết từ nằm sau con tr�"
+
+#: info/echo-area.c:652
+msgid "Kill the word preceding the cursor"
+msgstr "Giết từ nằm trước con tr�"
+
+#: info/echo-area.c:867 info/echo-area.c:923
+msgid "No completions"
+msgstr "Không có sự gõ xong"
+
+#: info/echo-area.c:869
+msgid "Not complete"
+msgstr "ChÆ°a xong"
+
+#: info/echo-area.c:910
+msgid "List possible completions"
+msgstr "Liệt kê các sự gõ xong có thể"
+
+#: info/echo-area.c:927
+msgid "Sole completion"
+msgstr "Sự gõ xong duy nhất"
+
+#: info/echo-area.c:936
+msgid "One completion:\n"
+msgstr "Một sự gõ xong:\n"
+
+#: info/echo-area.c:937
+#, c-format
+msgid "%d completions:\n"
+msgstr "%d sự gõ xong:\n"
+
+#: info/echo-area.c:1084
+msgid "Insert completion"
+msgstr "Chèn sự gõ xong"
+
+#: info/echo-area.c:1219
+msgid "Building completions..."
+msgstr "�ang xây dựng các sự gõ xong..."
+
+#: info/echo-area.c:1339
+msgid "Scroll the completions window"
+msgstr "Cuộn cửa sổ gõ xong"
+
+#: info/footnotes.c:212
+msgid "Footnotes could not be displayed"
+msgstr "Không thể hiển thị cước chú"
+
+#: info/footnotes.c:238
+msgid "Show the footnotes associated with this node in another window"
+msgstr ""
+"Hiển thị các cước chú liên quan đến nút thông tin này trong cửa sổ khác"
+
+#: info/footnotes.h:26
+msgid "---------- Footnotes ----------"
+msgstr "���Cước chú���"
+
+#: info/indices.c:171
+msgid "Look up a string in the index for this file"
+msgstr "Tra tìm chuỗi trong chỉ mục cho tập tin này"
+
+#: info/indices.c:198
+msgid "Finding index entries..."
+msgstr "�ang tìm mục nhập chỉ mục..."
+
+#: info/indices.c:206
+msgid "No indices found."
+msgstr "Không tìm thấy chỉ mục."
+
+#: info/indices.c:216
+msgid "Index entry: "
+msgstr "Mục nhập chỉ mục: "
+
+#: info/indices.c:324
+msgid ""
+"Go to the next matching index item from the last `\\[index-search]' command"
+msgstr ""
+"Tới mục chỉ mục khớp kế tiếp từ lệnh «[index-search]» (tìm kiếm chỉ mục) cuối "
+"cùng."
+
+#: info/indices.c:334
+msgid "No previous index search string."
+msgstr "Không có chuỗi tìm kiếm chỉ mục trước"
+
+#: info/indices.c:341
+msgid "No index entries."
+msgstr "Không có gì trong chỉ mục."
+
+#: info/indices.c:374
+#, c-format
+msgid "No %sindex entries containing `%s'."
+msgstr "Không c� gì trong chỉ mục %s chứa « %s »."
+
+#: info/indices.c:375
+msgid "more "
+msgstr "thêm "
+
+#: info/indices.c:385
+msgid "CAN'T SEE THIS"
+msgstr "KHÔNG THỂ THẤY �IỀU NÀY"
+
+#: info/indices.c:421
+#, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr ""
+"Tìm thấy « %s » trong %s. (« \\[next-index-match] » thử tìm đi�u kế tiếp.)"
+
+# Type: text
+# Description
+#: info/indices.c:549
+#, c-format
+msgid "Scanning indices of `%s'..."
+msgstr "�ang quét các chỉ mục của « %s »..."
+
+#: info/indices.c:604
+#, c-format
+msgid "No available info files have `%s' in their indices."
+msgstr "Không có tập tin thông tin sẵn sàng chứa « %s » trong chỉ mục ."
+
+#: info/indices.c:630
+msgid "Grovel all known info file's indices for a string and build a menu"
+msgstr ""
+"Grovel m�i chỉ mục của tập tin thông tin (info) tìm chuỗi và xây dựng trình "
+"Ä‘Æ¡n"
+
+#: info/indices.c:634
+msgid "Index apropos: "
+msgstr "Chỉ mục apropos: "
+
+#: info/indices.c:662
+#, c-format
+msgid ""
+"\n"
+"* Menu: Nodes whose indices contain `%s':\n"
+msgstr ""
+"\n"
+"* Trình đơn: nút có chỉ mục chứa « %s »:\n"
+
+#: info/info.c:273 info/infokey.c:899
+#, c-format
+msgid "Try --help for more information.\n"
+msgstr "Hãy thử lệnh trợ giúp « --help » để xem thông tin thêm.\n"
+
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Tác quy�n © %s Tổ chức Phần m�m Tự do.\n"
+"Giấy phép GPL pb3+: Giấy phép Công cộng GNU phiên bản 3 và sau:\n"
+"<http://gnu.org/licenses/gpl.html>\n"
+"�ây là phần m�m tự do : bạn có quy�n thay đổi và phát hành lại nó.\n"
+"KHÔNG CÓ BẢO HÀNH GÌ CẢ, với đi�u kiện được pháp luật cho phép\n"
+
+#: info/info.c:504
+#, c-format
+msgid "no index entries found for `%s'\n"
+msgstr "không tìm thấy gì trong chỉ mục cho « %s »\n"
+
+#: info/info.c:598
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [MENU-ITEM...]\n"
+"\n"
+"Read documentation in Info format.\n"
+msgstr ""
+"Sử dụng: %s [TÙY_CHỌN]... [MỤC_TRÌNH_�ƠN...]\n"
+"\n"
+"��c tài liệu hướng dẫn theo định dạng Info.\n"
+
+#: info/info.c:604
+msgid ""
+"Options:\n"
+"  -k, --apropos=STRING         look up STRING in all indices of all "
+"manuals.\n"
+"  -d, --directory=DIR          add DIR to INFOPATH.\n"
+"      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+"Tùy ch�n:\n"
+"  -k, --apropos=CHUỖI         tra cứu chuỗi này trong m�i chỉ mục của m�i sổ "
+"tay.\n"
+"  -d, --directory=THƯ_MỤC          thêm thư mục này vào đư�ng dẫn INFOPATH.\n"
+"      --dribble=TẬP_TIN       lưu các cú bấm phím vào tập tin này.\n"
+"  -f, --file=TẬP_TIN          ghi rõ tập tin Info cần thăm."
+
+#: info/info.c:611
+msgid ""
+"  -h, --help                   display this help and exit.\n"
+"      --index-search=STRING    go to node pointed by index entry STRING.\n"
+"  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+"  -h, --help                   hiển thị trợ giúp này rồi thoát.\n"
+"      --index-search=CHUỖI    đi tới nút được ngụ ý bởi chuỗi chỉ mục này.\n"
+"  -n, --node=TÊN_NÚT          ghi rõ nút trong tập tin Info được thăm đầu "
+"tiên.\n"
+"  -o, --output=TẬP_TIN        xuất các nút đã ch�n vào tập tin này."
+
+#: info/info.c:617
+msgid ""
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
+"      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+"  -R, --raw-escapes            xuất các ký tự thoát ANSI « thô » (mặc định)\n"
+"      --no-raw-escapes        xuất các ký tự thoát dạng văn bản nghĩa chữ.\n"
+"      --restore=TẬP_TIN       đ�c các cú bấm phím đầu tiên từ tập tin này.\n"
+"  -O, --show-options, --usage  \tđi tới nút chứa các tùy ch�n dòng lệnh."
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+"  -b, --speech-friendly        thân thiện với thiết bị tổng hợp tiếng nói"
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
+"      --vi-keys                use vi-like and less-like key bindings.\n"
+"      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+"      --subnodes               xuất đệ quy các mục trình đơn.\n"
+"      --vi-keys                dùng các tổ hợp phím kiểu Vi và Less.\n"
+"      --version                hiển thị thông tin phiên bản rồi thoát\n"
+"  -w, --where, --location      in vị trí vật lý của tập tin Info."
+
+#: info/info.c:634
+msgid ""
+"\n"
+"The first non-option argument, if present, is the menu entry to start from;\n"
+"it is searched for in all `dir' files along INFOPATH.\n"
+"If it is not present, info merges all `dir' files and shows the result.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items relative to the initial node visited."
+msgstr ""
+"\n"
+"�ối số đầu tiên không phải tùy ch�n, nếu có, là mục trình đơn từ đó cần bắt "
+"đầu ;\n"
+"có tìm nó trong m�i tập tin « dir » (thư mục) trên đư�ng dẫn INFOPATH.\n"
+"Không có thì Info trộn tất cả các tập tin « dir » rồi hiển thị kết quả.\n"
+"Bất cứ đối số còn lại nào được xử lý như tên của mục trình đơn\n"
+"tương đối với nút đầu tiên được thăm."
+
+#: info/info.c:641
+msgid ""
+"\n"
+"Examples:\n"
+"  info                       show top-level dir menu\n"
+"  info emacs                 start at emacs node from top-level dir\n"
+"  info emacs buffers         start at buffers node within emacs manual\n"
+"  info --show-options emacs  start at node with emacs' command line options\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
+msgstr ""
+"\n"
+"Ví dụ :\n"
+"  info                       hiển thị trình đơn thư mục cấp đầu\n"
+"  info emacs                 bắt đầu ở nút emacs từ thư mục cấp đầu\n"
+"  info emacs buffers         bắt đầu ở nút bộ đệm bên trong sổ tay emacs\n"
+"  info --show-options emacs  bắt đầu ở nút chứa các tùy ch�n dòng lệnh của "
+"emacs\n"
+"  info --subnodes -o out.txt emacs  đổ toàn bộ sổ tay vào tập tin « out.txt "
+"»\n"
+"  info -f ./foo.info         hiển thị tập tin « ./foo.info », không tìm kiếm "
+"thư mục"
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
+msgid ""
+"\n"
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Hãy thông báo lỗi cho <bug-texinfo@gnu.org>,\n"
+"và gửi câu h�i chung, thảo luận v.v. cho <help-texinfo@gnu.org>.\n"
+"Trang chủ texinfo: <http://www.gnu.org/software/texinfo/>."
+
+#: info/info.c:684
+#, c-format
+msgid "Cannot find node `%s'."
+msgstr "Không tìm thấy nút thông tin « %s »."
+
+#: info/info.c:685
+#, c-format
+msgid "Cannot find node `(%s)%s'."
+msgstr "Không tìm thấy nút thông tin « (%s)%s »."
+
+#: info/info.c:686
+msgid "Cannot find a window!"
+msgstr "Không tìm thấy cửa sổ."
+
+#: info/info.c:687
+msgid "Point doesn't appear within this window's node!"
+msgstr "�iểm không xuất hiện bên trong cái nút thông tin của cửa sổ này."
+
+#: info/info.c:688
+msgid "Cannot delete the last window."
+msgstr "Không thể xóa cửa sổ cuối cùng."
+
+#: info/info.c:689
+msgid "No menu in this node."
+msgstr "Không có trình đơn trong nút thông tin này."
+
+#: info/info.c:690
+msgid "No footnotes in this node."
+msgstr "Không có cước chú trong nút thông tin này."
+
+#: info/info.c:691
+msgid "No cross references in this node."
+msgstr "Không có tham chiếu chéo trong nút thông tin này."
+
+#: info/info.c:692
+#, c-format
+msgid "No `%s' pointer for this node."
+msgstr "Không có con tr� « %s » cho nút thông tin này."
+
+#: info/info.c:693
+#, c-format
+msgid "Unknown Info command `%c'; try `?' for help."
+msgstr "Không nhận ra lệnh Info « %c »: hãy thử lệnh « ? » để xem trợ giúp."
+
+#: info/info.c:694
+#, c-format
+msgid "Terminal type `%s' is not smart enough to run Info."
+msgstr "Thiết bị cuối kiểu « %s » không đủ khéo để chạy Info."
+
+#: info/info.c:695
+msgid "You are already at the last page of this node."
+msgstr "Bạn ở trang cuối cùng của nút thông tin này."
+
+#: info/info.c:696
+msgid "You are already at the first page of this node."
+msgstr "Bạn ở trang đầu tiên của nút thông tin này."
+
+#: info/info.c:697
+msgid "Only one window."
+msgstr "Chỉ một cửa sổ."
+
+#: info/info.c:698
+msgid "Resulting window would be too small."
+msgstr "Cửa sổ kết quả quá nh�."
+
+#: info/info.c:699
+msgid "Not enough room for a help window, please delete a window."
+msgstr "Không đủ chỗ cho cửa sổ trợ giúp: hãy xóa một cửa sổ."
+
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
+msgstr "Phím lệnh Info cơ bản\n"
+
+#: info/infodoc.c:47
+msgid "\\%-10[quit-help]  Close this help window.\n"
+msgstr "\\%-10[quit-help]  �óng cửa sổ trợ giúp này.\n"
+
+#: info/infodoc.c:48
+msgid "\\%-10[quit]  Quit Info altogether.\n"
+msgstr "\\%-10[quit]  Thoát hoàn toàn khởi info (_thoát_).\n"
+
+#: info/infodoc.c:49
+msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
+msgstr ""
+"\\%-10[get-info-help-node]  g�i trợ lý hướng dẫn Info.\n"
+"\t\t\t(_lấy nút trợ giúp Info_)\n"
+
+#: info/infodoc.c:51
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "\\%-10[prev-line]  �i lên một dòng.\n"
+
+#: info/infodoc.c:52
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "\\%-10[next-line]  �i xuống một dòng.\n"
+
+#: info/infodoc.c:53
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Cuộn lùi 1 màn hình.\n"
+
+#: info/infodoc.c:54
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  Cuộn tới 1 màn hình.\n"
+
+#: info/infodoc.c:55
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  V� đầu của nút này (_đầu của nút_).\n"
+
+#: info/infodoc.c:56
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Tới cuối của nút này (_cuối của nút_).\n"
+
+#: info/infodoc.c:58
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr "\\%-10[move-to-next-xref]  Nhảy tới siêu liên kết kế tiếp.\n"
+
+#: info/infodoc.c:59
+msgid ""
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr ""
+"\\%-10[select-reference-this-line]  Theo siêu liên kết nằm dưới con tr�.\n"
+
+#: info/infodoc.c:60
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
+msgstr ""
+"\\%-10[history-node]  Trở v� nút cuối cùng được xem trong cửa sổ này.\n"
+
+#: info/infodoc.c:62
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[global-prev-node]  �i v� nút trước trong tài liệu.\n"
+
+#: info/infodoc.c:63
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[global-next-node]  �i tới nút kế tiếp trong tài liệu.\n"
+
+#: info/infodoc.c:64
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  �i v� nút trước ở cấp này.\n"
+
+#: info/infodoc.c:65
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  �i tới nút kế tiếp ở cấp này.\n"
+
+#: info/infodoc.c:66
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  �i lên một cấp.\n"
+
+#: info/infodoc.c:67
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[top-node]  �i tới nút đầu của tài liệu này.\n"
+
+#: info/infodoc.c:68
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[dir-node]  �i tới nút « directory » (thư mục) chính.\n"
+
+#: info/infodoc.c:70
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr ""
+"1...9       Ch�n cả mục thứ nhất đến thứ chín trong trình đơn của nút này.\n"
+
+#: info/infodoc.c:71
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Ch�n mục cuối trong trình đơn của nút này.\n"
+
+#: info/infodoc.c:72
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "\\%-10[menu-item]  Ch�n một mục trình đơn xác định theo tên.\n"
+
+#: info/infodoc.c:73
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "\\%-10[xref-item]  Theo một tham chiếu chéo xác định theo tên.\n"
+
+#: info/infodoc.c:74
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "\\%-10[goto-node]  �i tới một nút xác định theo tên.\n"
+
+#: info/infodoc.c:76
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "\\%-10[search]  �i tới tìm một chuỗi đã ghi rõ.\n"
+
+#: info/infodoc.c:77
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[search-previous]  Tìm lần gặp trước.\n"
+
+#: info/infodoc.c:78
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "\\%-10[search-next]  Tìm lần gặp kế tiếp.\n"
+
+#: info/infodoc.c:79
+msgid ""
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
+msgstr ""
+"\\%-10[index-search]  Trong chỉ mục, tìm một chuỗi đã ghi rõ,\n"
+"và ch�n nút được tham chiếu bởi mục nhập đầu tiên được tìm.\n"
+
+#: info/infodoc.c:81
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "\\%-10[abort-key]  Hủy b� thao tác đang chạy.\n"
+
+#: info/infodoc.c:89
+msgid ""
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr ""
+"Lệnh Cơ bản trong Cửa sổ Info\n"
+"�������������\n"
+
+#: info/infodoc.c:92
+#, c-format
+msgid "  %-10s  Quit this help.\n"
+msgstr "  %-10s  Thoát kh�i trợ giúp này.\n"
+
+#: info/infodoc.c:93
+#, c-format
+msgid "  %-10s  Quit Info altogether.\n"
+msgstr "  %-10s  Thoát hoàn toàn Info.\n"
+
+#: info/infodoc.c:94
+#, c-format
+msgid "  %-10s  Invoke the Info tutorial.\n"
+msgstr "  %-10s  G�i trợ lý hướng dẫn Info.\n"
+
+#: info/infodoc.c:98
+#, c-format
+msgid "  %-10s  Move to the `next' node of this node.\n"
+msgstr "  %-10s  Tới nút « kế » của nút này.\n"
+
+#: info/infodoc.c:99
+#, c-format
+msgid "  %-10s  Move to the `previous' node of this node.\n"
+msgstr "  %-10s  V� nút « lùi » của nút này.\n"
+
+#: info/infodoc.c:100
+#, c-format
+msgid "  %-10s  Move `up' from this node.\n"
+msgstr "  %-10s  Chuyển « lên » từ nút này.\n"
+
+#: info/infodoc.c:101
+#, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"  %-10s  Ch�n một mục trình đơn xác định theo tên.\n"
+"Việc ch�n một mục trình đơn thì gây ra ch�n một nút khác.\n"
+
+#: info/infodoc.c:103
+#, c-format
+msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
+msgstr "  %-10s  Theo một tham chiếu chéo. ��c tên tham chiếu.\n"
+
+#: info/infodoc.c:104
+#, c-format
+msgid "  %-10s  Move to the last node seen in this window.\n"
+msgstr "  %-10s  Tới nút cuối hiển thị trong cửa sổ này.\n"
+
+#: info/infodoc.c:105
+#, c-format
+msgid "  %-10s  Skip to next hypertext link within this node.\n"
+msgstr "  %-10s  Nhảy tới liên kết siêu văn bản kế tiếp bên trong nút này.\n"
+
+#: info/infodoc.c:106
+#, c-format
+msgid "  %-10s  Follow the hypertext link under cursor.\n"
+msgstr "  %-10s  Theo liên kết siêu văn bản nằm dưới con tr�.\n"
+
+#: info/infodoc.c:107
+#, c-format
+msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
+msgstr "  %-10s  Tới nút « thư mục ». Bằng « g (THƯ_MỤC) ».\n"
+
+#: info/infodoc.c:108
+#, c-format
+msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
+msgstr "  %-10s  Tới nút �ầu. Bằng « g Trên ».\n"
+
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Di chuyển bên trong nút thông tin:\n"
+"�������\n"
+
+#: info/infodoc.c:112
+#, c-format
+msgid "  %-10s  Scroll forward a page.\n"
+msgstr "  %-10s  Cuá»™n tá»›i 1 trang.\n"
+
+#: info/infodoc.c:113
+#, c-format
+msgid "  %-10s  Scroll backward a page.\n"
+msgstr "  %-10s  Cuộn lùi 1 trang.\n"
+
+#: info/infodoc.c:114
+#, c-format
+msgid "  %-10s  Go to the beginning of this node.\n"
+msgstr "  %-10s  V� đầu nút này.\n"
+
+#: info/infodoc.c:115
+#, c-format
+msgid "  %-10s  Go to the end of this node.\n"
+msgstr "  %-10s  Tới cuối nút này.\n"
+
+#: info/infodoc.c:116
+#, c-format
+msgid "  %-10s  Scroll forward 1 line.\n"
+msgstr "  %-10s  Cuộn tới 1 dòng.\n"
+
+#: info/infodoc.c:117
+#, c-format
+msgid "  %-10s  Scroll backward 1 line.\n"
+msgstr "  %-10s  Cuộn lùi 1 dòng.\n"
+
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Lệnh khác:\n"
+"����\n"
+
+#: info/infodoc.c:121
+#, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
+msgstr "  %-10s  Ch�n cả mục thứ nhất đến thứ chín trong trình đơn của nút.\n"
+
+#: info/infodoc.c:122
+#, c-format
+msgid "  %-10s  Pick last item in node's menu.\n"
+msgstr "  %-10s  Ch�n mục cuối trong trình đơn của nút.\n"
+
+#: info/infodoc.c:125
+#, c-format
+msgid ""
+"  %-10s  Search for a specified string in the index entries of this Info\n"
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"  %-10s  Tìm kiếm chuỗi đã xác định trong các mục chỉ mục\n"
+"\tcủa nút Info này, cũng ch�n nút tới đó mục đầu đã tìm có chỉ.\n"
+
+#: info/infodoc.c:127
+#, c-format
+msgid ""
+"  %-10s  Move to node specified by name.\n"
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"  %-10s  �i tới nút xác định theo tên.\n"
+"Bạn cũng có thể ghi rõ tên tập tin, v.d. « (TÊN_TẬP_TIN)TÊN_NÚT ».\n"
+
+#: info/infodoc.c:129
+#, c-format
+msgid ""
+"  %-10s  Search forward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"  %-10s  Tìm kiếm tới chuỗi đã xác định trong các mục chỉ mục\n"
+"\tcủa nút Info này, cũng ch�n nút trong đó tìm mục tương ứng kế tiếp.\n"
+
+#: info/infodoc.c:131
+#, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"  %-10s  �i ngược tìm một chuỗi đã ghi rõ,\n"
+"và ch�n nút ở đó gặp lần tìm kế tiếp.\n"
+
+#: info/infodoc.c:312
+msgid "The current search path is:\n"
+msgstr "�ư�ng dẫn tìm kiếm hiện th�i:\n"
+
+#: info/infodoc.c:316
+msgid ""
+"Commands available in Info windows:\n"
+"\n"
+msgstr ""
+"Các lệnh sẵn sàng trong cửa sổ Info:\n"
+"\n"
+
+#: info/infodoc.c:320
+msgid ""
+"Commands available in the echo area:\n"
+"\n"
+msgstr ""
+"Các lệnh sẵn sàng trong vùng phản hồi:\n"
+"\n"
+
+#: info/infodoc.c:343
+#, c-format
+msgid ""
+"The following commands can only be invoked via %s:\n"
+"\n"
+msgstr ""
+"Theo đây có những lệnh có thể được g�i chỉ bằng %s:\n"
+"\n"
+
+#: info/infodoc.c:347
+msgid ""
+"The following commands cannot be invoked at all:\n"
+"\n"
+msgstr "Theo đây có những lệnh không thể g�i:\n"
+
+#: info/infodoc.c:477
+msgid "Display help message"
+msgstr "Hiển thị thông điệp trợ giúp"
+
+#: info/infodoc.c:495
+msgid "Visit Info node `(info)Help'"
+msgstr "Xem nút Info « (info)Help »"
+
+#: info/infodoc.c:633
+msgid "Print documentation for KEY"
+msgstr "In ra tài liệu hướng dẫn cho KHÓA"
+
+#: info/infodoc.c:645
+#, c-format
+msgid "Describe key: %s"
+msgstr "Diễn tả khoá: %s"
+
+#: info/infodoc.c:656
+#, c-format
+msgid "ESC %s is undefined."
+msgstr "Chưa định nghĩa ESC %s."
+
+#: info/infodoc.c:672 info/infodoc.c:701
+#, c-format
+msgid "%s is undefined."
+msgstr "Chưa định nghĩa %s."
+
+#: info/infodoc.c:722
+#, c-format
+msgid "%s is defined to %s."
+msgstr "%s đã được định nghĩa thành %s."
+
+#: info/infodoc.c:1145
+msgid "Show what to type to execute a given command"
+msgstr "Hiển thị chuỗi cần gõ để thực hiện lệnh đã cho"
+
+#: info/infodoc.c:1149
+msgid "Where is command: "
+msgstr "Lệnh ở đâu : "
+
+#: info/infodoc.c:1171
+#, c-format
+msgid "`%s' is not on any keys"
+msgstr "« %s » không phải trên khoá nào"
+
+#: info/infodoc.c:1178
+#, c-format
+msgid "%s can only be invoked via %s."
+msgstr "%s có thể được g�i chỉ bằng %s."
+
+#: info/infodoc.c:1182
+#, c-format
+msgid "%s can be invoked via %s."
+msgstr "%s có thể được g�i bằng %s."
+
+#: info/infodoc.c:1187
+#, c-format
+msgid "There is no function named `%s'"
+msgstr "Không có hàm tên « %s »"
+
+#: info/infodoc.c:96
+msgid ""
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr ""
+"Ch�n các nút khác:\n"
+"�������\n"
+
+#: info/infokey.c:170
+msgid "incorrect number of arguments"
+msgstr "có số đối số không đúng"
+
+#: info/infokey.c:201
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "không thể mở tập tin nhập vào « %s »"
+
+#: info/infokey.c:215
+#, c-format
+msgid "cannot create output file `%s'"
+msgstr "không thể tạo tập tin xuất « %s »"
+
+#: info/infokey.c:226
+#, c-format
+msgid "error writing to `%s'"
+msgstr "gặp lỗi khi ghi vào « %s »"
+
+#: info/infokey.c:232
+#, c-format
+msgid "error closing output file `%s'"
+msgstr "gặp lỗi khi đóng tập tin xuất « %s »"
+
+#: info/infokey.c:450
+msgid "key sequence too long"
+msgstr "chuỗi phím quá dài"
+
+#: info/infokey.c:529
+msgid "missing key sequence"
+msgstr "thiếu chuỗi phím"
+
+#: info/infokey.c:610
+msgid "NUL character (\\000) not permitted"
+msgstr "không cho phép ký tự vô giá trị (\\000)"
+
+#: info/infokey.c:641
+#, c-format
+msgid "NUL character (^%c) not permitted"
+msgstr "không cho phép ký tự vô giá trị (^%c)"
+
+#: info/infokey.c:665
+msgid "missing action name"
+msgstr "thiếu tên hành động"
+
+#: info/infokey.c:681 info/infokey.c:756
+msgid "section too long"
+msgstr "phần quá dài"
+
+#: info/infokey.c:688
+#, c-format
+msgid "unknown action `%s'"
+msgstr "hành động lạ « %s »"
+
+#: info/infokey.c:698
+msgid "action name too long"
+msgstr "tên hành động quá dài"
+
+#: info/infokey.c:712
+#, c-format
+msgid "extra characters following action `%s'"
+msgstr "có ký tự thêm nằm sau hành động « %s »"
+
+#: info/infokey.c:723
+msgid "missing variable name"
+msgstr "thiếu tên biến"
+
+#: info/infokey.c:733
+msgid "missing `=' immediately after variable name"
+msgstr "thiếu ký tự bằng « = » ngay sau tên biến"
+
+#: info/infokey.c:741
+msgid "variable name too long"
+msgstr "tên biến quá dài"
+
+#: info/infokey.c:765
+msgid "value too long"
+msgstr "giá trị quá dài"
+
+#: info/infokey.c:890
+#, c-format
+msgid "\"%s\", line %u: "
+msgstr "« %s », dòng %u: "
+
+#: info/infokey.c:906
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INPUT-FILE]\n"
+"\n"
+"Compile infokey source file to infokey file.  Reads INPUT-FILE (default\n"
+"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n"
+"\n"
+"Options:\n"
+"  --output FILE        output to FILE instead of $HOME/.info\n"
+"  --help               display this help and exit.\n"
+"  --version            display version information and exit.\n"
+msgstr ""
+"Cách sử dụng: %s [TÙY_CHỌN]... [TTN]\n"
+"\n"
+"[TTN\t\tTập Tin Nhập vào]\n"
+"\n"
+"Biên dịch tập tin mã nguồn infokey vào tập tin infokey.  ��c tập tin nhập "
+"vào\n"
+"\t(mặc định là « $HOME/.infokey ») và ghi tập tin khoá đã biên dịch ra\n"
+"\t(theo mặc định) « $HOME/.info ».\n"
+"\n"
+"Tùy ch�n:\n"
+"  --output TẬP_TIN      \txuất ra tập tin này, thay cho « $HOME/.info »\n"
+"  --help               \t\thiển thị trợ giúp này rồi thoát.\n"
+"  --version            \t\thiển thị thông tin phiên bản rồi thoát.\n"
+
+#: info/infomap.c:955
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too small"
+msgstr "�ang b� qua tập tin infokey không hợp lệ « %s »: quá nh�"
+
+#: info/infomap.c:958
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too big"
+msgstr "�ang b� qua tập tin infokey không hợp lệ « %s »: quá lớn"
+
+#: info/infomap.c:971
+#, c-format
+msgid "Error reading infokey file `%s' - short read"
+msgstr "Gặp lỗi khi đ�c tập tin infokey « %s»: đ�c ngắn"
+
+#: info/infomap.c:990
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
+msgstr ""
+"Tập tin infokey « %s » không hợp lệ (số ma thuật sai): hãy chạy infokey để "
+"cập nhật nó"
+
+#: info/infomap.c:999
+#, c-format
+msgid "Your infokey file `%s' is out of date -- run infokey to update it"
+msgstr "Tập tin infokey « %s » của bạn quá cũ : hãy chạy infokey để cập nhật nó"
+
+#: info/infomap.c:1015
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section length) -- run infokey to update it"
+msgstr ""
+"Tập tin infokey « %s » không hợp lệ (độ dài phần sai): hãy chạy infokey để "
+"cập nhật nó"
+
+#: info/infomap.c:1036
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section code) -- run infokey to update it"
+msgstr ""
+"Tập tin infokey « %s » không hợp lệ (mã phần sai): hãy chạy infokey để cập "
+"nhật nó"
+
+#: info/infomap.c:1171
+msgid "Bad data in infokey file -- some key bindings ignored"
+msgstr "Gặp dữ liệu sai trong tập tin infokey nên b� qua một số tổ hợp phím"
+
+#: info/infomap.c:1221
+msgid "Bad data in infokey file -- some var settings ignored"
+msgstr ""
+"Gặp dữ liệu sai trong tập tin infokey nên b� qua một số cách thiết lập « var »"
+
+#: info/m-x.c:68
+msgid "Read the name of an Info command and describe it"
+msgstr "��c tên lệnh info và diễn tả nó"
+
+#: info/m-x.c:72
+msgid "Describe command: "
+msgstr "Diễn tả lệnh: "
+
+#: info/m-x.c:95
+msgid "Read a command name in the echo area and execute it"
+msgstr "��c tên lệnh trong vùng phản hồi và thực hiện nó"
+
+#: info/m-x.c:139
+msgid "Cannot execute an `echo-area' command here."
+msgstr "Không thể thực hiện lệnh « vùng phản hồi » ở đây."
+
+#: info/m-x.c:153
+#, c-format
+msgid "Undefined command: %s"
+msgstr "Lệnh chưa xác định: %s"
+
+#: info/m-x.c:159
+msgid "Set the height of the displayed window"
+msgstr "Lập độ cao của cửa sổ hiển thị"
+
+#: info/m-x.c:172
+#, c-format
+msgid "Set screen height to (%d): "
+msgstr "Lập độ cao của màn hình thành (%d): "
+
+#: info/makedoc.c:166 info/makedoc.c:174
+#, c-format
+msgid ""
+"   Source files groveled to make this file include:\n"
+"\n"
+msgstr ""
+"   Các tập tin mã nguồn đã grovel để tạo tập tin này bao gồm:\n"
+"\n"
+
+#: info/makedoc.c:556
+#, c-format
+msgid "Couldn't manipulate the file %s.\n"
+msgstr "Không thể thao tác tập tin %s.\n"
+
+#: info/nodemenu.c:30
+msgid ""
+"\n"
+"* Menu:\n"
+"  (File)Node                        Lines   Size   Containing File\n"
+"  ----------                        -----   ----   ---------------"
+msgstr ""
+"\n"
+"* Trình đơn:\n"
+"  (Tập tin)Nút                         Dòng     Cỡ       Chứa tập tin\n"
+"  �����\t\t\t\t���\t�        �����"
+
+#: info/nodemenu.c:201
+msgid ""
+"Here is the menu of nodes you have recently visited.\n"
+"Select one from this menu, or use `\\[history-node]' in another window.\n"
+msgstr ""
+"�ây là trình đơn các nút bạn vừa xem.\n"
+"Hãy ch�n một nút trong trình đơn này,\n"
+"hoặc dùng « \\[history-node] » (lược sử nút) trong cửa sổ khác.\n"
+
+#: info/nodemenu.c:223
+msgid "Make a window containing a menu of all of the currently visited nodes"
+msgstr "Tạo cửa sổ chứa trình đơn chứa các nút xem hiện th�i"
+
+#: info/nodemenu.c:303
+msgid "Select a node which has been previously visited in a visible window"
+msgstr "Ch�n nút đã xem trước, trong cửa sổ hiện rõ"
+
+#: info/nodemenu.c:316
+msgid "Select visited node: "
+msgstr "Ch�n nút đã xem: "
+
+#: info/nodemenu.c:336 info/session.c:2443
+#, c-format
+msgid "The reference disappeared! (%s)."
+msgstr "Tham chiếu đã biến mật. (%s)"
+
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr "Lỗi biểu thức chính quy: %s"
+
+#: info/session.c:164
+#, c-format
+msgid ""
+"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
+"for menu item."
+msgstr ""
+"Chúc mừng bạn dùng trình Info phiên bản %s. Hãy gõ :\n"
+"\t \\[get-help-window]\t\tđể xem trợ giúp,\n"
+"\t\\[menu-item] \t\t\tcho mục trình đơn."
+
+#: info/session.c:625
+msgid "Move down to the next line"
+msgstr "Tới dòng kế"
+
+#: info/session.c:661
+msgid "Move up to the previous line"
+msgstr "V� dòng trước"
+
+#: info/session.c:696
+msgid "Move to the end of the line"
+msgstr "Tới cuối dòng"
+
+#: info/session.c:716
+msgid "Move to the start of the line"
+msgstr "V� đầu dòng"
+
+#: info/session.c:1007
+msgid "Next"
+msgstr "Kế"
+
+#: info/session.c:1023 info/session.c:1148
+msgid "No more nodes within this document."
+msgstr "Không có nút nữa trong tài liệu này."
+
+#: info/session.c:1174
+msgid "No `Prev' for this node."
+msgstr "Không có « Lùi » cho nút này"
+
+#: info/session.c:1194
+msgid "No `Prev' or `Up' for this node within this document."
+msgstr "Không có « Lùi » hay « Lên » cho nút này trong tài liệu này."
+
+#: info/session.c:1256
+msgid "Move forwards or down through node structure"
+msgstr "Chuyển tới hay xuống qua cấu trúc nút"
+
+#: info/session.c:1272
+msgid "Move backwards or up through node structure"
+msgstr "Chuyển lùi hay lên qua cấu trúc nút"
+
+#: info/session.c:1373
+msgid "Scroll forward in this window"
+msgstr "Cuộn tới trong cửa sổ này"
+
+#: info/session.c:1381
+msgid "Scroll forward in this window and set default window size"
+msgstr "Cuộn tới trong cửa sổ này và lập kích cỡ cửa sổ mặc định"
+
+#: info/session.c:1389
+msgid "Scroll forward in this window staying within node"
+msgstr "Cuộn tới trong cửa sổ này mà còn lại trong nút này"
+
+#: info/session.c:1397
+msgid ""
+"Scroll forward in this window staying within node and set default window size"
+msgstr ""
+"Cuộn tới trong cửa sổ này, mà còn lại trong nút này và lập kích cỡ cửa sổ "
+"mặc định"
+
+#: info/session.c:1405
+msgid "Scroll backward in this window"
+msgstr "Cuộn lùi trong cửa sổ này"
+
+#: info/session.c:1413
+msgid "Scroll backward in this window and set default window size"
+msgstr "Cuộn lùi trong cửa sổ này và lập kích cỡ cửa sổ mặc định"
+
+#: info/session.c:1422
+msgid "Scroll backward in this window staying within node"
+msgstr "Cuộn lùi trong cửa sổ này, mà còn lại trong nút này"
+
+#: info/session.c:1430
+msgid ""
+"Scroll backward in this window staying within node and set default window "
+"size"
+msgstr ""
+"Cuộn lùi trong cửa sổ này, mà còn lại trong nút này và lập kích cỡ cửa sổ "
+"mặc định"
+
+#: info/session.c:1438
+msgid "Move to the start of this node"
+msgstr "V� đầu nút này"
+
+#: info/session.c:1445
+msgid "Move to the end of this node"
+msgstr "Tới cuối nút này"
+
+#: info/session.c:1452
+msgid "Scroll down by lines"
+msgstr "Cuộn xuống theo dòng"
+
+#: info/session.c:1469
+msgid "Scroll up by lines"
+msgstr "Cuộn lên theo dòng"
+
+#: info/session.c:1487
+msgid "Scroll down by half screen size"
+msgstr "Cuộn xuống theo nửa màn hình"
+
+#: info/session.c:1513
+msgid "Scroll up by half screen size"
+msgstr "Cuộn lên theo nửa màn hình"
+
+#: info/session.c:1542
+msgid "Select the next window"
+msgstr "Ch�n cửa sổ kế"
+
+#: info/session.c:1581
+msgid "Select the previous window"
+msgstr "Ch�n cửa sổ lùi"
+
+#: info/session.c:1632
+msgid "Split the current window"
+msgstr "Chia tách cửa sổ hiện có"
+
+#: info/session.c:1713
+msgid "Delete the current window"
+msgstr "Xóa cửa sổ hiện có"
+
+#: info/session.c:1721
+msgid "Cannot delete a permanent window"
+msgstr "Không thể xóa cửa sổ lâu b�n"
+
+#: info/session.c:1753
+msgid "Delete all other windows"
+msgstr "Xóa các cửa sổ khác"
+
+#: info/session.c:1799
+msgid "Scroll the other window"
+msgstr "Cuộn cửa sổ khác"
+
+#: info/session.c:1820
+msgid "Scroll the other window backward"
+msgstr "Cuộn lùi cửa sổ khác"
+
+#: info/session.c:1826
+msgid "Grow (or shrink) this window"
+msgstr "Phóng to (hay thu nh�) cửa sổ này"
+
+#: info/session.c:1837
+msgid "Divide the available screen space among the visible windows"
+msgstr "Chia chỗ màn hình sẵn sàng ra các cửa sổ hiện rõ"
+
+#: info/session.c:1844
+msgid "Toggle the state of line wrapping in the current window"
+msgstr "Bật tắt tính trạng ngắt dòng trong cửa sổ hiện th�i"
+
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr "Bật/tắt khả năng sử dụng biểu thức chính quy khi tìm kiếm"
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr "Dùng biểu thức chính quy khi tìm kiếm."
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr "Dùng chuỗi nghĩa chữ khi tìm kiếm."
+
+#: info/session.c:2027
+msgid "Select the Next node"
+msgstr "Ch�n nút Kế"
+
+#: info/session.c:2035
+msgid "Select the Prev node"
+msgstr "Ch�n nút Lùi"
+
+#: info/session.c:2043
+msgid "Select the Up node"
+msgstr "Ch�n nút Lên"
+
+#: info/session.c:2050
+msgid "Select the last node in this file"
+msgstr "Ch�n nút cuối trong tập tin này"
+
+#: info/session.c:2077 info/session.c:2110
+msgid "This window has no additional nodes"
+msgstr "Cửa sổ này không có nút thêm"
+
+#: info/session.c:2083
+msgid "Select the first node in this file"
+msgstr "Ch�n nút đầu trong tập tin này"
+
+#: info/session.c:2117
+msgid "Select the last item in this node's menu"
+msgstr "Ch�n mục cuối trong trình đơn nút này"
+
+#: info/session.c:2123
+msgid "Select this menu item"
+msgstr "Ch�n mục trình đơn này"
+
+#: info/session.c:2156
+#, c-format
+msgid "There aren't %d items in this menu."
+msgstr "Không có %d mục trong trình đơn này."
+
+#: info/session.c:2350 info/session.c:2351
+#, c-format
+msgid "Menu item (%s): "
+msgstr "Mục trình đơn (%s): "
+
+#: info/session.c:2354
+msgid "Menu item: "
+msgstr "Mục trình đơn: "
+
+#: info/session.c:2361 info/session.c:2362
+#, c-format
+msgid "Follow xref (%s): "
+msgstr "Theo tham chiếu chéo (%s): "
+
+#: info/session.c:2365
+msgid "Follow xref: "
+msgstr "Theo tham chiếu chéo : "
+
+#: info/session.c:2494
+msgid "Read a menu item and select its node"
+msgstr "��c mục trình đơn và ch�n nút của nó"
+
+#: info/session.c:2502
+msgid "Read a footnote or cross reference and select its node"
+msgstr "��c cước chú hay tham chiếu chéo và ch�n nút của nó"
+
+#: info/session.c:2508
+msgid "Move to the start of this node's menu"
+msgstr "V� đầu trình đơn của nút này"
+
+#: info/session.c:2532
+msgid "Visit as many menu items at once as possible"
+msgstr "Xem đồng th�i càng nhi�u mục trình đơn càng có thể"
+
+#: info/session.c:2560
+msgid "Read a node name and select it"
+msgstr "��c tên nút và ch�n nó"
+
+#: info/session.c:2615 info/session.c:2620
+msgid "Goto node: "
+msgstr "Tới nút: "
+
+#: info/session.c:2684
+#, c-format
+msgid "No menu in node `%s'."
+msgstr "Không có trình đơn trong nút « %s »."
+
+#: info/session.c:2730
+#, c-format
+msgid "No menu item `%s' in node `%s'."
+msgstr "Không có mục trình đơn « %s » trong nút « %s »."
+
+#: info/session.c:2760
+#, c-format
+msgid "Unable to find node referenced by `%s' in `%s'."
+msgstr "Không tìm thấy nút được tham chiếu bởi « %s » trong « %s »."
+
+#: info/session.c:2810
+msgid "Read a list of menus starting from dir and follow them"
+msgstr "��c danh sách các trình đơn bắt đầu từ « thư mục » và theo chúng"
+
+#: info/session.c:2812
+msgid "Follow menus: "
+msgstr "Theo trình đơn: "
+
+#: info/session.c:3005
+msgid "Find the node describing program invocation"
+msgstr "Tìm nút diễn tả cuộc g�i chương trình"
+
+#: info/session.c:3007
+#, c-format
+msgid "Find Invocation node of [%s]: "
+msgstr "Tìm nút g�i của [%s]: "
+
+#: info/session.c:3045
+msgid "Read a manpage reference and select it"
+msgstr "��c tham chiếu trang hướng dẫn (man) và ch�n nó"
+
+#: info/session.c:3049
+msgid "Get Manpage: "
+msgstr "Lấy trang Man: "
+
+#: info/session.c:3079
+msgid "Select the node `Top' in this file"
+msgstr "Ch�n « Trên » trong tập tin này"
+
+#: info/session.c:3085
+msgid "Select the node `(dir)'"
+msgstr "Ch�n nút « thư mục »"
+
+#: info/session.c:3102 info/session.c:3104
+#, c-format
+msgid "Kill node (%s): "
+msgstr "Giết nút (%s): "
+
+#: info/session.c:3156
+#, c-format
+msgid "Cannot kill node `%s'"
+msgstr "Không thể giết nút « %s »"
+
+#: info/session.c:3166
+msgid "Cannot kill the last node"
+msgstr "Không thể giết nút cuối"
+
+#: info/session.c:3252
+msgid "Select the most recently selected node"
+msgstr "Ch�n nút mới ch�n"
+
+#: info/session.c:3258
+msgid "Kill this node"
+msgstr "Giết nút này"
+
+#: info/session.c:3266
+msgid "Read the name of a file and select it"
+msgstr "��c tên tập tin và ch�n nó"
+
+#: info/session.c:3270
+msgid "Find file: "
+msgstr "Tìm tập tin: "
+
+#: info/session.c:3287
+#, c-format
+msgid "Cannot find `%s'."
+msgstr "Không tìm thấy « %s »"
+
+#: info/session.c:3330 info/session.c:3448
+#, c-format
+msgid "Could not create output file `%s'."
+msgstr "Không thể tạo tập tin xuất « %s »."
+
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
+msgid "Done."
+msgstr "Hoàn tất."
+
+#: info/session.c:3399
+#, c-format
+msgid "Writing node %s..."
+msgstr "�ang ghi nút %s..."
+
+#: info/session.c:3475
+msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+msgstr ""
+"Gửi nội dung của nút nay qua ống dẫn kiểu « INFO_PRINT_COMMAND » (Info in ra "
+"lệnh)"
+
+#: info/session.c:3510
+#, c-format
+msgid "Cannot open pipe to `%s'."
+msgstr "Không thể mở ống dẫn đến « %s »."
+
+#: info/session.c:3516
+#, c-format
+msgid "Printing node %s..."
+msgstr "�ang in nút %s..."
+
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr "Tiến trình tìm kiếm đã tiếp tục từ cuối của tài liệu."
+
+#: info/session.c:3738
+msgid "Search continued from the beginning of the document."
+msgstr "Tiến trình tìm kiếm đã tiếp tục từ đầu của tài liệu."
+
+#: info/session.c:3755
+#, c-format
+msgid "Searching subfile %s ..."
+msgstr "�ang tìm kiếm tập tin phụ %s..."
+
+#: info/session.c:3812
+msgid "Read a string and search for it case-sensitively"
+msgstr "��c chuỗi và tìm kiếm nó, phân biệt chữ hoa/thư�ng"
+
+#: info/session.c:3819
+msgid "Read a string and search for it"
+msgstr "��c chuỗi và tìm kiếm nó"
+
+#: info/session.c:3827
+msgid "Read a string and search backward for it"
+msgstr "��c chuỗi và tìm kiếm lùi nó"
+
+#: info/session.c:3863 info/session.c:3869
+#, c-format
+msgid "%s%s%s [%s]: "
+msgstr "%s%s%s [%s]: "
+
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr "Tìm kiếm dùng biểu thức chính quy"
+
+#: info/session.c:3865 info/session.c:3871
+msgid " case-sensitively"
+msgstr " phân biết chữ hoa/thư�ng "
+
+#: info/session.c:3866 info/session.c:3872
+msgid " backward"
+msgstr " ngược"
+
+#: info/session.c:3870
+msgid "Search"
+msgstr "Tìm kiếm"
+
+#: info/session.c:3911
+msgid "Search failed."
+msgstr "Lỗi tìm kiếm."
+
+#: info/session.c:3929
+msgid "Repeat last search in the same direction"
+msgstr "Làm lại việc tìm kiếm cuối, v� cùng phía hướng"
+
+#: info/session.c:3932 info/session.c:3942
+msgid "No previous search string"
+msgstr "Không có chuỗi tìm kiếm trước"
+
+#: info/session.c:3939
+msgid "Repeat last search in the reverse direction"
+msgstr "Làm lại việc tìm kiếm cuối, v� ngược phía hướng"
+
+#: info/session.c:3958 info/session.c:3964
+msgid "Search interactively for a string as you type it"
+msgstr "Tìm kiếm tương tác chuỗi đang gõ"
+
+#: info/session.c:4044
+msgid "Regexp I-search backward: "
+msgstr "Tìm kiếm ngược I dùng biểu thức chính quy: "
+
+#: info/session.c:4045
+msgid "I-search backward: "
+msgstr "Tìm kiếm ngược I: "
+
+#: info/session.c:4047
+msgid "Regexp I-search: "
+msgstr "Tìm kiếm I dùng biểu thức chính quy: "
+
+#: info/session.c:4048
+msgid "I-search: "
+msgstr "Tìm kiếm I: "
+
+#: info/session.c:4073 info/session.c:4075
+msgid "Failing "
+msgstr "�ang thất bại "
+
+#: info/session.c:4560
+msgid "Move to the previous cross reference"
+msgstr "V� tham chiếu chéo trước"
+
+#: info/session.c:4578
+msgid "Move to the next cross reference"
+msgstr "Tới tham chiếu chéo kế"
+
+#: info/session.c:4600
+msgid "Select reference or menu item appearing on this line"
+msgstr "Ch�n tham chiếu hay mục trình đơn xuất hiện trên dòng này"
+
+#: info/session.c:4623
+msgid "Cancel current operation"
+msgstr "Hủy thao tác đang chạy"
+
+#: info/session.c:4630
+msgid "Quit"
+msgstr "Thoát"
+
+#: info/session.c:4639
+msgid "Move the cursor to a specific line of the window"
+msgstr "Chuyển con chạy tới một đóng riêng trong cửa sổ"
+
+#: info/session.c:4671
+msgid "Redraw the display"
+msgstr "Vẽ lại màn hình"
+
+#: info/session.c:4708
+msgid "Quit using Info"
+msgstr "Thoát kh�i Info"
+
+#: info/session.c:4721
+msgid "Run command bound to this key's lowercase variant"
+msgstr "Chạy lệnh đã đóng kết đến biến thế chữ thư�ng của phím này"
+
+#: info/session.c:4732
+#, c-format
+msgid "Unknown command (%s)."
+msgstr "Lệnh không rõ (%s)."
+
+#: info/session.c:4735
+#, c-format
+msgid "\"%s\" is invalid"
+msgstr "« %s » không hợp lệ"
+
+#: info/session.c:4736
+#, c-format
+msgid "`%s' is invalid"
+msgstr "« %s » không hợp lệ"
+
+#: info/session.c:4950
+msgid "Add this digit to the current numeric argument"
+msgstr "Thêm chữ số này vào đối số thuộc số hiện th�i"
+
+#: info/session.c:4959
+msgid "Start (or multiply by 4) the current numeric argument"
+msgstr "Bắt đầu (hoặc nhân với 4) đối số thuộc số hiện th�i)"
+
+#: info/session.c:4974
+msgid "Internally used by \\[universal-argument]"
+msgstr "Dùng bên trong bởi « \\[universal-argument] » (đối số toàn thể)"
+
+#: info/tilde.c:336
+#, c-format
+msgid "readline: Out of virtual memory!\n"
+msgstr "readline: hết bộ nhớ ảo.\n"
+
+#: info/variables.c:37
+msgid "When \"On\", footnotes appear and disappear automatically"
+msgstr "Bật thì cước chú tự động xuất hiện và biến mật"
+
+#: info/variables.c:41
+msgid "When \"On\", creating or deleting a window resizes other windows"
+msgstr "Bật thì việc tao hoặc xóa b� cửa sổ thay đổi kích cỡ của cửa sổ khác"
+
+#: info/variables.c:45
+msgid "When \"On\", flash the screen instead of ringing the bell"
+msgstr "Bật thì chớp màn hình thay vào rung chuông"
+
+#: info/variables.c:49
+msgid "When \"On\", errors cause the bell to ring"
+msgstr "Bật thì lỗi gây ra rung chuông"
+
+#: info/variables.c:53
+msgid "When \"On\", Info garbage collects files which had to be uncompressed"
+msgstr "Bật thì Rác Info tập hợp tập tin đã cần giải nén"
+
+#: info/variables.c:56
+msgid "When \"On\", the portion of the matched search string is highlighted"
+msgstr "Bật thì tô sáng một phần chuỗi tìm kiếm đã khớp"
+
+#: info/variables.c:60
+msgid "Controls what happens when scrolling is requested at the end of a node"
+msgstr "�i�u khiển ứng xử khi cuộn được yêu cầu tại kết thúc nút"
+
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr "Tương tự với « scroll-behaviour » (ứng xử cuộn)"
+
+#: info/variables.c:69
+msgid "The number lines to scroll when the cursor moves out of the window"
+msgstr "Số dòng cần cuộn khi con chạy r�i cửa sổ"
+
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr "�i�u khiển nếu ứng xử cuộn có tác động lệnh di chuyển con tr� không"
+
+#: info/variables.c:77
+msgid "When \"On\", Info accepts and displays ISO Latin characters"
+msgstr "Bật thì Info chấp nhận và hiển thị ký tự La-tinh ISO"
+
+#: info/variables.c:81
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "�i�u khiển ứng xử khi cuộn được yêu cầu tại kết thúc của nút cuối cùng"
+
+#: info/variables.c:88
+msgid "Explain the use of a variable"
+msgstr "Diễn tả cách sử dụng biến"
+
+#: info/variables.c:94
+msgid "Describe variable: "
+msgstr "Diễn tả biến: "
+
+#: info/variables.c:113
+msgid "Set the value of an Info variable"
+msgstr "Lập giá trị của biến Info"
+
+#: info/variables.c:119
+msgid "Set variable: "
+msgstr "Lập biến: "
+
+#: info/variables.c:137
+#, c-format
+msgid "Set %s to value (%d): "
+msgstr "Lập %s thành giá trị (%d): "
+
+#: info/variables.c:178
+#, c-format
+msgid "Set %s to value (%s): "
+msgstr "Lập %s thành giá trị (%s): "
+
+#: info/window.c:1150
+msgid "--*** Tags out of Date ***"
+msgstr "--*** Thẻ quá cũ ***"
+
+#: info/window.c:1161
+msgid "-----Info: (), lines ----, "
+msgstr "-----Info: (), dòng ----, "
+
+#: info/window.c:1168
+#, c-format
+msgid "-%s---Info: %s, %d lines --%s--"
+msgstr "-%s---Info: %s, %d dòng --%s--"
+
+#: info/window.c:1172
+#, c-format
+msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+msgstr "-%s%s-Info: (%s)%s, %d dòng --%s--"
+
+#: info/window.c:1179
+#, c-format
+msgid " Subfile: %s"
+msgstr " Tập tin phụ: %s"
+
+#: install-info/install-info.c:221
+#, c-format
+msgid "%s: warning: "
+msgstr "%s: cảnh báo : "
+
+#: install-info/install-info.c:270
+#, c-format
+msgid " for %s"
+msgstr " cho %s"
+
+#: install-info/install-info.c:500
+#, c-format
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr ""
+"\tHãy thử lệnh trợ giúp « %s --help » để xem danh sách tùy ch�n hoàn toàn.\n"
+
+#: install-info/install-info.c:508
+#, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Sử dụng: %s [TÙY_CHỌN]... [TẬP_TIN_INFO [TẬP_TIN_THƯ_MỤC]]\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr "Thêm hoặc gỡ b� mục nhập trong TẬP_TIN_INFO vào/kh�i TẬP_TIN_THƯ_MỤC."
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+"Tùy ch�n:\n"
+" --debug             thông báo v� mỗi hành động.\n"
+" --delete            xoá các mục nhập đã tồn tại cho TẬP_TIN_INFO\n"
+"\t\t\t\tkh�i TẬP_TIN_THƯ_MỤC; đừng chèn mục nhập mới. --description=VĂN_BẢN  "
+"\tmô tả của mục nhập là văn bản này;\n"
+"\t\t\t\tkết hợp với tùy ch�n « --name » để làm cùng\n"
+"\t\t\t\tkết quả với tùy ch�n « --entry ».\n"
+" --dir-file=TÊN     ghi rõ tên tập tin của tập tin thư mục info;\n"
+"\t\t\t\tcó cùng kết quả với đối số TẬP_TIN_THƯ_MỤC.  --dry-run           có "
+"cùng kết quả với tùy ch�n « --test »."
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+" --entry=VĂN_BẢN        chèn văn bản này dạng mục nhập tập tin Info.\n"
+"\tVăn bản này được ghi dưới dạng một dòng mục trình đơn info,\n"
+"\tđằng trước ≥0 dòng thêm bắt đầu với khoảng trắng.\n"
+"\tGhi rõ nhi�u mục nhập thì tất cả được thêm.\n"
+"\tKhông ghi rõ mục nhập thì các mục nhập được xác định\n"
+"\ttừ thông tin trong tập tin Info chính nó.\n"
+"\tKhi gỡ b�, văn bản này ghi rõ mục nhập cần gỡ b�.\n"
+"\tVăn bản này chỉ được gỡ b� như là phương sách cuối cùng,\n"
+"\tnếu không có mục nhập được xác định từ tập tin Info,\n"
+"\tvà cũng không tìm thấy tên cơ bản của tập tin Info."
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+" --help              hiển thị trợ giúp này rồi thoát.\n"
+" --info-dir=THƯ_MỤC      bằng « --dir-file=THƯ_MỤC/thư_mục ».\n"
+" --info-file=TẬP_TIN    \tghi rõ tập tin Info cần cài đặt vào thư mục;\n"
+"\t\t\t\t\tcó cùng kết quả với đối số TẬP_TIN_INFO. --item=VĂN_BẢN         "
+"bằng « --entry=VĂN_BẢN ».\n"
+" --keep-old          đừng thay thế mục nhập hoặc gỡ b� phần rỗng.\n"
+" --menuentry=VĂN_BẢN    bằng « --name=VĂN_BẢN ».\n"
+" --name=VĂN_BẢN         tên của mục nhập là văn bản này;\n"
+"\t\t\t\t\tdùng cùng với tùy ch�n « --description »\n"
+"                      \t\t\tthì có cùng kết quả với tùy ch�n « --entry ».\n"
+" --no-indent         đừng định dạng mục nhập mới trong tập tin THƯ_MỤC\n"
+" --quiet             thu hồi cảnh báo."
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+" --regex=R           đặt các mục nhập của tập tin này vào m�i phần\n"
+"\t\t\t\ttương ứng với biểu thức chính quy R\n"
+"\t\t\t\t(không phân biệt chữ hoa/thư�ng).\n"
+" --remove            bằng « --delete ».\n"
+" --remove-exactly    chỉ gỡ b� nếu tên tập tin Info tương ứng chính xác;\n"
+"\t\t\t\tcũng phân biệt đuôi tên tập tin như .info và .gz\n"
+" --section=PHẦN       đặt các mục nhập vào phần này của thư mục.\n"
+"\t\t\t\tGhi rõ nhi�u phần thì tất cả các mục nhập\n"
+"\t\t\t\tđược thêm vào mỗi phần.\n"
+"\t\t\t\tKhông ghi rõ phần thì các phần được xác định\n"
+"\t\t\t\ttừ thông tin trong tập tin Info chính nó.\n"
+" --section R PHẦN     bằng « --regex=R --section=PHẦN --add-once »."
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+" --silent            thu hồi cảnh báo.\n"
+" --test              thu hồi nâng cấp TẬP_TIN_THƯ_MỤC.\n"
+" --version           hiển thị thông tin phiên bản rồi thoát."
+
+#: install-info/install-info.c:570
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"Hãy thông báo lỗi cho địa chỉ « bug-texinfo@gnu.org »,\n"
+"và gửi câu h�i chung, thảo luận v.v. cho help-texinfo@gnu.org.\n"
+"Trang chủ texinfo: http://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
+#, c-format
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"�ây là tập tin « .../info/dir », mà chứa nút đầu của phân cấp Info,\n"
+"có tên Trên: (dir)Top.\n"
+"Lần đầu tiên chạy Info thì bạn xem nút này.\n"
+"\n"
+"%s\t�ây là đầu cây INFO\n"
+"\n"
+"  �ây (nút Thư mục) đưa ra trình đơn các chủ đ� chính.\n"
+"  Phím tắt:\n"
+"   • q\t\tthoát\n"
+"   • ?\t\t\tliệt kê các lệnh Info\n"
+"   • d\t\ttrở v� đây\n"
+"   • h\t\thiện trợ giúp cho ngư�i mới dùng Info\n"
+"   • mEmacs<Return>\tthăm sổ tay Emacs\n"
+"v.v.\n"
+"  Trong Emacs, bạn có thể nhấn cái nút chuột 2 vào mục trình đơn\n"
+"  hay vào tham chiếu chéo, để ch�n nó.\n"
+"\n"
+"%s\n"
+
+#: install-info/install-info.c:622
+#, c-format
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: không thể đ�c (%s) và không thể tạo (%s)\n"
+
+#: install-info/install-info.c:715
+#, c-format
+msgid "%s: empty file"
+msgstr "%s: tập tin rỗng"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr ""
+"Có « START-INFO-DIR-ENTRY » (mục nhập thư mục Info đầu) mà không có « END-INFO-"
+"DIR-ENTRY » (mục nhập thư mục Info kết thúc) tương ứng"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr ""
+"Có « END-INFO-DIR-ENTRY » (mục nhập thư mục Info kết thúc) mà không có « START-"
+"INFO-DIR-ENTRY » (mục nhập thư mục Info đầu) tương ứng"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
+#, c-format
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: đã có tập tin thư mục: %s\n"
+
+#: install-info/install-info.c:2026
+#, c-format
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: hãy ghi rõ tập tin Info chỉ một lần.\n"
+
+#: install-info/install-info.c:2059
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr "Biểu thức chính quy thêm được ghi rõ nên b� qua « %s »"
+
+#: install-info/install-info.c:2071
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr "Gặp lỗi trong biểu thức chính quy « %s »: %s"
+
+#: install-info/install-info.c:2129
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "đối số dòng lệnh thừa « %s »"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr ""
+"Chưa ghi rõ tập tin nhập vào. Hãy chạy lệnh trợ giúp « --help » để xem thông "
+"tin thêm."
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+"Chưa ghi rõ tập tin thư mục. Hãy chạy lệnh trợ giúp « --help » để xem thông "
+"tin thêm."
+
+#: install-info/install-info.c:2278
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "không có mục nhập thư mục Info trong « %s »"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "không tìm thấy mục nhập cho « %s » nên không xóa gì"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr "lỗi ferror trên thiết bị xuất chuẩn\n"
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr "lỗi fflush trên thiết bị xuất chuẩn\n"
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr "các đối số tới @%s bị b� qua"
+
+#: makeinfo/cmds.c:779
+msgid "January"
+msgstr "Tháng Giêng"
+
+#: makeinfo/cmds.c:779
+msgid "February"
+msgstr "Tháng Hai"
+
+#: makeinfo/cmds.c:779
+msgid "March"
+msgstr "Tháng Ba"
+
+#: makeinfo/cmds.c:779
+msgid "April"
+msgstr "Tháng Tư"
+
+#: makeinfo/cmds.c:779
+msgid "May"
+msgstr "Tháng Năm"
+
+#: makeinfo/cmds.c:780
+msgid "June"
+msgstr "Tháng Sáu"
+
+#: makeinfo/cmds.c:780
+msgid "July"
+msgstr "Tháng Bảy"
+
+#: makeinfo/cmds.c:780
+msgid "August"
+msgstr "Tháng Tám"
+
+#: makeinfo/cmds.c:780
+msgid "September"
+msgstr "Tháng Chín"
+
+#: makeinfo/cmds.c:780
+msgid "October"
+msgstr "Tháng Mư�i"
+
+#: makeinfo/cmds.c:781
+msgid "November"
+msgstr "Tháng Mư�i Một"
+
+#: makeinfo/cmds.c:781
+msgid "December"
+msgstr "Tháng Chạp"
+
+#: makeinfo/cmds.c:1131
+#, c-format
+msgid "unlikely character %c in @var"
+msgstr "gặp ký tự bất thư�ng %c trong @var"
+
+#: makeinfo/cmds.c:1174
+msgid "@sc argument all uppercase, thus no effect"
+msgstr "đối số @sc hoàn toàn chữ hoa nên không có tác động"
+
+#: makeinfo/cmds.c:1229
+#, c-format
+msgid "`{' expected, but saw `%c'"
+msgstr "mong đợi « { » còn gặp « %c »"
+
+#: makeinfo/cmds.c:1269
+msgid "end of file inside verb block"
+msgstr "kết thức tập tin bên trong khối động từ"
+
+#: makeinfo/cmds.c:1277
+#, c-format
+msgid "`}' expected, but saw `%c'"
+msgstr "mong đợi « } » còn gặp « %c »"
+
+#: makeinfo/cmds.c:1308
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+"« @strong{Note...} » tạo một tham chiếu chéo giả trong Info; hãy sửa đổi để "
+"tránh nó"
+
+#: makeinfo/cmds.c:1504
+#, c-format
+msgid "%c%s is obsolete"
+msgstr "%c%s quá cũ"
+
+#: makeinfo/cmds.c:1612
+#, c-format
+msgid "@sp requires a positive numeric argument, not `%s'"
+msgstr "« @sp » cần đến một đối số dương thuộc số, không phải « %s »"
+
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
+#, c-format
+msgid "Bad argument to %c%s"
+msgstr "�ối số sai tới %c%s"
+
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
+msgid "asis"
+msgstr "như thế"
+
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
+msgid "none"
+msgstr "không có"
+
+#: makeinfo/cmds.c:2049
+#, c-format
+msgid "Bad argument to @%s"
+msgstr "�ối số sai tới @%s"
+
+#: makeinfo/cmds.c:2063
+msgid "insert"
+msgstr "chèn"
+
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "�ối số sai tới @%s: %s"
+
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr "Mong đợi @%s bật hay tắt, không phải « %s »"
+
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr "Chỉ hỗ trợ @%s 10 hay 11, không phải « %s »"
+
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Thiếu « } » trong đối số xác định @def"
+
+#: makeinfo/defun.c:711
+#, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "Phải bên trong môi trư�ng « @%s » để dùng « @%s »"
+
+#: makeinfo/files.c:434
+#, c-format
+msgid "%s: getwd: %s, %s\n"
+msgstr "%s: getwd: %s, %s\n"
+
+#: makeinfo/files.c:637
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr "« %s » bị b� sót trước tên tập tin xuất"
+
+#: makeinfo/files.c:645
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr "« %s » bị b� sót vì ghi ra thiết bị xuất chuẩn"
+
+#: makeinfo/files.c:693
+msgid "Output buffer not empty."
+msgstr "Bộ đệm xuất không rỗng."
+
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr "Kiểu nổi đã yêu cầu « %s » không phải được dùng trước"
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "Xem "
+
+#: makeinfo/footnote.c:149
+#, c-format
+msgid "`%c%s' needs an argument `{...}', not just `%s'"
+msgstr "« %c%s » cần thiết đối số « {...} », không phải chỉ « %s »"
+
+#: makeinfo/footnote.c:164
+#, c-format
+msgid "No closing brace for footnote `%s'"
+msgstr "Không có ngoặc móc đóng cho cước chú « %s »"
+
+# Type: text
+# Description
+# Main menu item
+#: makeinfo/footnote.c:197
+msgid "Footnote defined without parent node"
+msgstr "Cước chú đã xác định mà không có nút cha"
+
+#: makeinfo/footnote.c:209
+msgid "Footnotes inside footnotes are not allowed"
+msgstr "Không cho phép cước chú bên trong cước chú (lồng nhau)"
+
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
+msgid "Footnotes"
+msgstr "Cước chú"
+
+#: makeinfo/html.c:86
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s: không thể mở tập tin CSS « --css-file »: %s"
+
+#: makeinfo/html.c:175
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d: tập tin CSS « --css-file » kết thúc với ghi chú"
+
+#: makeinfo/html.c:421
+msgid "[unexpected] no html tag to pop"
+msgstr "[bất thư�ng] không có thẻ HTML cần bật"
+
+#: makeinfo/html.c:764
+#, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[bất thư�ng] tên nút không hợp lệ: « %s »"
+
+#: makeinfo/index.c:167
+#, c-format
+msgid "Unknown index `%s'"
+msgstr "Chỉ mục lạ « %s »"
+
+#: makeinfo/index.c:232
+#, c-format
+msgid "Info cannot handle `:' in index entry `%s'"
+msgstr "Info không thể xử lý dấu hai chấm « : » trong mục nhập chỉ mục « %s »"
+
+#: makeinfo/index.c:410
+#, c-format
+msgid "Index `%s' already exists"
+msgstr "Chỉ mục « %s » đã có."
+
+#: makeinfo/index.c:453
+#, c-format
+msgid "Unknown index `%s' and/or `%s' in @synindex"
+msgstr "Chỉ mục lạ « %s » và/hay « %s » trong @synindex"
+
+#: makeinfo/index.c:676
+msgid "(line )"
+msgstr "(dòng)"
+
+#: makeinfo/index.c:684
+#, c-format
+msgid "(line %*d)"
+msgstr "(dòng %*d)"
+
+#: makeinfo/index.c:764
+#, c-format
+msgid "Unknown index `%s' in @printindex"
+msgstr "Chỉ mục lạ « %s » trong @printindex"
+
+#: makeinfo/index.c:833
+#, c-format
+msgid "Entry for index `%s' outside of any node"
+msgstr "Mục nhập cho chỉ mục « %s » nằm ở ngoại nút nào"
+
+#: makeinfo/index.c:836 makeinfo/index.c:872
+msgid "(outside of any node)"
+msgstr "(ở ngoại nút nào)"
+
+#: makeinfo/insertion.c:161
+msgid "@item not allowed in argument to @itemize"
+msgstr "không cho phép @item trong đối số tới @itemize"
+
+#: makeinfo/insertion.c:242
+msgid "Broken-Type in insertion_type_pname"
+msgstr ""
+"« Broken-Type » (kiểu bị h�ng) trong « insertion_type_pname » (tên p kiểu chèn)"
+
+#: makeinfo/insertion.c:338
+msgid "Enumeration stack overflow"
+msgstr "Tràn đống đếm"
+
+#: makeinfo/insertion.c:370
+#, c-format
+msgid "lettering overflow, restarting at %c"
+msgstr "tràn vẽ chữ, khởi chạy lại tại %c"
+
+#: makeinfo/insertion.c:639
+#, c-format
+msgid "%s requires an argument: the formatter for %citem"
+msgstr "%s cần thiết một đối số: bộ định dạng cho %citem"
+
+#: makeinfo/insertion.c:727
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr "Môi trư�ng %cfloat không thể được lồng nhau"
+
+#: makeinfo/insertion.c:981
+#, c-format
+msgid "`@end' expected `%s', but saw `%s'"
+msgstr "« @end » mong đợi « %s », còn gặp « %s »"
+
+#: makeinfo/insertion.c:1349
+#, c-format
+msgid "No matching `%cend %s'"
+msgstr "Không có « %cend %s » tương ứng"
+
+#: makeinfo/insertion.c:1618
+#, c-format
+msgid "%s requires letter or digit"
+msgstr "%s cần thiết chữ hay chữ số"
+
+#: makeinfo/insertion.c:1718
+msgid "end of file inside verbatim block"
+msgstr "kết thúc tập tin bên trong khối đúng nguyên văn"
+
+#: makeinfo/insertion.c:1942
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s không có nghĩa bên ngoài môi trư�ng « @float » (nổi)"
+
+#: makeinfo/insertion.c:1978
+msgid "@menu seen before first @node, creating `Top' node"
+msgstr "gặp @menu trước @node đầu thì tạo nút « Trên »"
+
+#: makeinfo/insertion.c:1979
+msgid ""
+"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
+msgstr ""
+"có lẽ nút « @top » (trên) của bạn nên được bao b�c bằng @ifnottex thay cho "
+"@ifinfo ?"
+
+#: makeinfo/insertion.c:1991
+msgid "@detailmenu seen before first node, creating `Top' node"
+msgstr "gặp @detailmenu trước nút đầu thì tạo nút « Trên »"
+
+#: makeinfo/insertion.c:2047
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"@%s không có nghĩa bên ngoài môi trư�ng  « @titlepage » và « @quotation »"
+
+#: makeinfo/insertion.c:2061
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s không có nghĩa bên ngoài môi trư�ng  « @titlepage »"
+
+#: makeinfo/insertion.c:2092
+#, c-format
+msgid "Unmatched `%c%s'"
+msgstr "Chưa khớp « %c%s »"
+
+#: makeinfo/insertion.c:2097
+#, c-format
+msgid "`%c%s' needs something after it"
+msgstr "« %c%s » cần gì đó theo nó"
+
+#: makeinfo/insertion.c:2103
+#, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "�ối số sai « %s » tới « %s » nên dùng « %s »"
+
+#: makeinfo/insertion.c:2200
+#, c-format
+msgid "@%s not meaningful inside `@%s' block"
+msgstr "@%s không có nghĩa bên trong khối « @%s »"
+
+#: makeinfo/insertion.c:2209
+#, c-format
+msgid "@itemx not meaningful inside `%s' block"
+msgstr "@itemx không có nghĩa bên trong khối « %s »"
+
+#: makeinfo/insertion.c:2383
+#, c-format
+msgid "%c%s found outside of an insertion block"
+msgstr "gặp %c%s bên ngoài một khối chèn"
+
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr "không biết vùng lãnh thổ mặc định cho ngôn ngữ « %s »"
+
+#: makeinfo/lang.c:1281
+#, c-format
+msgid "%s is not a valid ISO 639 language code"
+msgstr "%s không phải mã ngôn ngữ kiểu ISO 639 hợp lệ"
+
+#: makeinfo/lang.c:1399
+#, c-format
+msgid "unrecognized encoding name `%s'"
+msgstr "không nhận ra tên bảng mã « %s »"
+
+#: makeinfo/lang.c:1407
+#, c-format
+msgid "sorry, encoding `%s' not supported"
+msgstr "tiếc là không hỗ trợ bảng mã « %s »"
+
+#: makeinfo/lang.c:1492
+#, c-format
+msgid "invalid encoded character `%s'"
+msgstr "ký tự đã mã hóa không hợp lệ: « %s »"
+
+#: makeinfo/lang.c:1800
+#, c-format
+msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s mong đợi « i » hay « j » làm đối số, không phải « %c »"
+
+#: makeinfo/lang.c:1804
+#, c-format
+msgid "%c%s expects a single character `i' or `j' as argument"
+msgstr "%c%s mong đợi một ký tự riêng lẻ « i » hay « j » làm đối số"
+
+#: makeinfo/macro.c:128
+#, c-format
+msgid "macro `%s' previously defined"
+msgstr "vĩ lệnh « %s » được xác định trước"
+
+#: makeinfo/macro.c:132
+#, c-format
+msgid "here is the previous definition of `%s'"
+msgstr "đây là l�i xác định trước của « %s »"
+
+#: makeinfo/macro.c:359
+#, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr ""
+"« \\ » trong phần mở rộng vĩ lệnh có « %s » theo sau, thay cho tên tham số"
+
+#: makeinfo/macro.c:401
+#, c-format
+msgid "Macro `%s' called on line %d with too many args"
+msgstr "Vĩ lệnh « %s » được g�i trên dòng %d với quá nhi�u đối số"
+
+#: makeinfo/macro.c:580
+#, c-format
+msgid "%cend macro not found"
+msgstr "Không tìm thấy vĩ lệnh %cend"
+
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr "@allow-recursion bị phản đối; hãy sử dụng @rmacro thay thế"
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr "@quote-arg bị phản đối; các đối số được trích dẫn theo mặc định"
+
+#: makeinfo/macro.c:649
+#, c-format
+msgid "mismatched @end %s with @%s"
+msgstr "khá»›p sai @end %s vá»›i @%s"
+
+#: makeinfo/makeinfo.c:188
+#, c-format
+msgid "Too many errors!  Gave up.\n"
+msgstr "Quá nhi�u lỗi nên thôi.\n"
+
+#: makeinfo/makeinfo.c:306
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: cảnh báo : "
+
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
+#, c-format
+msgid "Misplaced %c"
+msgstr "�ịnh vị sai %c"
+
+#: makeinfo/makeinfo.c:344
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Hãy thử lệnh trợ giúp « %s --help » để xem thông tin thêm.\n"
+
+#: makeinfo/makeinfo.c:347
+#, c-format
+msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
+msgstr ""
+"Cách sử dụng: %s [TÙY_CHỌN]... TTT...\n"
+"\n"
+"[TTT\t\tTập Tin Texinfo]\n"
+
+#: makeinfo/makeinfo.c:350
+msgid ""
+"Translate Texinfo source documentation to various other formats, by default\n"
+"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
+msgstr ""
+"Dịch tài liệu nguồn Texinfo sang nhi�u định dạng khác nhau, mặc định là tập "
+"tin Info thích hợp để đ�c trực tuyến bằng Emacs hoặc Info GNU độc nhất.\n"
+
+#: makeinfo/makeinfo.c:354
+#, c-format
+msgid ""
+"General options:\n"
+"      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
+"      --force                 preserve output even if errors.\n"
+"      --help                  display this help and exit.\n"
+"      --no-validate           suppress node cross-reference validation.\n"
+"      --no-warn               suppress warnings (but not errors).\n"
+"  -v, --verbose               explain what is being done.\n"
+"      --version               display version information and exit.\n"
+msgstr ""
+"Tùy ch�n chung:\n"
+"      --error-limit=S�      thoát sau khi gặp số lỗi này (mặc định là %d).\n"
+"\t\t(_sự hạn chế lỗi_)\n"
+"      --document-language=CHUỖI\t mi�n địa phương cần dùng\n"
+"\t\tđể dịch các từ khoá Texinfo cho tài liệu xuất (mặc định là C).\n"
+"\t\t(_ngôn ngữ tài liệu_)\n"
+"      --force                 bảo tồn kết xuất thậm chí nếu có lỗi (_ép "
+"buá»™c_).\n"
+"      --help                  hiển thị trợ giúp này rồi thoát (_trợ giúp_)\n"
+"      --no-validate           thu hồi khả năng thầm tra tham chiếu chéo.\n"
+"\t\t(_không thẩm tra_)\n"
+"      --no-warn               thu hồi các cảnh báo (không phải lỗi).\n"
+"\t\t(_không cảnh báo_)\n"
+" -v, --verbose               diễn tả việc đang được làm (_chi tiết_)\n"
+"      --version              hiển thị thông tin phiên bản rồi thoát (_phiên "
+"bản_)\n"
+
+#: makeinfo/makeinfo.c:369
+#, no-wrap
+msgid ""
+"Output format selection (default is to produce Info):\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
+msgstr ""
+"Ch�n định dạng xuất (mặc định là tạo Info):\n"
+"      --docbook             \txuất XML Docbook thay cho Info.\n"
+"      --html                \txuất HTML thay cho Info.\n"
+"      --xml                 \txuất XML Texinfo thay cho Info.\n"
+"      --plaintext           \txuất văn bản thô thay cho Info (_nhập thô_).\n"
+
+#: makeinfo/makeinfo.c:377
+msgid ""
+"General output options:\n"
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
+"menus\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
+msgstr ""
+"Tùy ch�n xuất chung:\n"
+"  -E, --macro-expand TẬP_TIN     xuất vào tập tin này nguồn đã mở rộng\n"
+"\t\tbằng vĩ lệnh, cũng b� qua @setfilename nào.\n"
+"\t\t(_vĩ lệnh mở rộng_)\n"
+"      --no-headers           thu hồi các bộ phân cách nút, dòng Node:\n"
+"\t\tvà trình đơn từ kết xuất Info (thì xuất văn bản thô),\n"
+"\t\thoặc từ HTML (thì tạo kết xuất ngắn hơn);\n"
+"\t\tcũng ghi vào đầu ra tiêu chuẩn theo mặc định.\t\t(_không có dòng đầu_)\n"
+"      --no-split              thu hồi khả năng chia tách kết xuất kiểu Info "
+"hoặc HTML,\n"
+"\t\ttạo ra chỉ một tập tin xuất (_không chia tách_).\n"
+"      --number-sections       xuất các số thứ tự chương và phần.\n"
+"\t\t(_đánh số các phần_)\n"
+"  -o, --output=TẬP_TIN\txuất ra tập tin này (vào thư mục nếu\n"
+"\t\tHTML đã chia tách) (_kết xuất_).\n"
+
+#: makeinfo/makeinfo.c:391
+#, c-format
+msgid ""
+"Options for Info and plain text:\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
+"      --fill-column=NUM       break Info lines at NUM characters (default %"
+"d).\n"
+"      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
+"                                `separate' to put them in their own node;\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
+"      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
+"d).\n"
+"                                If VAL is `none', do not indent; if VAL is\n"
+"                                `asis', preserve existing indentation.\n"
+"      --split-size=NUM        split Info files at size NUM (default %d).\n"
+msgstr ""
+"Tùy ch�n đối với Info và nhập thô :\n"
+"      --disable-encoding      đừng xuất các ký tự có dấu phụ và các ký tự\n"
+"\t\tđặc biệt trong kết xuất Info dựa vào bảng mã tài liệu "
+"@documentencoding.\n"
+"      --enable-encoding       xuất các ký tự có dấu phụ và ký tự đặc biệt\n"
+"\t\ttrong kết xuất Info dựa vào @documentencoding.\n"
+"\t\t(_bật bảng mã_)\n"
+"      --fill-column=S�       ngắt các dòng Info ở số ký tự này (mặc định là %"
+"d).\n"
+"\t\t(_tô đầy cột_)\n"
+"      --footnote-style=KIỂU_D�NG\txuất các cước chú trong Info\n"
+"\t\ttùy theo kiểu dáng này:\n"
+"\t\t\t« separate » (riêng) để đặt cước chú trong cùng nút;\n"
+"\t\t\t« end » (cuối) để đặt cước chú ở cuối nút trong đó\n"
+"\t\t\tnó được xác định (đây là mặc định) (_kiểu dáng cước chú_)\n"
+"      --paragraph-indent=GI�_TRỊ\t\tthụt l� các đoạn văn Info\n"
+"\t\ttheo số dấu cách này (mặc định là %d).\n"
+"\t\t\tGI� TRỊ là « none » (không có) thì đừng thụt l�;\n"
+"\t\t\tGI� TRỊ là « asis » (như thế) thì bảo tồn sự thụt l� đã có.\t\t(_đoạn "
+"văn thụt l�_)\n"
+"      --split-size=S�        chia tách các tập tin Info ở kích cỡ S� (mặc "
+"định là %d).\n"
+
+#: makeinfo/makeinfo.c:409
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
+msgstr ""
+"Tùy ch�n HTML:\n"
+"      --css-include=TẬP_TIN      tập tin bao gồm (include)\n"
+"\t\txuất theo kiểu dáng <style> HTML;\n"
+"\t\tTẬP_TIN là « - » thì đ�c thiết bị nhập chuẩn.\n"
+"      --css-ref=URL           tạo ra tham chiếu đến tập tin CSS.\n"
+"\t\t(_tham chiếu CSS_)\n"
+"      --transliterate-file-names\ttạo các tên tập tin đã chuyển chữ ASCII.\n"
+"\t\t(_chuyển chữ các tên tập tin_)\n"
+
+#: makeinfo/makeinfo.c:418
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+"Tùy ch�n XML và Docbook:\n"
+"      --output-indent=GI�_TRỊ    \tthụt l� các yếu tố theo số dấu cách này\n"
+"\t\t(mặc định là %d). Giá trị là 0 thì b� các khoảng trắng có thể b� qua.\n"
+"\t\t(_xuất thụt l�_)\n"
+
+#: makeinfo/makeinfo.c:425
+msgid ""
+"Input file options:\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
+msgstr ""
+"Tùy ch�n tập tin nhập vào :\n"
+"      --commands-in-node-names  cho phép lệnh kiểu @ trong tên nút.\n"
+"\t\t(_các lệnh trong tên nút_)\n"
+"  -D BIẾN             \txác định biến này, như bằng @set.\n"
+"  -I THƯ_MỤC      \tphụ thêm thư mục này vào đư�ng dẫn tìm kiếm @include.\n"
+"  -P THƯ_MỤC       \tthêm thư mục này vào đầu của đư�ng dẫn tìm kiếm "
+"@include.\n"
+"  -U BIẾN              \thủy xác định biến này, như bằng @clear.\n"
+
+#: makeinfo/makeinfo.c:434
+msgid ""
+"Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
+"  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
+"  --ifinfo          process @ifinfo even if not generating Info.\n"
+"  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
+"  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
+"  --no-ifhtml       do not process @ifhtml and @html text.\n"
+"  --no-ifinfo       do not process @ifinfo text.\n"
+"  --no-ifplaintext  do not process @ifplaintext text.\n"
+"  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
+msgstr ""
+"Xử lý đi�u kiện trong kết nhập:\n"
+"  --ifdocbook       \txử lý @ifdocbook và @docbook thậm chí nếu\n"
+"\t\tkhông tạo ra Docbook.\n"
+"  --ifhtml          \txử lý @ifhtml và @html thậm chí nếu không tạo ra "
+"HTML.\n"
+"  --ifinfo          \txử lý @ifinfo thậm chí nếu không tạo ra Info.\n"
+"  --ifplaintext     \txử lý @ifplaintext thậm chí nếu không tạo ra nhập "
+"thô.\n"
+"  --iftex           \txử lý @iftex và @tex; ngụ ý « --no-split ».\n"
+"  --ifxml           \txử lý @ifxml và @xml.\n"
+"  --no-ifdocbook\tđừng xử lý văn bản @ifdocbook và @docbook.\n"
+"  --no-ifhtml       \tđừng xử lý văn bản @ifhtml và @html.\n"
+"  --no-ifinfo       \tđừng xử lý văn bản @ifinfo.\n"
+"  --no-ifplaintext\tđừng xử lý văn bản @ifplaintext.\n"
+"  --no-iftex       \tđừng xử lý văn bản @iftex và @tex.\n"
+"  --no-ifxml        \tđừng xử lý văn bản @ifxml và @xml.\n"
+"\n"
+"  Hơn nữa, đối với các tùy ch�n « --no-if�ỊNH_DẠNG », có phải xử lý văn bản "
+"@ifnot�ỊNH_DẠNG.\n"
+
+#: makeinfo/makeinfo.c:453
+msgid ""
+"  The defaults for the @if... conditionals depend on the output format:\n"
+"  if generating HTML, --ifhtml is on and the others are off;\n"
+"  if generating Info, --ifinfo is on and the others are off;\n"
+"  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
+msgstr ""
+"  Giá trị mặc định cho các đi�u kiện @if... thì phụ thuộc vào định dạng "
+"xuất:\n"
+"  tạo ra HTML thì bật « --ifhtml » và các đi�u khác bị tắt;\n"
+"  tạo ra Info thì bật « --ifinfo » và các đi�u khác bị tắt;\n"
+"  tạo ra nhập thô thì bật « --ifplaintext » và các đi�u khác bị tắt;\n"
+"  tạo ra XML thì bật « --ifxml » và các đi�u khác bị tắt;\n"
+
+#: makeinfo/makeinfo.c:461
+msgid ""
+"Examples:\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
+"menus\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
+msgstr ""
+"Mẫu thí dụ :\n"
+"  makeinfo phu.texi                      ghi Info vào @setfilename của phu\n"
+"  makeinfo --html phu.texi               ghi HTML vào @setfilename\n"
+"  makeinfo --xml phu.texi                ghi Texinfo XML vào @setfilename  "
+"makeinfo --docbook phu.texi            ghi DocBook XML vào @setfilename  "
+"makeinfo --no-headers phu.texi         ghi nhập thô vào thiết bị xuất chuẩn\n"
+"\n"
+"  makeinfo --html --no-headers phu.texi\n"
+" \t\tghi HTML không có dòng nút hay trình đơn\n"
+"  makeinfo --number-sections phu.texi\n"
+"\t\tghi Info có các phần đã đánh số\n"
+"  makeinfo --no-split phu.texi\n"
+"\t\tghi một tập tin Info, bất chấp kích cỡ tối đa\n"
+
+#: makeinfo/makeinfo.c:619
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+"%s: đang b� qua giá trị không được nhận ra « TEXINFO_OUTPUT_FORMAT » (định "
+"dạng xuất Texinfo) « %s ».\n"
+
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
+#, c-format
+msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgstr "%s: %s đối số phải có kiểu số, không phải « %s ».\n"
+
+#: makeinfo/makeinfo.c:680
+#, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "%s: không thể mở kết xuất mở rộng vĩ lệnh « %s »"
+
+#: makeinfo/makeinfo.c:685
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "%s: đang b� qua kết xuất mở rộng vĩ lệnh thứ hai « %s ».\n"
+
+#: makeinfo/makeinfo.c:732
+#, c-format
+msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgstr ""
+"%s: đối số « --paragraph-indent » (thụt l� đoạn văn) phải là:\n"
+" • numeric\tkiểu số\n"
+" • none\t\tkhông có\n"
+" • asis\t\tnhư thế\n"
+"không phải « %s ».\n"
+
+#: makeinfo/makeinfo.c:750
+#, c-format
+msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgstr ""
+"%s: đối số « --footnote-style » (kiểu dáng cước chú) phải là:\n"
+" • separate\triêng\n"
+" • end\t\tcuốinkhông phải « %s ».\n"
+
+#: makeinfo/makeinfo.c:825
+#, c-format
+msgid "%s: missing file argument.\n"
+msgstr "%s: thiếu đối số tập tin.\n"
+
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr "Lệnh đa dòng %c%s dùng sai"
+
+#: makeinfo/makeinfo.c:1019
+#, c-format
+msgid "Expected `%s'"
+msgstr "Mong đợi « %s »"
+
+#: makeinfo/makeinfo.c:1496
+#, c-format
+msgid "Can't create directory `%s': %s"
+msgstr "Không thể tạo thư mục « %s »: %s"
+
+#: makeinfo/makeinfo.c:1542
+#, c-format
+msgid "No `%s' found in `%s'"
+msgstr "Không tìm thấy « %s » trong « %s »."
+
+#: makeinfo/makeinfo.c:1622
+#, c-format
+msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
+msgstr ""
+"%s: đang nhảy qua phần mở rộng vĩ lệnh ra thiết bị xuất chuẩn vì kết xuất "
+"Info đang đi ra đó.\n"
+
+#: makeinfo/makeinfo.c:1652
+#, c-format
+msgid "Making %s file `%s' from `%s'.\n"
+msgstr "�ang tạo tập tin %s « %s » từ « %s ».\n"
+
+#: makeinfo/makeinfo.c:1719
+#, c-format
+msgid ""
+"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: đang gỡ b� tập tin xuất vĩ lệnh « %s » do lỗi; hãy dùng tùy ch�n « --force "
+"» (buộc) để bảo tồn nó.\n"
+
+#: makeinfo/makeinfo.c:1774
+#, c-format
+msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: đang gỡ b� tập tin xuất « %s » do lỗi; hãy dùng tùy ch�n « --force "
+"» (buộc) để bảo tồn nó.\n"
+
+#: makeinfo/makeinfo.c:2068
+#, c-format
+msgid "Unknown command `%s'"
+msgstr "Lệnh lạ « %s »"
+
+#: makeinfo/makeinfo.c:2090
+#, c-format
+msgid "Use braces to give a command as an argument to @%s"
+msgstr "Dùng dấu ngoặc móc {} để đưa ra lệnh dạng đối số tới @%s"
+
+#: makeinfo/makeinfo.c:2349
+#, c-format
+msgid "%c%s expected braces"
+msgstr "%c%s mong đợi dấu ngoặc móc {}"
+
+#: makeinfo/makeinfo.c:2362
+msgid "Unmatched }"
+msgstr "ChÆ°a khá»›p }"
+
+#: makeinfo/makeinfo.c:2410
+msgid "NO_NAME!"
+msgstr "Không có tên."
+
+#: makeinfo/makeinfo.c:2431
+#, c-format
+msgid "%c%s missing close brace"
+msgstr "%c%s: thiếu dấu ngoặc móc đóng « } »"
+
+#: makeinfo/makeinfo.c:3434
+#, c-format
+msgid "@image file `%s' (for HTML) not readable: %s"
+msgstr "Tập tin @image « %s » (cho HTML) không đ�c được: %s"
+
+#: makeinfo/makeinfo.c:3440
+#, c-format
+msgid "No such file `%s'"
+msgstr "Không có tập tin như vậy « %s »"
+
+#: makeinfo/makeinfo.c:3576
+#, c-format
+msgid "@image file `%s' (for text) unreadable: %s"
+msgstr "Tập tin @image « %s » (cho văn bản) không đ�c được: %s"
+
+#: makeinfo/makeinfo.c:3585
+msgid "@image missing filename argument"
+msgstr "@image thiếu đối số tên tập tin"
+
+#: makeinfo/makeinfo.c:3803
+#, c-format
+msgid "undefined flag: %s"
+msgstr "chưa xác định c� : %s"
+
+#: makeinfo/makeinfo.c:3804
+#, c-format
+msgid "{No value for `%s'}"
+msgstr "{Không có giá trị cho « %s »}"
+
+#: makeinfo/makeinfo.c:3856
+#, c-format
+msgid "%c%s requires a name"
+msgstr "%c%s cần đến tên"
+
+#: makeinfo/makeinfo.c:3962
+#, c-format
+msgid "Reached eof before matching @end %s"
+msgstr "�ã tới kết thúc tập tin trước khi khớp @end %s"
+
+#: makeinfo/makeinfo.c:4211
+#, c-format
+msgid "`%.40s...' is too long for expansion; not expanded"
+msgstr "« %.40s... » quá dài để mở rộng nên chưa mở rộng"
+
+#: makeinfo/multi.c:116
+msgid "Missing } in @multitable template"
+msgstr "Thiếu « } » trong mẫu @multitable"
+
+#: makeinfo/multi.c:260
+#, c-format
+msgid "ignoring stray text `%s' after @multitable"
+msgstr "�ang b� qua văn bản rải rác « %s » sau @multitable"
+
+#: makeinfo/multi.c:400
+#, c-format
+msgid "Too many columns in multitable item (max %d)"
+msgstr "Quá nhi�u cột trong mục đa bảng (tối đà là %d)"
+
+#: makeinfo/multi.c:563
+#, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[bất thư�ng] không thể ch�n cột số %d trong đa bảng"
+
+#: makeinfo/multi.c:592
+msgid "ignoring @tab outside of multitable"
+msgstr "đang b� qua @tab bên ngoài đa bảng"
+
+#: makeinfo/multi.c:640
+#, c-format
+msgid "** Multicolumn output from last row:\n"
+msgstr "** Kết xuất đa cột từ hàng cuối:\n"
+
+#: makeinfo/multi.c:643
+#, c-format
+msgid "* column #%d: output = %s\n"
+msgstr "* cột số %d; kết xuất = %s\n"
+
+#: makeinfo/node.c:279
+#, c-format
+msgid "Node `%s' previously defined at line %d"
+msgstr "Nút « %s » được xác định trước tại dòng %d"
+
+#: makeinfo/node.c:647
+#, c-format
+msgid "Formatting node %s...\n"
+msgstr "�ang định dạng nút %s...\n"
+
+#: makeinfo/node.c:714
+#, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "Nút « %s » cần đến lệnh chia ra từng phần (v.d. %c%s)"
+
+#: makeinfo/node.c:878
+#, c-format
+msgid "No node name specified for `%c%s' command"
+msgstr "Chưa ghi rõ tên nút cho lệnh « %c%s »"
+
+#: makeinfo/node.c:919 makeinfo/node.c:1160
+#, c-format
+msgid "Anchor `%s' and node `%s' map to the same file name"
+msgstr "Neo « %s » và nút « %s » ánh xạ với cùng một tên tập tin"
+
+#: makeinfo/node.c:922
+msgid "This @anchor command ignored; references to it will not work"
+msgstr "Lệnh @anchor bị b� qua nên tham chiếu đến nó sẽ không hoạt động"
+
+#: makeinfo/node.c:924 makeinfo/node.c:1163
+msgid "Rename this anchor or use the `--no-split' option"
+msgstr ""
+"Thay đổi tên neo này, hoặc dùng tùy ch�n « --no-split » (không chia tách)"
+
+#: makeinfo/node.c:954
+#, c-format
+msgid "Unexpected string at end of split-HTML file `%s'"
+msgstr "Gặp chuỗi bất thư�ng tại kết thúc tập tin HTML-tách « %s »"
+
+#: makeinfo/node.c:1157
+#, c-format
+msgid "Anchors `%s' and `%s' map to the same file name"
+msgstr "Cả hai neo « %s » và « %s » đ�u ánh xạ với cùng một tên tập tin"
+
+#: makeinfo/node.c:1162
+msgid "@anchor command ignored; references to it will not work"
+msgstr "Lệnh @anchor bị b� qua nên tham chiếu đến nó sẽ không hoạt động"
+
+#: makeinfo/node.c:1359
+#, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr ""
+"%s tham chiếu đến nút không tồn tại « %s » (có lẽ đã chia ra từng phần không "
+"đúng?)"
+
+#: makeinfo/node.c:1459
+#, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"Không có gì chỉ tới trư�ng kế tiếp của nút « %s » (có lẽ đã chia ra từng phần "
+"không đúng?)"
+
+#: makeinfo/node.c:1462
+#, c-format
+msgid "This node (%s) has the bad Prev"
+msgstr "Nút này (%s) có Lùi sai"
+
+#: makeinfo/node.c:1517
+#, c-format
+msgid "Prev field of node `%s' not pointed to"
+msgstr "Không có gì chỉ tới trư�ng trước của nút « %s »"
+
+#: makeinfo/node.c:1521
+#, c-format
+msgid "This node (%s) has the bad Next"
+msgstr "Nút này (%s) có Kế sai"
+
+#: makeinfo/node.c:1533
+#, c-format
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr "« %s » không có trư�ng Lên (có lẽ đã chia ra từng phần không đúng?)"
+
+#: makeinfo/node.c:1602
+#, c-format
+msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
+msgstr ""
+"Nút « %s » không có mục trình đơn cho « %s », không kể nút này là đích Lên của "
+"nó"
+
+#: makeinfo/node.c:1634
+#, c-format
+msgid "unreferenced node `%s'"
+msgstr "nút chưa được tham chiếu « %s »"
+
+#: makeinfo/node.c:1724
+#, c-format
+msgid "Removing %s\n"
+msgstr "�ang gỡ b� %s\n"
+
+#: makeinfo/node.c:1728
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Không thể gỡ b� tập tin « %s »: %s"
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr "Phụ lục %c"
+
+#: makeinfo/sectioning.c:467
+#, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Lỗi nội bộ (search_sectioning) « %s »"
+
+#: makeinfo/sectioning.c:563
+#, c-format
+msgid "Internal error (search_sectioning) \"%s\"!"
+msgstr "Lỗi nội bộ (search_sectioning) « %s »."
+
+#: makeinfo/sectioning.c:624
+#, c-format
+msgid "%c%s is obsolete; use %c%s instead"
+msgstr "%c%s quá cũ; hãy dùng %c%s thay thế"
+
+#: makeinfo/sectioning.c:640
+#, c-format
+msgid "Node with %ctop as a section already exists"
+msgstr "Nút có tiết đoạn %ctop đã có"
+
+#: makeinfo/sectioning.c:648
+#, c-format
+msgid "Here is the %ctop node"
+msgstr "�ây là nút %ctop"
+
+#: makeinfo/sectioning.c:664
+#, c-format
+msgid "%ctop used before %cnode, defaulting to %s"
+msgstr "%ctop được dùng trước %cnode nên dùng giá trị mặc định %s"
+
+#: makeinfo/xml.c:1669
+#, c-format
+msgid "@image file `%s' unreadable: %s"
+msgstr "Không thể đ�c tập tin @image « %s »: %s"
+
+#: makeinfo/xml.c:2014
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+"@headitem như mục cuối của @multitable thì tạo tài liệu Docbook không hợp lệ"
+
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "của"
+
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "trên"
+
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "�ối số đầu tới tham chiếu chéo có lẽ không rỗng"
+
+#: makeinfo/xref.c:252
+#, c-format
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr "Tên tập tin rỗng cho tham chiếu chéo HTML trong « %s »"
+
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr "Tới kết thúc tập tin trong khi tìm dấu chấm « . » hay dấu phẩy « , »"
+
+#: makeinfo/xref.c:390
+#, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "@%s phải có dấu chấm « . » hay dấu phẩy « , » theo sau, không phải « %c »"
+
+#: makeinfo/xref.c:392
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "đối với tham chiếu chéo trong ngoặc, hãy dùng @pxref"
+
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "�ối số đầu tới @inforef có lẽ không rỗng"
+
+#: util/texindex.c:223
+msgid "display this help and exit"
+msgstr "hiển thị trợ giúp này rồi thoát"
+
+#: util/texindex.c:225
+msgid "send output to FILE"
+msgstr "xuất ra TẬP_TIN"
+
+#: util/texindex.c:227
+msgid "display version information and exit"
+msgstr "hiển thị thông tin phiên bản rồi thoát"
+
+#: util/texindex.c:237
+#, c-format
+msgid "Usage: %s [OPTION]... FILE...\n"
+msgstr "Cách sử dụng: %s [TÙY_CHỌN]... [TẬP_TIN]...\n"
+
+#: util/texindex.c:238
+#, c-format
+msgid "Generate a sorted index for each TeX output FILE.\n"
+msgstr "Tạo ra chỉ mục đã sắp xếp cho mỗi TẬP_TIN xuất TeX.\n"
+
+#: util/texindex.c:241
+#, c-format
+msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
+msgstr ""
+"Thư�ng TẬP_TIN... được ghi rõ dạng « phu.%c%c » cho tài liệu dạng « phu.texi "
+"».\n"
+
+#: util/texindex.c:243
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Tùy ch�n:\n"
+
+#: util/texindex.c:743
+#, c-format
+msgid "failure reopening %s"
+msgstr "lỗi mở lại %s"
+
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: không phải tập tin chỉ mục texinfo"
+
+#: util/texindex.c:993
+#, c-format
+msgid "No page number in %s"
+msgstr "Không có số thứ tự trang trong %s"
+
+#: util/texindex.c:1066
+#, c-format
+msgid "entry %s follows an entry with a secondary name"
+msgstr "mục nhập %s nằm theo một mục nhập có tên phụ"
diff --git a/Build/source/utils/texinfo/po/zh_CN.gmo b/Build/source/utils/texinfo/po/zh_CN.gmo
index 2c5fc242354..3ddca6b4732 100644
--- a/Build/source/utils/texinfo/po/zh_CN.gmo
+++ b/Build/source/utils/texinfo/po/zh_CN.gmo
diff --git a/Build/source/utils/texinfo/po/zh_CN.po b/Build/source/utils/texinfo/po/zh_CN.po
index 3ac45341101..8c2fa135b69 100644
--- a/Build/source/utils/texinfo/po/zh_CN.po
+++ b/Build/source/utils/texinfo/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.2\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
 "PO-Revision-Date: 2002-05-06 16:10+0800\n"
 "Last-Translator: Wang Li <charles@linux.net.cn>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -15,132 +15,198 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s£ºÑ¡Ïî¡°%s¡±º¬Òå²»Ã÷È·\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°--%s¡±²»½ÓÊܲÎÊý\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°%c%s¡±²»½ÓÊܲÎÊý\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°%s¡±ÐèÒªÒ»¸ö²ÎÊý\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°--%s¡±\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°%c%s¡±\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s£º·Ç·¨Ñ¡Ïî -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s£ºÎÞЧѡÏî -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s£ºÑ¡ÏîÐèÒªÒ»¸ö²ÎÊý -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s£ºÑ¡Ïî¡°-W %s¡±µÄº¬Òå²»Çå\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°-W %s¡±²»½ÓÊܲÎÊý\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, fuzzy, c-format
+msgid "memory exhausted"
+msgstr "ÐéÄâÄÚ´æºÄ¾¡"
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "ÏòÇ°Òƶ¯Ò»¸ö×Ö·û"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "ÏòºóÒƶ¯Ò»¸ö×Ö·û"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "Òƶ¯µ½±¾ÐеĿªÍ·"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "Òƶ¯µ½±¾ÐеÄĩβ"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "ÏòÇ°Òƶ¯Ò»¸öµ¥´Ê"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "ÏòºóÒƶ¯Ò»¸öµ¥´Ê"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "ɾ³ý¹â±êλÖõÄ×Ö·û"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "ɾ³ý¹â±êÖ®ºóµÄ×Ö·û"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "È¡Ïû»òÍ˳ö²Ù×÷"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "½ÓÊÜ(»òÇ¿ÖÆÍê³É)±¾ÐÐ"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Ô­Ñù²åÈëÏÂÒ»¸ö×Ö·û"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "²åÈë¸Ã×Ö·û"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "²åÈëÒ»¸ö tab ×Ö·û"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "±ä»»¹â±ê´¦×Ö·ûµÄ´ÎÐò"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Õ³Ìù×îºóÒ»´Î¼ôÇеÄÄÚÈÝ"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "¼ôÌù²¾Îª¿Õ"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Õ³ÌùÉϴμôÇÐ"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "¼ôÇÐÖÁ±¾ÐÐĩβ"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "¼ôÇÐÖÁ±¾ÐпªÍ·"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "¼ôÇйâ±êÖ®ºóµÄµ¥´Ê"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "¼ôÇйâ±ê֮ǰµÄµ¥´Ê"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "ûÓв¹Æë"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "δ²¹Æë"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "ÁоٿÉÄܵIJ¹Æë"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "ΨһµÄ²¹Æë"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "Ò»¸ö²¹Æ룺\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d ¸ö²¹Æ룺\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "²åÈë²¹Æë"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "ÕýÔÚ´´½¨²¹Æë..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "¹ö¶¯²¹Æë´°¿Ú"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "ÎÞ·¨ÏÔʾ½Å×¢"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr "ÔÚÁíÒ»¸ö´°¿ÚÖÐÏÔʾÓڸýڵãÏà¹ØµÄ½Å×¢"
 
@@ -148,73 +214,73 @@ msgstr "ÔÚÁíÒ»¸ö´°¿ÚÖÐÏÔʾÓڸýڵãÏà¹ØµÄ½Å×¢"
 msgid "---------- Footnotes ----------"
 msgstr "---------- ½Å×¢ ----------"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "ÔÚ±¾ÎļþµÄË÷ÒýÖÐËÑË÷×Ö·û´®"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "ÕýÔÚËÑË÷Ë÷ÒýÌõÄ¿..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "δÕÒµ½Ë÷Òý¡£"
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Ë÷ÒýÌõÄ¿£º"
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr "´Ó×îºóÒ»¸ö¡°\\[index-search]¡±ÃüÁîתÒƵ½ÏÂÒ»¸öÆ¥ÅäµÄË÷ÒýÏîÄ¿"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "ûÓÐÉÏÒ»¸öË÷ÒýËÑË÷×Ö·û´®¡£"
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "ûÓÐË÷ÒýÌõÄ¿¡£"
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, fuzzy, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "ûÓÐ %sË÷ÒýÌõÄ¿º¬ÓС°%s¡±¡£"
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "¸ü¶à "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "¿´²»µ½Õâ¸ö"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, fuzzy, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "ÔÚ %2$s ÖÐÕÒµ½¡°%1$s¡±¡£(¡°\\[next-index-match]¡±½«ÊÔͼѰÕÒÏÂÒ»¸öÆ¥Åä¡£)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, fuzzy, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "ÕýÔÚËÑË÷¡°%s¡±µÄË÷Òý..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, fuzzy, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "ÔÚ¿ÉÓÃµÄ info ÎļþµÄË÷ÒýÖоù²»º¬ÓС°%s¡±¡£"
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr "ÕûÀíËùÓÐÒÑÖª info Îļþº¬Óб»²éѯ×Ö·û´®µÄË÷Òý²¢½¨Á¢Ò»¸ö²Ëµ¥"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Ë÷Òýº¬ÓУº"
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -223,106 +289,97 @@ msgstr ""
 "\n"
 "* ²Ëµ¥£ºÆäË÷Òýº¬ÓС°%s¡±µÄ½Úµã£º\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "³¢ÊÔ --¸ü¶àµÄÇóÖúÐÅÏ¢¡£\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
-#, fuzzy, c-format
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"°æȨËùÓÐ (C) %s ×ÔÓÉÈí¼þ»ù½ð»á¡£\n"
-"±¾Èí¼þûÓÐÈκε£±£¡£Äú¿ÉÒÔ°´ÕÕͨÓÃ\n"
-"¹«¹²Ðí¿ÉÖ¤(GPL)µÄÌõ¿î·¢Ðб¾Èí¼þ¡£\n"
-"Õâ·½ÃæµÄÏêÇ飬ÇëÔĶÁÃûΪ COPYING µÄÎļþ¡£\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "ÕÒ²»µ½º¬ÓС°%s¡±µÄË÷Òý\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-
-#: info/info.c:597
-#, fuzzy, c-format
+#: info/info.c:598
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Ó÷¨£º%s [Ñ¡Ïî]... [²Ëµ¥Ïî...]\n"
-"\n"
-"ÔĶÁ Info ¸ñʽµÄÎĵµ¡£\n"
-"\n"
-"Ñ¡Ï\n"
-"      --apropos=STRING         ÔÚËùÓÐÊÖ²áµÄËùÓÐË÷ÒýÖÐËÑË÷ STRING¡£\n"
-"  -d, --directory=DIR          ½«Ä¿Â¼ DIR Ìí¼Óµ½ INFOPATH ÖС£\n"
-"      --dribble=FILENAME       ½«Óû§µÄ°´¼ü¼Ç¼ÔÚÎļþ FILENAME ÖС£\n"
-"  -f, --file=FILENAME          Ö¸¶¨ÒªÔĶÁµÄ Info Îļþ¡£\n"
-"  -h, --help                   ÏÔʾ¸ÃÇóÖúÐÅÏ¢²¢Í˳ö¡£\n"
-"      --index-search=STRING    תÒƵ½Ë÷ÒýÌõÄ¿ STRING ËùÖ¸ÏòµÄ½Úµã¡£\n"
-"  -n, --node=NODENAME          Ö¸¶¨Ê×ÏÈÔĶÁµÄ Info ÎļþÖеĽڵ㡣\n"
-"  -o, --output=FILENAME        ½«Ñ¡ÖеĽڵãÊä³öµ½Îļþ FILENAME ÖС£\n"
-"  -R, --raw-escapes            ²»ÒªÉ¾³ýÀ´×Ô man Ò³ÃæµÄ ANSI תÒå·û¡£\n"
-"      --restore=FILENAME       ´ÓÎļþ FILENAME ÖжÁÈ¡³õʼ°´¼ü¡£\n"
-"  -O, --show-options, --usage  תÒƵ½ÃüÁîÐÐÑ¡Ïî½Úµã¡£\n"
-"%s      --subnodes               µÝ¹éÊä³ö²Ëµ¥ÌõÄ¿¡£\n"
-"      --vi-keys                ʹÓÃÀà vi ºÍÀà less µÄ°´¼ü°ó¶¨¡£\n"
-"      --version                ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
-"\n"
-"Èç¹û´æÔÚ·ÇÑ¡Ïî²ÎÊý£¬ÔòµÚÒ»¸ö·ÇÑ¡Ïî²ÎÊý¾ÍÊÇÆðµã²Ëµ¥ÌõÄ¿£»\n"
-"ËüÊÇ´Ó INFOPATH Öеġ°dir¡±ÎļþÖÐËÑË÷¶øµÃµÄ¡£\n"
-"Èç¹ûËÑË÷²»µ½£¬info ¾ÍºÏ²¢ËùÓеġ°dir¡±Îļþ²¢ÏÔʾºÏ²¢½á¹û¡£\n"
-"ËùÓÐÊ£ÓàµÄ²ÎÊý¾ù×÷ΪÏà¶ÔÓÚÔĶÁµÄ³õʼ½ÚµãµÄ²Ëµ¥ÏîÄ¿Ãû³Æ¡£\n"
-"\n"
-"ʾÀý£º\n"
-"  info                       ÏÔʾ¶¥²ãĿ¼²Ëµ¥\n"
-"  info emacs                 ´Ó¶¥²ãĿ¼ÖÐµÄ emacs ½Úµã¿ªÊ¼\n"
-"  info emacs buffers         ´Ó emacs ÊÖ²áµÄ buffers ½Úµã¿ªÊ¼\n"
-"  info --show-options emacs  ´Ó emacs µÄÃüÁîÐÐÑ¡Ïî½Úµã¿ªÊ¼\n"
-"  info -f ./foo.info         ÏÔʾÎļþ ./foo.info£¬¶ø²»ÊÇËÑË÷Ŀ¼\n"
-
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -334,396 +391,402 @@ msgstr ""
 "Ò»°ãµÄÎÊÌâºÍÌÖÂÛÇë·¢Ë͵½ help-texinfo@gnu.org¡£\n"
 "Texinfo Ö÷Ò³£ºhttp://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "ÎÞ·¨ÕÒµ½½Úµã¡°%s¡±¡£"
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "ÎÞ·¨ÕÒµ½½Úµã¡°(%s)%s¡±¡£"
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "ÎÞ·¨ÕÒµ½Ò»¸ö´°¿Ú£¡"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "¹â±êûÓгöÏÖÔڸô°¿ÚµÄ½ÚµãÖ®ÖУ¡"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "ÎÞ·¨É¾³ý×îºóµÄ´°¿Ú¡£"
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "¸Ã½ÚµãÖÐûÓв˵¥¡£"
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "¸Ã½ÚµãÖÐûÓнÅ×¢¡£"
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "¸Ã½ÚµãÖÐûÓн»²æÒýÓá£"
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "¸Ã½ÚµãÖÐûÓС°%s¡±Ö¸Õë"
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "δ֪µÄ Info ÃüÁî¡°%c¡±£»ÇëÒÔ¡°?¡±»ñµÃ°ïÖú¡£"
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "ÖÕ¶ËÀàÐÍ¡°%s¡±µÄÄÜÁ¦²»×ãÒÔÖ§³Ö Info µÄÔËÐС£"
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "ÄúÒѾ­ÔڸýڵãµÄ×îºóÒ»¸öÒ³ÃæÖÐÁË¡£"
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "ÄúÒѾ­ÔڸýڵãµÄµÚÒ»Ò³ÖÐÁË¡£"
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "Ö»ÓÐÒ»¸ö´°¿Ú¡£"
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "½á¹û´°¿Ú½«»á̫С¡£"
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "ûÓÐ×ã¹»µÄ¿Õ¼äÓÃÓÚÇóÖú´°¿Ú£¬Çëɾ³ýÒ»¸ö´°¿Ú¡£"
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
-"Info ´°¿ÚÖеĻù±¾ÃüÁî\n"
-"******************************\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
+#: info/infodoc.c:47
+#, fuzzy
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "\\%-10[quit-help]  Í˳ö¸ÃÇóÖú¡£\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Ò»²¢Í˳ö Info¡£\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  µ÷Óà Info ½Ì³Ì¡£\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr ""
-"Ñ¡ÔñÆäËü½Úµã£º\n"
-"----------------------\n"
+#: info/infodoc.c:51
+#, fuzzy
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "  %-10s  Ïòºó¹ö¶¯Ò»ÐС£\n"
+
+#: info/infodoc.c:52
+#, fuzzy
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "  %-10s  ÏòÇ°¹ö¶¯Ò»ÐС£\n"
+
+#: info/infodoc.c:53
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "\\%-10[scroll-backward]  Ïòºó¹ö¶¯Ò»Ò³¡£\n"
+
+#: info/infodoc.c:54
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "\\%-10[scroll-forward]  ÏòÇ°¹ö¶¯Ò»Ò³¡£\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°ÏÂÒ»¸ö¡±½Úµã¡£\n"
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Òƶ¯µ½±¾½ÚµãµÄ¿ªÍ·¡£\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°ÉÏÒ»¸ö¡±½Úµã¡£\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°Éϲ㡱½Úµã¡£\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Òƶ¯µ½±¾½ÚµãµÄĩβ¡£\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
-msgstr ""
-"\\%-10[menu-item]  Ñ¡È¡ÓÉÃû³ÆÖ¸¶¨µÄ²Ëµ¥ÏîÄ¿¡£\n"
-"              Ñ¡È¡Ò»¸ö²Ëµ¥ÏîÄ¿µ¼ÖÂÑ¡ÖÐÁíÒ»¸ö½Úµã¡£\n"
+#, fuzzy
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr "\\%-10[move-to-next-xref]  Ìøתµ½±¾½ÚµãÖеÄÏÂÒ»¸ö³¬Îı¾Á¬½Ó¡£\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
+#, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
-msgstr "\\%-10[xref-item]  ¸úËæ½»²æÒýÓ᣶ÁÈ¡ÒýÓõÄÃû³Æ¡£\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr "\\%-10[select-reference-this-line]  ¸úËæ¹â±êϵij¬Îı¾Á¬½Ó¡£\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+#, fuzzy
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr "\\%-10[history-node]  Òƶ¯µ½±¾´°¿ÚµÄ×îºóÒ»¸ö¿É¼ûµÄ½Úµã¡£\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr "\\%-10[move-to-next-xref]  Ìøתµ½±¾½ÚµãÖеÄÏÂÒ»¸ö³¬Îı¾Á¬½Ó¡£\n"
+#, fuzzy
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "\\%-10[prev-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°ÉÏÒ»¸ö¡±½Úµã¡£\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr "\\%-10[move-to-prev-xref]  Ìøתµ½±¾½ÚµãÖеÄÉÏÒ»¸ö³¬Îı¾Á¬½Ó¡£\n"
+#, fuzzy
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "\\%-10[next-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°ÏÂÒ»¸ö¡±½Úµã¡£\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr "\\%-10[select-reference-this-line]  ¸úËæ¹â±êϵij¬Îı¾Á¬½Ó¡£\n"
+#, fuzzy
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "\\%-10[prev-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°ÉÏÒ»¸ö¡±½Úµã¡£\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr ""
-"\\%-10[dir-node]  Òƶ¯µ½¡°directory¡±½Úµã¡£µÈ¼ÛÓÚ¡°\\[goto-node] (DIR)¡±¡£\n"
+#, fuzzy
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "\\%-10[next-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°ÏÂÒ»¸ö¡±½Úµã¡£\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr "\\%-10[top-node]  Òƶ¯µ½¶¥²ã½Úµã¡£µÈ¼ÛÓÚ¡°\\[goto-node] Top¡±¡£\n"
+#, fuzzy
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "\\%-10[up-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°Éϲ㡱½Úµã¡£\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr ""
-"ÔÚÒ»¸ö½ÚµãÖÐÒƶ¯£º\n"
-"---------------------\n"
+#: info/infodoc.c:67
+#, fuzzy
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "\\%-10[end-of-node]  Òƶ¯µ½±¾½ÚµãµÄĩβ¡£\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "\\%-10[end-of-node]  Òƶ¯µ½±¾½ÚµãµÄĩβ¡£\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Òƶ¯µ½±¾½ÚµãµÄ¿ªÍ·¡£\n"
+#, fuzzy
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "  %-10s  Ñ¡È¡½Úµã²Ëµ¥ÖеĵÚÒ»ÖÁµÚ¾Å¸öÏîÄ¿¡£\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Òƶ¯µ½±¾½ÚµãµÄĩβ¡£\n"
+#, fuzzy
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Ñ¡È¡½Úµã²Ëµ¥µÄ×îºóÒ»¸öÏîÄ¿¡£\n"
 
 #: info/infodoc.c:72
 #, fuzzy
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "  %-10s  ÏòÇ°¹ö¶¯Ò»ÐС£\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  Ñ¡È¡ÓÉÃû³ÆÖ¸¶¨µÄ²Ëµ¥ÏîÄ¿¡£\n"
 
 #: info/infodoc.c:73
 #, fuzzy
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "  %-10s  Ïòºó¹ö¶¯Ò»ÐС£\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "\\%-10[xref-item]  ¸úËæ½»²æÒýÓ᣶ÁÈ¡ÒýÓõÄÃû³Æ¡£\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  ÏòÇ°¹ö¶¯Ò»Ò³¡£\n"
-
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Ïòºó¹ö¶¯Ò»Ò³¡£\n"
+#, fuzzy
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  Òƶ¯µ½ÓÉÃû×ÖÖ¸¶¨µÄ½Úµã¡£\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr ""
-"ÆäËüÃüÁ\n"
-"---------------\n"
+#: info/infodoc.c:76
+#, fuzzy
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  ÏòÇ°ËÑË÷Ö¸¶¨µÄ×Ö·û´®£¬\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "\\%-10[menu-digit]  Ñ¡È¡½Úµã²Ëµ¥ÖеĵÚÒ»ÖÁµÚ¾Å¸öÏîÄ¿¡£\n"
+#: info/infodoc.c:77
+#, fuzzy
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "\\%-10[prev-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°ÉÏÒ»¸ö¡±½Úµã¡£\n"
 
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "\\%-10[last-menu-item]  Ñ¡È¡½Úµã²Ëµ¥µÄ×îºóÒ»¸öÏîÄ¿¡£\n"
+#: info/infodoc.c:78
+#, fuzzy
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "  %-10s  ÔÚ±¾ Info ÎļþÖеÄË÷ÒýÌõÄ¿ÖÐËÑË÷Ö¸¶¨µÄ×Ö·û´®£¬\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
+#, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
 "\\%-10[index-search]  ÔÚ±¾ Info ÎļþµÄË÷ÒýÌõÄ¿ÖÐËÑË÷Ö¸¶¨µÄ×Ö·û´®£¬\n"
 "              ²¢Ñ¡ÔñµÚÒ»¸öÕÒµ½µÄÌõÄ¿ËùÒýÓõĽڵ㡣\n"
 
-#: info/infodoc.c:83
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr ""
-"\\%-10[goto-node]  Òƶ¯µ½ÓÉÃû×ÖÖ¸¶¨µÄ½Úµã¡£\n"
-"              Äú»¹¿ÉÒÔÒÔ (ÎļþÃû)½ÚµãÃû µÄÐÎʽ¸ø³öÎļþÃû¡£\n"
-
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"\\%-10[search]  ÏòÇ°ËÑË÷Ö¸¶¨µÄ×Ö·û´®\n"
-"              ²¢Ñ¡ÔñËùÕÒµ½µÄÏÂÒ»¸öʵÀýËùÔڵĽڵ㡣\n"
+#: info/infodoc.c:81
+#, fuzzy
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "È¡Ïûµ±Ç°²Ù×÷"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  ÏòºóËÑË÷Ö¸¶¨µÄ×Ö·û´®\n"
-"              ²¢Ñ¡ÔñËùÕÒµ½µÄÉÏÒ»¸öʵÀýËùÔڵĽڵ㡣\n"
+"Info ´°¿ÚÖеĻù±¾ÃüÁî\n"
+"******************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Í˳ö±¾ÇóÖú¡£\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Ò»²¢Í˳ö Info¡£\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  µ÷Óà Info ½Ì³Ì¡£\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Òƶ¯µ½±¾½ÚµãµÄ¡°ÏÂÒ»¸ö¡±½Úµã¡£\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Òƶ¯µ½±¾½ÚµãµÄ¡°ÉÏÒ»¸ö¡±½Úµã¡£\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Òƶ¯µ½±¾½ÚµãµÄ¡°Éϲ㡱½Úµã¡£\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Ñ¡È¡ÓÉÃû³ÆÖ¸¶¨µÄ²Ëµ¥ÏîÄ¿¡£\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
-msgstr "              Ñ¡È¡Ò»¸ö²Ëµ¥ÏîÄ¿½«Ñ¡ÖÐÁíÒ»¸ö½Úµã¡£\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"\\%-10[menu-item]  Ñ¡È¡ÓÉÃû³ÆÖ¸¶¨µÄ²Ëµ¥ÏîÄ¿¡£\n"
+"              Ñ¡È¡Ò»¸ö²Ëµ¥ÏîÄ¿µ¼ÖÂÑ¡ÖÐÁíÒ»¸ö½Úµã¡£\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  ¸úËæ½»²æÒýÓ᣶ÁÈ¡ÒýÓõÄÃû³Æ¡£\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Òƶ¯µ½±¾´°¿ÚÖеÄ×îºóÒ»¸ö¿É¼ûµÄ½Úµã¡£\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Ìøתµ½±¾½ÚµãÖеÄÏÂÒ»¸ö³¬Îı¾Á¬½Ó¡£\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  ¸úËæ¹â±êλÖõij¬Îı¾Á¬½Ó¡£\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Òƶ¯µ½¡°directory¡±½Úµã¡£µÈ¼ÛÓÚ¡°g (DIR)¡±¡£\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Òƶ¯µ½¶¥²ã½Úµã¡£µÈ¼ÛÓÚ¡°g Top¡±¡£\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"ÔÚÒ»¸ö½ÚµãÖÐÒƶ¯£º\n"
+"---------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  ÏòÇ°¹ö¶¯Ò»Ò³¡£\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Ïòºó¹ö¶¯Ò»Ò³¡£\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  תÒƵ½±¾½ÚµãµÄ¿ªÍ·¡£\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  תÒƵ½±¾½ÚµãµÄĩβ¡£\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  ÏòÇ°¹ö¶¯Ò»ÐС£\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Ïòºó¹ö¶¯Ò»ÐС£\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"ÆäËüÃüÁ\n"
+"---------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  Ñ¡È¡½Úµã²Ëµ¥ÖеĵÚÒ»ÖÁµÚ¾Å¸öÏîÄ¿¡£\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Ñ¡È¡½Úµã²Ëµ¥ÖеÄ×îºóÒ»¸öÏîÄ¿¡£\n"
 
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr "  %-10s  ÔÚ±¾ Info ÎļþÖеÄË÷ÒýÌõÄ¿ÖÐËÑË÷Ö¸¶¨µÄ×Ö·û´®£¬\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
-msgstr "              ²¢Ñ¡ÔñµÚÒ»¸öÕÒµ½µÄÌõÄ¿ËùÒýÓõĽڵ㡣\n"
-
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Òƶ¯µ½ÓÉÃû×ÖÖ¸¶¨µÄ½Úµã¡£\n"
+msgstr ""
+"\\%-10[index-search]  ÔÚ±¾ Info ÎļþµÄË÷ÒýÌõÄ¿ÖÐËÑË÷Ö¸¶¨µÄ×Ö·û´®£¬\n"
+"              ²¢Ñ¡ÔñµÚÒ»¸öÕÒµ½µÄÌõÄ¿ËùÒýÓõĽڵ㡣\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr "              Äú»¹¿ÉÒÔͬʱ¸ø³öÎļþÃû£¬ÐÎʽΪ (ÎļþÃû)½ÚµãÃû¡£\n"
-
-#: info/infodoc.c:133
-#, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  ÏòÇ°ËÑË÷Ö¸¶¨µÄ×Ö·û´®£¬\n"
+msgstr ""
+"\\%-10[goto-node]  Òƶ¯µ½ÓÉÃû×ÖÖ¸¶¨µÄ½Úµã¡£\n"
+"              Äú»¹¿ÉÒÔÒÔ (ÎļþÃû)½ÚµãÃû µÄÐÎʽ¸ø³öÎļþÃû¡£\n"
 
-#: info/infodoc.c:134 info/infodoc.c:136
+#: info/infodoc.c:129
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
-msgstr "              ²¢Ñ¡ÔñÕÒµ½µÄÏÂÒ»¸öʵÀýËùÔڵĽڵ㡣\n"
+msgstr ""
+"\\%-10[search]  ÏòÇ°ËÑË÷Ö¸¶¨µÄ×Ö·û´®\n"
+"              ²¢Ñ¡ÔñËùÕÒµ½µÄÏÂÒ»¸öʵÀýËùÔڵĽڵ㡣\n"
 
-#: info/infodoc.c:135
-#, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  ÏòºóËÑË÷Ö¸¶¨µÄ×Ö·û´®\n"
+#: info/infodoc.c:131
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  ÏòÇ°ËÑË÷Ö¸¶¨µÄ×Ö·û´®\n"
+"              ²¢Ñ¡ÔñËùÕÒµ½µÄÏÂÒ»¸öʵÀýËùÔڵĽڵ㡣\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "µ±Ç°ËÑË÷·¾¶Îª£º\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -731,7 +794,7 @@ msgstr ""
 "Info ´°¿ÚÖпÉÓõÄÃüÁ\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -739,7 +802,7 @@ msgstr ""
 "»ØÏÔÇøÖпÉÓõÄÃüÁ\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -748,7 +811,7 @@ msgstr ""
 "ÒÔÏÂÃüÁîÖ»ÄÜͨ¹ý %s µ÷Óãº\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -756,82 +819,73 @@ msgstr ""
 "ÒÔÏÂÃüÁî¸ù±¾ÎÞ·¨µ÷Óãº\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr "--- Óá°\\[history-node]¡±»ò¡°\\[kill-node]¡±Í˳ö ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "ÏÔʾÇóÖúÏûÏ¢"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "·ÃÎÊ Info ½Úµã¡°(info)Help¡±"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "´òÓ¡¹ØÓÚ KEY µÄÎĵµ"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "˵Ã÷°´¼ü£º%s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s 䶨Òå¡£"
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s 䶨Òå¡£"
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s ±»¶¨ÒåΪ %s¡£"
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "ÏÔʾִÐиø¶¨ÃüÁîËùÐèµÄ°´¼ü"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr ""
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "¡°%s¡±Î´°ó¶¨µ½Èκΰ´¼ü"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s ²»ÄÜͨ¹ý %s µ÷Óá£"
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s ¿ÉÒÔͨ¹ý %s µ÷Óá£"
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "ûÓÐÃûΪ¡°%s¡±µÄº¯Êý"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
 msgstr ""
-"°æȨËùÓÐ (C) %s ×ÔÓÉÈí¼þ»ù½ð»á¡£\n"
-"±¾Èí¼þûÓÐÈκε£±£¡£Äú¿ÉÒÔ°´ÕÕͨÓÃ\n"
-"¹«¹²Ðí¿ÉÖ¤(GPL)µÄÌõ¿î·¢Ðб¾Èí¼þ¡£\n"
-"Õâ·½ÃæµÄÏêÇ飬ÇëÔĶÁÃûΪ COPYING µÄÎļþ¡£\n"
+"Ñ¡ÔñÆäËü½Úµã£º\n"
+"----------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -940,83 +994,83 @@ msgstr ""
 "  --help               ÏÔʾ¸ÃÇóÖúÐÅÏ¢²¢Í˳ö¡£\n"
 "  --version            ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "ºöÂÔ·Ç·¨µÄ infokey Îļþ¡°%s¡± - ̫С"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "ºöÂÔ·Ç·¨µÄ infokey Îļþ¡°%s¡± - Ì«´ó"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "¶ÁÈë infokey Îļþ¡°%s¡±Ê±³ö´í - ¶ÁÈëÖжÏ"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr "·Ç·¨µÄ infokey Îļþ¡°%s¡± (´íÎóµÄ magic ±àºÅ) -- ÔËÐÐ infokey ÒÔ±ã¸üÐÂ"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr "ÄúµÄ infokey Îļþ¡°%s¡± ¹ýʱÁË -- ÔËÐÐ infokey ÒÔ±ã¸üÐÂ"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr "·Ç·¨µÄ infokey Îļþ¡°%s¡± (´íÎóµÄ½Ú³¤¶È) -- ÔËÐÐ infokey ÒÔ±ã¸üÐÂ"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr "·Ç·¨µÄ infokey Îļþ¡°%s¡± (´íÎóµÄ½Ú±àÂë) -- ÔËÐÐ infokey ÒÔ±ã¸üÐÂ"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "infokey ÎļþÖеĴíÎóÊý¾Ý -- ºöÂÔijЩ°´¼ü°ó¶¨"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr "infokey ÎļþÖеĴíÎóÊý¾Ý -- ºöÂÔijЩ±äÁ¿ÉèÖÃ"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "¶ÁÈ¡ Info ÃüÁîÃû³Æ²¢ËµÃ÷Ëü"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "˵Ã÷ÃüÁ"
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "ÔÚ»ØÏÔÇø¶ÁÈëÃüÁîÃû²¢Ö´ÐÐËü"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "ÎÞ·¨ÔÚÕâÀïÔËÐС°»ØÏÔÇø¡±ÃüÁî¡£"
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, fuzzy, c-format
 msgid "Undefined command: %s"
 msgstr "δ֪µÄÃüÁî¡°%s¡±"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "É趨ÏÔʾ´°¿ÚµÄ¸ß¶È"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "½«ÆÁÄ»¸ß¶ÈÉèÖÃΪ (%d)£º"
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1025,12 +1079,12 @@ msgstr ""
 "   ÕûÀíÔ´ÎļþÒÔʹ±¾Îļþ°üÀ¨£º\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "ÎÞ·¨²Ù×÷Îļþ %s¡£\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1042,7 +1096,7 @@ msgstr ""
 "  (Îļþ)½Úµã                         ÐÐ      ´óС    º¬ÓÐÎļþ\n"
 "  ----------                        -----   ----   ---------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1050,24 +1104,29 @@ msgstr ""
 "ÕâÀïÊÇÄú×î½ü·ÃÎʽڵãµÄ²Ëµ¥¡£\n"
 "´Ó²Ëµ¥ÖÐÑ¡ÔñÒ»¸ö£¬»òÔÚÆäËü´°¿ÚÖÐʹÓá°\\[history-node]¡±¡£\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "ʹһ¸ö´°¿Úº¬ÓÐÒ»¸ö°üÀ¨ËùÓе±Ç°·ÃÎʽڵãµÄ²Ëµ¥"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Ñ¡ÔñÒ»¸öÒѾ­ÔڿɼûµÄ´°¿ÚÖзÃÎʵĽڵã"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Ñ¡ÔñÒÑ·ÃÎʵĽڵ㣺"
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "ÒýÓÃÏûʧÁË£¡(%s)¡£"
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1076,502 +1135,506 @@ msgstr ""
 "»¶Ó­Ê¹Óà Info %s °æ¡£ÊäÈë \\[get-help-window] ÒÔ»ñµÃ°ïÖú£¬\\[menu-item] ½«µÃ"
 "µ½²Ëµ¥¡£"
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "ÏòÏÂÒƶ¯µ½ÏÂÒ»ÐÐ"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "ÏòÉÏÒƶ¯µ½ÉÏÒ»ÐÐ"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "Òƶ¯µ½ÐеÄĩβ"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "Òƶ¯µ½ÐеĿªÍ·"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "ÏÂÒ»¸ö"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "¸úËæÏÂÒ»¸ö½Úµã..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Ñ¡ÔñµÚÒ»¸ö²Ëµ¥Ïî..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Ñ¡ÔñÏÂÒ»¸ö½Úµã..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "ÏòÉÏÒƶ¯ %d ´Î£¬¶øºóºóÒÆ¡£"
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "±¾ÎĵµÖÐûÓиü¶àµÄ½Úµã¡£"
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "±¾½ÚµãûÓС°ÉÏÒ»¸ö¡±¡£"
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "ÔÚ±¾´°¿ÚÖÐÏòÉÏÒƶ¯¡£"
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "ÔÚ±¾ÎĵµÖÐûÓб¾½ÚµãµÄ¡°ÉÏÒ»¸ö¡±»ò¡°Éϲ㡱½Úµã¡£"
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "ÔÚ±¾´°¿ÚÖÐÏòÉϲãÒƶ¯"
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Òƶ¯µ½Ç°Ò»¸öµÄ×îºóÒ»¸ö²Ëµ¥ÏîÄ¿¡£"
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "ÔÚ½Úµã½á¹¹ÖÐÏòÇ°»òÏòϲãÒƶ¯"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "ÔÚ½Úµã½á¹¹ÖÐÏòºó»òÏòÉϲãÒƶ¯"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "ÔÚ±¾´°¿ÚÖÐÏòÇ°¹ö¶¯"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr "ÔÚ±¾´°¿ÚÖÐÏòÇ°¹ö¶¯²¢ÉèÖÃΪĬÈÏ´°¿Ú´óС"
 
-#: info/session.c:1221
+#: info/session.c:1389
 msgid "Scroll forward in this window staying within node"
 msgstr "ÔÚ±¾´°¿ÚÖÐÏòÇ°¹ö¶¯(²»´©Ô½½Úµã)"
 
-#: info/session.c:1229
+#: info/session.c:1397
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr "ÔÚ±¾´°¿ÚÖÐÏòÇ°¹ö¶¯(²»´©Ô½½Úµã)²¢ÉèÖÃĬÈÏ´°¿Ú´óС"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "ÔÚ±¾´°¿ÚÖÐÏòºó¹ö¶¯"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr "ÔÚ±¾´°¿ÚÖÐÏòºó¹ö¶¯²¢ÉèÖÃΪĬÈÏ´°¿Ú´óС"
 
-#: info/session.c:1254
+#: info/session.c:1422
 msgid "Scroll backward in this window staying within node"
 msgstr "ÔÚ±¾´°¿ÚÖÐÏòºó¹ö¶¯(²»´©Ô½½Úµã)"
 
-#: info/session.c:1262
+#: info/session.c:1430
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr "ÔÚ±¾´°¿ÚÖÐÏòºó¹ö¶¯(²»´©Ô½½Úµã)²¢ÉèÖÃΪĬÈÏ´°¿Ú´óС"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "Òƶ¯µ½±¾½ÚµãµÄ¿ªÍ·"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "Òƶ¯µ½±¾½ÚµãµÄĩβ"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "°´ÐÐÏòϹö¶¯"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "°´ÐÐÏòÉϹö¶¯"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "ÏòϹö¶¯°ë¸öÆÁÄ»"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "ÏòÉϹö¶¯°ë¸öÆÁÄ»"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "Ñ¡ÔñÏÂÒ»¸ö´°¿Ú"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "Ñ¡ÔñÉÏÒ»¸ö´°¿Ú"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "²ð·Öµ±Ç°´°¿Ú"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "ɾ³ýµ±Ç°´°¿Ú"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "ÎÞ·¨É¾³ýÓÀ¾Ã´°¿Ú"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "ɾ³ýËùÓÐÆäËü´°¿Ú"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "¹ö¶¯ÆäËü´°¿Ú"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "Ïòºó¹ö¶¯ÆäËü´°¿Ú"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "À©´ó(»òËõС)±¾´°¿Ú"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "ÔڿɼûµÄ´°¿Ú¼ä·ÖÅä¿ÉÓõÄÆÁÄ»¿Õ¼ä"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "ÔÚµ±Ç°´°¿ÚÖÐÇл»ÐоíÈÆ״̬"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "Ñ¡ÔñÏÂÒ»¸ö½Úµã"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "Ñ¡ÔñÉÏÒ»¸ö½Úµã"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "Ñ¡ÔñÉϲã½Úµã"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "Ñ¡Ôñ±¾ÎļþµÄ×îºóÒ»¸ö½Úµã"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "¸Ã´°¿ÚûÓи½¼Ó½Úµã"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "Ñ¡Ôñ±¾ÎļþµÄµÚÒ»¸ö½Úµã"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "Ñ¡Ôñ±¾½Úµã²Ëµ¥ÖеÄ×îºóÒ»Ïî"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "Ñ¡Ôñ±¾²Ëµ¥ÏîÄ¿"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "±¾²Ëµ¥ÖÐûÓÐµÚ %d ¸öÏîÄ¿¡£"
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "²Ëµ¥Ïî (%s)£º"
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "²Ëµ¥Ï"
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "¸úËæ½»²æÒýÓà (%s)£º"
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "¸úËæ½»²æÒýÓãº"
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "¶ÁÈ¡²Ëµ¥ÏѡÔñËüµÄ½Úµã"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "¶ÁÈ¡½Å×¢»ò½»²æÒýÓò¢Ñ¡ÔñËüµÄ½Úµã"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "Òƶ¯µ½±¾½Úµã²Ëµ¥µÄ¿ªÍ·"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "Á¢¿Ì·ÃÎʾ¡¿ÉÄܶàµÄ²Ëµ¥Ïî"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "¶ÁÈ¡½ÚµãÃû²¢Ñ¡ÔñËü"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "תµ½½Úµã£º"
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "½Úµã¡°%s¡±ÖÐûÓв˵¥¡£"
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "½Úµã¡°%2$s¡±ÖÐûÓв˵¥Ïî¡°%1$s¡±¡£"
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "ÎÞ·¨ÔÚ¡°%2$s¡±ÖÐÕÒµ½ÓÉ¡°%1$s¡±ÒýÓõĽڵ㡣"
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "¶ÁÈ¡×Ô dir ¿ªÊ¼µÄ²Ëµ¥µÄÁÐ±í²¢¸úËæËüÃÇ"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "¸úËæ²Ëµ¥£º"
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "Ñ°ÕÒ˵Ã÷³ÌÐòµ÷ÓõĽڵã"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Ñ°ÕÒ [%s] µÄµ÷Óýڵ㣺"
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "¶ÁÈ¡Ò»¸ö man ÊÖ²áµÄÒýÓò¢Ñ¡ÔñËü"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "»ñÈ¡ man Êֲ᣺"
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "Ñ¡Ôñ±¾ÎļþÖеġ°¶¥¡±½Úµã"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "Ñ¡Ôñ½Úµã¡°(dir)¡±"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "ɾ³ý½Úµã (%s)£º"
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "ÎÞ·¨É¾³ý½Úµã¡°%s¡±"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "ÎÞ·¨É¾³ý×îºóµÄ½Úµã"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "Ñ¡Ôñ×î½üÑ¡ÔñµÄ½Úµã"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "ɾ³ý±¾½Úµã"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "¶ÁÈ¡ÎļþÃû²¢Ñ¡ÔñËü"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "Ñ°ÕÒÎļþ£º"
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "ÎÞ·¨Ñ°ÕÒ¡°%s¡±¡£"
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "ÎÞ·¨´´½¨Êä³öÎļþ¡°%s¡±¡£"
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "Íê³É¡£"
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "ÕýÔÚдÈë½Úµã %s..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "ͨ¹ý¹ÜµÀ½«±¾½ÚµãµÄÄÚÈÝÊä³öµ½ INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "ÎÞ·¨´ò¿ªµ½¡°%s¡±µÄ¹ÜµÀ¡£"
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "ÕýÔÚ´òÓ¡½Úµã %s..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "¼ôÇÐÖÁ±¾ÐпªÍ·"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "ÕýÔÚËÑË÷×ÓÎļþ %s ..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr "¶ÁÈ¡Ò»¸ö×Ö·û´®²¢ÒÔ´óСдÃô¸ÐµÄ·½Ê½ËÑË÷Ëü"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "¶ÁÈ¡Ò»¸ö×Ö·û´®²¢ËÑË÷Ëü"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "¶ÁÈ¡Ò»¸ö×Ö·û´®²¢ÏòºóËÑË÷Ëü"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "%2$s%1$s×Ö·û´® [%3$s]£º"
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr "´óСдÃô¸ÐµØ"
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "ÏòºóËÑË÷"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "ËÑË÷"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr "´óСдÃô¸ÐµØ"
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "ËÑË÷ʧ°Ü¡£"
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "ÒÔÏàͬµÄ·½ÏòÖظ´×îºóµÄËÑË÷"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "ûÓÐÉÏ´ÎËÑË÷×Ö·û´®"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "ÒÔÏà·´µÄ·½ÏòÖظ´×îºóµÄËÑË÷"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "ÔÚÄãÊäÈëµÄͬʱ½»»¥Ê½µØËÑË÷×Ö·û´®"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "ÏòºóµÝÔöËÑË÷£º"
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "ÏòºóµÝÔöËÑË÷£º"
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "µÝÔöËÑË÷£º"
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "µÝÔöËÑË÷£º"
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "ʧ°Ü "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "Òƶ¯µ½ÉÏÒ»¸ö½»²æÒýÓÃ"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "Òƶ¯µ½ÏÂÒ»¸ö½»²æÒýÓÃ"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "Ñ¡Ôñ³öÏÖÔÚ±¾ÐÐÖеÄÒýÓûò²Ëµ¥Ïî"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "È¡Ïûµ±Ç°²Ù×÷"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "Í˳ö"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "½«¹â±êÒƶ¯µ½´°¿ÚµÄÖ¸¶¨ÐÐ"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "ÖØ»­ÏÔʾ"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "Í˳ö Info"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr "ÔËÐе½°ó¶¨µ½±¾°´¼üµÄСд°æ±¾µÄÃüÁî"
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "δ֪µÄÃüÁî (%s)¡£"
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "¡°%s¡±Îª·Ç·¨"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, fuzzy, c-format
 msgid "`%s' is invalid"
 msgstr "¡°%s¡±Îª·Ç·¨"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "½«±¾Êý×ÖÌí¼Óµ½µ±Ç°ÊýÖµ²ÎÊýÖÐ"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "¿ªÆô(»ò³ËÒÔ 4)µ±Ç°ÊýÖµ²ÎÊý"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "ÓÉ \\[universal-argument] ÄÚ²¿Ê¹ÓÃ"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline£ºÐéÄâÄÚ´æºÄ¾¡£¡\n"
@@ -1604,520 +1667,671 @@ msgstr "ÔÚ¡°¿ª¡±Ê±£¬ËÑË÷×Ö·û´®µÄÆ¥Å䲿·Ö½«±»Í»³öÏÔʾ"
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "¿ØÖÆÔÚ½Úµãĩβʱ³öÏÖ¹ö¶¯ÇëÇ󽫷¢Éúʲô"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "µ±¹â±êÒƳö´°¿ÚÊÇËù¹ö¶¯µÄÐÐÊý"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "ÔÚ¡°¿ª¡±Ê±£¬Info ½ÓÊܲ¢ÏÔʾ ISO À­¶¡×Ö·û"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "¿ØÖÆÔÚ½Úµãĩβʱ³öÏÖ¹ö¶¯ÇëÇ󽫷¢Éúʲô"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "½âÊͱäÁ¿µÄÓ÷¨"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "˵Ã÷±äÁ¿£º"
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "É趨 Info ±äÁ¿µÄÖµ"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "É趨±äÁ¿£º"
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "½« %s É趨Ϊֵ (%d)£º"
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "½« %s É趨Ϊֵ (%s)£º"
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr "--*** ±ê¼Ç¹ýÆÚ ***"
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info£º()£¬ÐÐ ----£¬"
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info£º%s£¬%d ÐÐ --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info£º(%s)%s£¬%d ÐÐ --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " ×ÓÎļþ£º%s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s£ºÑ¡Ïî¡°%s¡±º¬Òå²»Ã÷È·\n"
+msgid "%s: warning: "
+msgstr "%s£º¾¯¸æ£º"
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s£ºÑ¡Ïî¡°--%s¡±²»½ÓÊܲÎÊý\n"
+msgid " for %s"
+msgstr ""
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s£ºÑ¡Ïî¡°%c%s¡±²»½ÓÊܲÎÊý\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tÊÔÓá°%s --help¡±ÒÔ»ñµÃÑ¡ÏîµÄÍêÕûÁÐ±í¡£\n"
+
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "Ó÷¨£º%s [Ñ¡Ïî]... TEXINFO-Îļþ...\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Ç뽫´íÎ󱨸淢Ë͵½ bug-texinfo@gnu.org£¬\n"
+"Ò»°ãµÄÎÊÌâºÍÌÖÂÛÇë·¢Ë͵½ help-texinfo@gnu.org¡£\n"
+"Texinfo Ö÷Ò³£ºhttp://www.gnu.org/software/texinfo/"
+
+#: install-info/install-info.c:597
+#, fuzzy, c-format
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"ÕâÊÇÎļþ .../info/dir£¬Ëüº¬ÓÐ Info ²ã´Î\n"
+"½á¹¹µÄ×²ã½Úµã£¬³ÆΪ (dir)Top¡£\n"
+"ÄúµÚÒ»´Îµ÷Óà Info Äú½«´Ó¸Ã½Úµã¿ªÊ¼¡£\n"
+"\n"
+"%s\tÕâÊÇ INFO Ê÷µÄ¶¥\n"
+"\n"
+"  ÕâÀï (the Directory node) ¸ø³öÁËÖ÷ÒªÖ÷ÌâµÄ²Ëµ¥¡£\n"
+"  ÊäÈë¡°q¡±½«Í˳ö£¬ÊäÈë¡°?¡±½«ÁоÙËùÓÐ Info ÃüÁÊäÈë\n"
+"  ¡°d¡±½«·µ»ØÕâÀï¡£ÊäÈë¡°h¡±½«¸ø³õ´ÎʹÓõÄÓû§Ò»¸öÕªÒª£¬\n"
+"  ÊäÈë¡°mEmacs<Return>¡±½«·ÃÎÊ Emacs ÊֲᣬµÈµÈ¡£\n"
+"\n"
+"  ÔÚ EmacsÖУ¬Äú¿ÉÒÔÔڲ˵¥ÏîÄ¿»ò½»²æÒýÓÃÉϵã»÷Êó±êÓÒ¼üÒÔ\n"
+"  Ñ¡ÔñËü¡£\n"
+"\n"
+"* ²Ëµ¥£º\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s£ºÑ¡Ïî¡°%s¡±ÐèÒªÒ»¸ö²ÎÊý\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s£º¼´ÎÞ·¨¶ÁÈë (%s) Ò²ÎÞ·¨´´½¨ (%s)\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°--%s¡±\n"
+msgid "%s: empty file"
+msgstr "%s£º¿ÕÎļþ"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY ûÓÐÆ¥ÅäµÄ END-INFO-DIR-ENTRY"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY ûÓÐÆ¥ÅäµÄ START-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°%c%s¡±\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s£º·Ç·¨Ñ¡Ïî -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s£ºInfo ÎļþÖ»Ó¦¸ÃÖ¸¶¨Ò»´Î¡£\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s£ºÎÞЧѡÏî -- %c\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s£ºÑ¡ÏîÐèÒªÒ»¸ö²ÎÊý -- %c\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s£ºÑ¡Ïî¡°-W %s¡±µÄº¬Òå²»Çå\n"
+msgid "excess command line argument `%s'"
+msgstr "¶àÓàµÄÃüÁîÐвÎÊý¡°%s¡±"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr "ûÓÐÖ¸¶¨Êä³öÎļþ£»ÊÔÓà --help ÒÔ»ñµÃ¸ü¶àÐÅÏ¢¡£"
+
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr "ûÓÐÖ¸¶¨Ä¿Â¼Îļþ£»ÊÔÓà --help ÒÔ»ñµÃ¸ü¶àÐÅÏ¢¡£"
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2278
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s£ºÑ¡Ïî¡°-W %s¡±²»½ÓÊܲÎÊý\n"
+msgid "no info dir entry in `%s'"
+msgstr "¡°%s¡±ÖÐûÓÐ info Ŀ¼ÌõÄ¿"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "ÕÒ²»µ½¹ØÓÚ¡°%s¡±µÄÌõÄ¿£»Î´É¾³ý"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "%c%s µÄ´íÎó²ÎÊý"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "Ò»ÔÂ"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "¶þÔÂ"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "ÈýÔÂ"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "ËÄÔÂ"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "ÎåÔÂ"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "ÁùÔÂ"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "ÆßÔÂ"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "°ËÔÂ"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "¾ÅÔÂ"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "Ê®ÔÂ"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "ʮһÔÂ"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "Ê®¶þÔÂ"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "@var Öв»¿É¿¿µÄ×Ö·û %c"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc µÄ²ÎÊýÈ«²¿Îª´óд£¬Òò´ËÎÞЧ"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "ӦΪ¡°{¡±£¬µ«¿´µ½ÁË¡°%c¡±"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "ÎļþÔÚÔ­ÎÄ¿éÖнáÊø"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "ӦΪ¡°}¡±£¬µ«¿´µ½ÁË¡°%c¡±"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s Òѹýʱ"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp ÐèÒªÕýÊý²ÎÊý£¬¶ø²»ÊÇ¡°%s¡±"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "%c%s µÄ´íÎó²ÎÊý"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "%c%s µÄ´íÎó²ÎÊý"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr ""
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "@def µÄ²ÎÊýÒÅ©ÁË¡°}¡±"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "º¯Êý"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "ºê"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "ÌØÊâÐÎʽ"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "±äÁ¿"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Óû§Ñ¡Ïî"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "ʵÀý±äÁ¿"
-
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "·½·¨"
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "%c%s µÄ´íÎó²ÎÊý"
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
 
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "@def µÄ²ÎÊýÒÅ©ÁË¡°}¡±"
+
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr ""
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s£ºgetwd£º%s£¬%s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr ""
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr ""
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr ""
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr "²ÎÔÄ "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "¡°%c%s¡±ÐèÒª²ÎÊý¡°{...}¡±£¬¶ø²»½ö½öÊÇ¡°%s¡±"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "½Å×¢¡°%s¡±Ã»Óбպϻ¨À¨ºÅ"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "¶¨ÒåµÄ½ÅעûÓи¸½Úµã"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "½Å×¢ÄڵĽÅ×¢ÊDz»ÔÊÐíµÄ"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "½Å×¢"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "ÎÞ±êÌâ"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, fuzzy, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "ÎÞЧµÄ½Å×¢Ãû£º¡°%s¡±"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "δ֪µÄË÷Òý¡°%s¡±"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info ÎÞ·¨´¦ÀíË÷ÒýÌõÄ¿¡°%s¡±Öеġ°:¡±"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Ë÷Òý¡°%s¡±ÒѾ­´æÔÚ"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "@synindex ÖеÄδ֪Ë÷Òý¡°%s¡±ºÍ/»ò¡°%s¡±"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex ÖеÄδ֪Ë÷Òý¡°%s¡±"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "¹ØÓÚË÷Òý¡°%s¡±µÄÌõÄ¿³¬³öÁËËùÓнڵã"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(³¬³öÈκνڵã)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "²ÎÔÄ "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr ""
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "insertion_type_pname ÖеĴíÎóÀàÐÍ"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "ö¾ÙÕ»Òç³ö"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "×Ö·û±àºÅÒç³ö£¬´Ó %c ÖØпªÊ¼"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr ""
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr ""
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "¡°@end¡±ÐèÒª¡°%s¡±£¬µ«¿´µ½¡°%s¡±"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "ûÓÐÆ¥ÅäµÄ¡°%cend %s¡±"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s ÐèÒª×Öĸ»òÊý×Ö"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "ÎļþÔÚÔ­ÎÄ¿éÖнáÊø"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "ÔÚ¡°@%2$s¡±¿éÖС°@%1$s¡±ÊÇûÓÐÒâÒåµÄ"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "ÔÚµÚÒ»¸ö½Úµã֮ǰÓöµ½ @menu£¬ÕýÔÚ´´½¨¡°¶¥¡±½Úµã"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "ÄúµÄ @top ½Úµã¿ÉÄÜÓ¦¸Ã°üº¬ÔÚ @ifnottex ¶ø²»ÊÇ @ifinfo ÖУ¿"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "ÔÚµÚÒ»¸ö½Úµã֮ǰÓöµ½ @detailmenu£¬ÕýÔÚ´´½¨¡°¶¥¡±½Úµã"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "ÔÚ¡°@%2$s¡±¿éÖС°@%1$s¡±ÊÇûÓÐÒâÒåµÄ"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "δƥÅäµÄ¡°%c%s¡±"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "¡°%c%s¡±Ö®ºóÐèÒªÓÐЩʲô"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, fuzzy, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "¡°%s¡±µÄ´íÎó²ÎÊý£¬¡°%s¡±£¬Ê¹Óá°%s¡±"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "ÔÚ¡°@%2$s¡±¿éÖС°@%1$s¡±ÊÇûÓÐÒâÒåµÄ"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "ÔÚ¡°%s¡±¿éÖÐ @itemx ÊÇûÓÐÒâÒåµÄ"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "ÔÚ²åÈë¿éÖ®Íâ·¢ÏÖÁË %c%s"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ÔÚ ISO 639 ÓïÑÔ±àÂëÖÐÊÇÎÞЧµÄ"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "²»ÄÜʶ±ðµÄ±àÂëÃû³Æ¡°%s¡±"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "±§Ç¸£¬²»Ö§³Ö±àÂë¡°%s¡±"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ÎÞЧµÄ±àÂë×Ö·û¡°%s¡±"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s µÄ²ÎÊýӦΪ¡°i¡±»ò¡°j¡±£¬¶ø²»ÊÇ¡°%c¡±"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s ÐèÒªÒÔµ¥¸ö×Ö·û¡°i¡±»ò¡°j¡±Îª²ÎÊý"
@@ -2132,7 +2346,7 @@ msgstr "ºê¡°%s¡±ÒÑÔÚÇ°Ã涨Òå"
 msgid "here is the previous definition of `%s'"
 msgstr "ÕâÀïÊÇ¡°%s¡±Ç°ÃæµÄ¶¨Òå"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
@@ -2142,46 +2356,50 @@ msgstr ""
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "ÔÚµÚ %2$d ÐÐÖÐÒÔ¹ý¶àµÄ²ÎÊýµ÷Óúꡰ%1$s¡±"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "ÕÒ²»µ½ºê %cend"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg Ö»¶Ôµ¥²ÎÊýºêÓÐÓÃ"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
+
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s ºÍ @%s ²»Æ¥Åä"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "¹ý¶àµÄ´íÎ󣡷ÅÆú¡£\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s£º%d£º¾¯¸æ£º"
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "´íÎó·ÅÖÃµÄ %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ÊÔÓá°%s --help¡±ÒÔ»ñÈ¡¸ü¶àÐÅÏ¢¡£\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Ó÷¨£º%s [Ñ¡Ïî]... TEXINFO-Îļþ...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2189,17 +2407,17 @@ msgstr ""
 "½« Texinfo Ô´Îļþת»»ÎªÆäËü¸÷ÖÖ¸ñʽ£¬Ä¬ÈÏת»»ÎªÊÊÓÚ\n"
 "ÓÉ Emacs »ò¶ÀÁ¢ GNU Info ÔÚÏßä¯ÀÀµÄ Info Îļþ¡£\n"
 
-#: makeinfo/makeinfo.c:350
-#, c-format
+#: makeinfo/makeinfo.c:354
+#, fuzzy, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
@@ -2213,34 +2431,38 @@ msgstr ""
 "  -v, --verbose               ½âÊͶ¼×öÁËЩʲô¡£\n"
 "      --version               ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 "Êä³ö¸ñʽѡÔñ (ĬÈÏÉú³É Info Îļþ)£º\n"
 "      --docbook             Êä³ö DocBook ¶ø²»ÊÇ Info¡£\n"
 "      --html                Êä³ö HTML ¶ø²»ÊÇ Info¡£\n"
 "      --xml                 Êä³ö XML (TexinfoML) ¶ø²»ÊÇ Info¡£\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
+#, fuzzy
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 "ͨÓÃÊä³öÑ¡Ï\n"
 "  -E, --macro-expand FILE   ½«ºêÀ©Õ¹Ô´Êä³öµ½Îļþ FILE¡£\n"
@@ -2254,18 +2476,21 @@ msgstr ""
 "      --number-sections     Êä³öÕ½ڱàºÅ¡£\n"
 "  -o, --output=FILE         Êä³öµ½Îļþ FILE (Èç¹ûÊÇ·Ö¸îµÄ HTML ÔòΪĿ¼)£¬\n"
 
-#: makeinfo/makeinfo.c:386
-#, c-format
+#: makeinfo/makeinfo.c:391
+#, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2284,24 +2509,27 @@ msgstr ""
 "                                ¡°asis¡±£¬±£ÁôÏÖÓеĶÔÆë¡£\n"
 "      --split-size=NUM        ÔÚ´óС NUM µÄʱºò²ð·Ö Info Îļþ (ĬÈÏΪ %d)¡£\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 #, fuzzy
 msgid ""
 "Input file options:\n"
@@ -2318,7 +2546,7 @@ msgstr ""
 "  -P DIR                         ½« DIR ×·¼Óµ½ @include ËÑË÷·¾¶Ö®Ç°¡£\n"
 "  -U VAR                         È¡Ïû±äÁ¿ VAR µÄ¶¨Ò壬¾ÍÏó @clear¡£\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
@@ -2348,7 +2576,7 @@ msgstr ""
 "  --no-ifplaintext  ²»Òª´¦Àí @ifplaintext Îı¾¡£\n"
 "  --no-iftex        ²»Òª´¦Àí @iftex ºÍ @tex Îı¾¡£\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -2362,20 +2590,21 @@ msgstr ""
 "  Èç¹ûÉú³É Info£¬Ôò --ifinfo ĬÈÏ¿ªÆô¶øÆäËüµÄĬÈϹرգ»\n"
 "  Èç¹ûÉú³ÉÆÕͨÎı¾£¬Ôò --ifplaintext ĬÈÏ¿ªÆô¶øÆäËüĬÈϹرգ»\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 #, fuzzy
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "ʾÀý£º\n"
 "  makeinfo foo.texi                     ½« Info дÈëµ½ foo µÄ @setfilename\n"
@@ -2388,158 +2617,153 @@ msgstr ""
 "  makeinfo --number-sections foo.texi   Êä³ö´øÓбàºÅµÄ½ÚµÄ Info\n"
 "  makeinfo --no-split foo.texi          Êä³öµ¥¸ö Info Îļþ¶ø²»ÂÛ´óС\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s£º%s ²ÎÊý±ØÐëΪÊýÖµ£¬¶ø²»ÊÇ¡°%s¡±¡£\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "ÎÞ·¨´ò¿ªºêÀ©Õ¹Êä³ö¡°%s¡±"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, fuzzy, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "ÎÞ·¨´ò¿ªºêÀ©Õ¹Êä³ö¡°%s¡±"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s£º--paragraph-indent µÄ²ÎÊý±ØÐëΪÊýÖµ/¡°none¡±/¡°asis¡±£¬¶ø²»ÊÇ¡°%s¡±¡£\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s£º--footnote-style µÄ²ÎÊý±ØÐëΪ¡°separate¡±»ò¡°end¡±£¬¶ø²»ÊÇ¡°%s¡±¡£\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s£ºÒÅ©Îļþ²ÎÊý¡£\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "ӦΪ¡°%s¡±"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "ÎÞ·¨´´½¨Ä¿Â¼¡°%s¡±£º%s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "ÔÚ¡°%2$s¡±ÖÐÕÒ²»µ½¡°%1$s¡±"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "´Ó¡°%3$s¡±´´½¨ %1$s Îļþ¡°%2$s¡±¡£\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "ÕâÊÇ %s£¬ÓÉ makeinfo °æ±¾ %s ´Ó %s Éú³É¡£\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s£ºÓÉÓÚ´íÎóɾ³ýºêÊä³öÎļþ¡°%s¡±£»Óà --force ±£ÁôºêÊä³ö¡£\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s£ºÓÉÓÚ´íÎóɾ³ýºêÊä³öÎļþ¡°%s¡±£»Óà --force ±£ÁôºêÊä³ö¡£\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "δ֪µÄÃüÁî¡°%s¡±"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "ʹÓû¨À¨ºÅ½«Ò»¸öÃüÁîÓÃ×÷ @%s µÄ²ÎÊý"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s ÐèÒª¡°{...}¡±"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "²»Æ¥ÅäµÄ }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "ÎÞÃû×Ö£¡"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s ÒÅ©±ÕºÏ»¨À¨ºÅ"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image Îļþ¡°%s¡±(¶Ô HTML)²»¿É¶Á£º%s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "ÔÚ¡°%2$s¡±ÖÐÕÒ²»µ½¡°%1$s¡±"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image Îļþ¡°%s¡±(¶ÔÎı¾)²»¿É¶Á£º%s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "@image ÒÅ©ÎļþÃû²ÎÊý"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{ûÓС°%s¡±µÄÖµ}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s ÐèÒªÒ»¸öÃû×Ö"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "ÎļþÔÚÓöµ½Æ¥ÅäµÄ @end %s Ç°¾Í½áÊøÁË"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "¡°%.40s...¡±À©Õ¹ÆðÀ´Ì«³¤£»Î´À©Õ¹"
@@ -2548,161 +2772,128 @@ msgstr "¡°%.40s...¡±À©Õ¹ÆðÀ´Ì«³¤£»Î´À©Õ¹"
 msgid "Missing } in @multitable template"
 msgstr "@multitable Ä£°åÖÐÒÅ©ÁË }"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ºöÂÔ @multitable Ö®ºóµÄ¹ýÊ£Îı¾¡°%s¡±"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "ÔÚ¶àÁбí¸ñÏîÄ¿Öк¬ÓÐÌ«¶àµÄÁÐ (×î´óΪ %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, fuzzy, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "ÎÞ·¨ÔÚ¶àÁбí¸ñÖÐÑ¡ÔñµÚ %d ÁÐ"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "ºöÂÔ¶àÁбí¸ñÍâµÄ @tab"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** ×îºóÒ»ÐеĶàÁÐÊä³ö£º\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* ÁÐ #%d£ºÊä³ö = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "½Úµã¡°%s¡±ÔÚÇ°ÃæµÄ(µÚ %d ÐÐ)¶¨Òå"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "ÕýÔÚ¸ñʽ»¯½Úµã %s...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, fuzzy, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "½Úµã¡°%s¡±ÐèÒªÒ»¸ö½ÚÃüÁî (ÀýÈ磺%c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "ûÓÐΪ¡°%c%s¡±ÃüÁîÖ¸¶¨½ÚÃû³Æ"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Anchor¡°%s¡±ºÍ½Úµã¡°%s¡±Ó³É䵽ͬһ¸öÎļþÃû"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "ºöÂԸà @anchor ÃüÁ¶ÔËüµÄÒýÓý«ÎÞ·¨¹¤×÷"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "ÖØÃüÃû anchor »òʹÓá°--no-split¡±Ñ¡Ïî"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "ÔÚ·ÖÁ¢ HTML Îļþ¡°%s¡±µÄĩβµÄÒâÍâ×Ö·û´®"
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "ÏÂÒ»¸ö£º"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "ÉÏÒ»¸ö£º"
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "Éϲ㣺"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Anchor¡°%s¡±ºÍ¡°%s¡±Ó³É䵽ͬһ¸öÎļþÃû"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr "ºöÂÔ @anchor ÃüÁ¶ÔËüµÄÒýÓý«²»Äܹ¤×÷"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%sÒýÓõ½²»´æÔڵĽڵ㡰%s¡±"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "²Ëµ¥"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "½»²æÒýÓÃ"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, fuzzy, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "½Úµã¡°%s¡±µÄÏÂÒ»¸öÓòûÓÐÖ¸Ïò"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "¸Ã½Úµã (%s) º¬ÓдíÎóµÄÉÏÒ»¸ö"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "ÉÏÒ»¸ö"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "½Úµã¡°%s¡±µÄÉÏÒ»¸öÓòûÓÐÖ¸Ïò"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "¸Ã½Úµã (%s) º¬ÓдíÎóµÄÏÂÒ»¸ö"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "Éϲã"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "¾¡¹Ü½Úµã¡°%s¡±ÊÇ¡°%s¡±µÄÉϲã½Úµã£¬µ«È±ÉÙÏà¹ØµÄ²Ëµ¥Ïî"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "½Úµã¡°%s¡±Òѱ»ÒýÓÃÁË %d ´Î"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "δÒýÓõĽڵ㡰%s¡±"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "ÎÞ·¨´´½¨Ä¿Â¼¡°%s¡±£º%s"
@@ -2717,258 +2908,104 @@ msgstr "¸½Â¼ %c "
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "ÄÚ²¿´íÎó (search_sectioning) ¡°%s¡±£¡"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "ÄÚ²¿´íÎó (search_sectioning) ¡°%s¡±£¡"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s Òѹýʱ£»Óà %c%s ´úÌæ"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "´øÓÐ %ctop µÄ½Úµã×÷Ϊһ¸ö½ÚÒѾ­´æÔÚ"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "ÕâÀïÊÇ %ctop ½Úµã"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop ÔÚ %cnode ֮ǰʹÓã¬Ä¬ÈÏΪ %s"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Ŀ¼"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "¼ò¶ÌĿ¼"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image Îļþ¡°%s¡±²»¿É¶Á£º%s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s£º¾¯¸æ£º"
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
+#: makeinfo/xml.c:2150
+msgid "of"
 msgstr ""
 
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\tÊÔÓá°%s --help¡±ÒÔ»ñµÃÑ¡ÏîµÄÍêÕûÁÐ±í¡£\n"
-
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Ó÷¨£º%s [Ñ¡Ïî]... [INFO-Îļþ [DIR-Îļþ]]\n"
-"\n"
-"½« INFO-ÎļþÖеÄĿ¼ÌõÄ¿°²×°µ½ Info Ŀ¼Îļþ DIR-ÎļþÖУ¬»ò´ÓÖÐ\n"
-"ɾ³ý¡£\n"
-"\n"
-"Ñ¡Ï\n"
-" --delete          ´Ó DIR-ÎļþÖÐɾ³ý¹ØÓÚ INFO-ÎļþµÄÏÖÓÐÌõÄ¿£»\n"
-"                     ²»É¾³ýÈκÎÐÂÌõÄ¿¡£\n"
-" --dir-file=NAME   Ö¸¶¨ Info Ŀ¼ÎļþµÄÎļþÃû¡£\n"
-"                     ÕâµÈ¼ÛÓÚʹÓà DIR-Îļþ²ÎÊý¡£\n"
-" --entry=TEXT      ½« TEXT ×÷Ϊ Info Ŀ¼ÌõÄ¿²åÈë¡£\n"
-"                     TEXT µÄÐÎʽӦ¸ÃÊÇ Info ²Ëµ¥ÏîÄ¿\n"
-"                     ÐÐÒÔ¼°Áã¸ö»ò¶à¸öÒԿհ׿ªÍ·µÄÐС£\n"
-"                     Èç¹ûÄúÖ¸Ã÷¶à¸öÌõÄ¿£¬½«È«²¿Ìí¼Ó¡£\n"
-"                     Èç¹ûÄúδָÃ÷ÈκÎÌõÄ¿£¬ËüÃǽ«´Ó\n"
-"                     Info Îļþ×ÔÉíµÄÐÅÏ¢À´Åжϡ£\n"
-" --help            ÏÔʾ±¾ÇóÖúÐÅÏ¢²¢Í˳ö¡£\n"
-" --info-file=FILE  Ö¸¶¨Òª°²×°µ½Ä¿Â¼ÖÐµÄ Info Îļþ¡£\n"
-"                     ÕâµÈ¼ÛÓÚʹÓà INFO-Îļþ²ÎÊý¡£\n"
-" --info-dir=DIR    µÈͬÓÚ --dir-file=DIR/dir¡£\n"
-" --item=TEXT       µÈͬÓÚ --entry Îı¾¡£\n"
-"                     Info Ŀ¼ÌõĿʵ¼ÊÉÏÊDz˵¥ÏîÄ¿¡£\n"
-" --quiet           ²»ÒªÊä³ö¾¯¸æ¡£\n"
-" --remove          µÈͬÓÚ --delete¡£\n"
-" --section=SEC     ½«¸ÃÎļþµÄÌõÄ¿´æ´¢µ½Ä¿Â¼µÄ½Ú SEC ÖС£\n"
-"                     Èç¹ûÄúÖ¸Ã÷¶àÓÚÒ»¸ö½Ú£¬½«¼ÓÈë¸÷¸ö\n"
-"                     ½ÚÖеÄËùÓÐÌõÄ¿¡£\n"
-"                     Èç¹ûÄúδָÃ÷Èκνڣ¬½«¸ù¾Ý Info\n"
-"                     Îļþ×ÔÉíµÄÐÅÏ¢À´ÅжÏËüÃÇ¡£\n"
-" --version         ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
-
-#: util/install-info.c:488
-#, fuzzy, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
+#: makeinfo/xml.c:2155
+msgid "on"
 msgstr ""
-"ÕâÊÇÎļþ .../info/dir£¬Ëüº¬ÓÐ Info ²ã´Î\n"
-"½á¹¹µÄ×²ã½Úµã£¬³ÆΪ (dir)Top¡£\n"
-"ÄúµÚÒ»´Îµ÷Óà Info Äú½«´Ó¸Ã½Úµã¿ªÊ¼¡£\n"
-"\n"
-"%s\tÕâÊÇ INFO Ê÷µÄ¶¥\n"
-"\n"
-"  ÕâÀï (the Directory node) ¸ø³öÁËÖ÷ÒªÖ÷ÌâµÄ²Ëµ¥¡£\n"
-"  ÊäÈë¡°q¡±½«Í˳ö£¬ÊäÈë¡°?¡±½«ÁоÙËùÓÐ Info ÃüÁÊäÈë\n"
-"  ¡°d¡±½«·µ»ØÕâÀï¡£ÊäÈë¡°h¡±½«¸ø³õ´ÎʹÓõÄÓû§Ò»¸öÕªÒª£¬\n"
-"  ÊäÈë¡°mEmacs<Return>¡±½«·ÃÎÊ Emacs ÊֲᣬµÈµÈ¡£\n"
-"\n"
-"  ÔÚ EmacsÖУ¬Äú¿ÉÒÔÔڲ˵¥ÏîÄ¿»ò½»²æÒýÓÃÉϵã»÷Êó±êÓÒ¼üÒÔ\n"
-"  Ñ¡ÔñËü¡£\n"
-"\n"
-"* ²Ëµ¥£º\n"
 
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s£º¼´ÎÞ·¨¶ÁÈë (%s) Ò²ÎÞ·¨´´½¨ (%s)\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "½»²æÒýÓõĵÚÒ»¸ö²ÎÊý²»ÄÜΪ¿Õ"
 
-#: util/install-info.c:600
+#: makeinfo/xref.c:252
 #, c-format
-msgid "%s: empty file"
-msgstr "%s£º¿ÕÎļþ"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY ûÓÐÆ¥ÅäµÄ END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY ûÓÐÆ¥ÅäµÄ START-INFO-DIR-ENTRY"
-
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
 
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s£ºInfo ÎļþÖ»Ó¦¸ÃÖ¸¶¨Ò»´Î¡£\n"
-
-#: util/install-info.c:1284
-#, c-format
-msgid "excess command line argument `%s'"
-msgstr "¶àÓàµÄÃüÁîÐвÎÊý¡°%s¡±"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
-msgstr "ûÓÐÖ¸¶¨Êä³öÎļþ£»ÊÔÓà --help ÒÔ»ñµÃ¸ü¶àÐÅÏ¢¡£"
-
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr "ûÓÐÖ¸¶¨Ä¿Â¼Îļþ£»ÊÔÓà --help ÒÔ»ñµÃ¸ü¶àÐÅÏ¢¡£"
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr ""
 
-#: util/install-info.c:1313
-#, c-format
-msgid "no info dir entry in `%s'"
-msgstr "¡°%s¡±ÖÐûÓÐ info Ŀ¼ÌõÄ¿"
+#: makeinfo/xref.c:390
+#, fuzzy, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "¡°.¡±»ò¡°,¡±Ö®ºó±ØÐëΪ½»²æÒýÓ㬶ø²»ÊÇ %c"
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "ÔÚÎļþ¡°%2$s¡±Öв˵¥Ïî¡°%1$s¡±ÒÑ´æÔÚ"
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "¸Ã½ÚµãÖÐûÓн»²æÒýÓá£"
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "ÕÒ²»µ½¹ØÓÚ¡°%s¡±µÄÌõÄ¿£»Î´É¾³ý"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "@inforef µÄµÚÒ»¸ö²ÎÊý²»ÄÜΪ¿Õ"
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "ÏÔʾ¸ÃÇóÖúÐÅÏ¢²¢Í˳ö"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "ÔÚ´¦ÀíÖ®ºó±£ÁôÁÙʱÎļþ"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "ÔÚ´¦ÀíÖ®ºóɾ³ýÁÙʱÎļþ (ĬÈÏ)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "½«Êä³öËÍÈë FILE"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Ó÷¨£º%s [Ñ¡Ïî]... Îļþ...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Ϊÿ¸ö TeX Êä³öÎļþÉú³ÉÅÅÐòµÄË÷Òý¡£\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr "¶ÔÓÚÎĵµ¡°foo.texi¡±£¬FILE... ͨ³£Îª¡°foo.%c%c¡±µÄÐÎʽ¡£\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -2977,27 +3014,377 @@ msgstr ""
 "\n"
 "Ñ¡Ï\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s£º²»ÊÇ texinfo Ë÷ÒýÎļþ"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "ÖØдò¿ª %s ʧ°Ü"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s£º²»ÊÇ texinfo Ë÷ÒýÎļþ"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "%s ÖÐûÓÐÒ³Âë"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "ÌõÄ¿ %s ³öÏÖÔÚ¾ßÓдÎÒªÃû³ÆµÄÌõÄ¿Ö®ºó"
 
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr ""
+#~ "\\%-10[search]  ÏòÇ°ËÑË÷Ö¸¶¨µÄ×Ö·û´®\n"
+#~ "              ²¢Ñ¡ÔñËùÕÒµ½µÄÏÂÒ»¸öʵÀýËùÔڵĽڵ㡣\n"
+
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr ""
+#~ "\\%-10[goto-node]  Òƶ¯µ½ÓÉÃû×ÖÖ¸¶¨µÄ½Úµã¡£\n"
+#~ "              Äú»¹¿ÉÒÔÒÔ (ÎļþÃû)½ÚµãÃû µÄÐÎʽ¸ø³öÎļþÃû¡£\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "\\%-10[next-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°ÏÂÒ»¸ö¡±½Úµã¡£\n"
+
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr ""
+#~ "\\%-10[dir-node]  Òƶ¯µ½¡°directory¡±½Úµã¡£µÈ¼ÛÓÚ¡°\\[goto-node] "
+#~ "(DIR)¡±¡£\n"
+
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr "\\%-10[top-node]  Òƶ¯µ½¶¥²ã½Úµã¡£µÈ¼ÛÓÚ¡°\\[goto-node] Top¡±¡£\n"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-forward-page-only]  Scroll forward within this node.\n"
+#~ msgstr "\\%-10[scroll-forward]  ÏòÇ°¹ö¶¯Ò»ÐС£\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[scroll-backward-page-only]  Scroll backward within this node.\n"
+#~ msgstr "\\%-10[scroll-backward]  Ïòºó¹ö¶¯Ò»ÐС£\n"
+
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr ""
+#~ "\\%-10[search-backward]  ÏòºóËÑË÷Ö¸¶¨µÄ×Ö·û´®\n"
+#~ "              ²¢Ñ¡ÔñËùÕÒµ½µÄÉÏÒ»¸öʵÀýËùÔڵĽڵ㡣\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr "--- Óá°\\[history-node]¡±»ò¡°\\[kill-node]¡±Í˳ö ---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr "\\%-10[move-to-prev-xref]  Ìøתµ½±¾½ÚµãÖеÄÉÏÒ»¸ö³¬Îı¾Á¬½Ó¡£\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "Ó÷¨£º%s [Ñ¡Ïî]... [²Ëµ¥Ïî...]\n"
+#~ "\n"
+#~ "ÔĶÁ Info ¸ñʽµÄÎĵµ¡£\n"
+#~ "\n"
+#~ "Ñ¡Ï\n"
+#~ "      --apropos=STRING         ÔÚËùÓÐÊÖ²áµÄËùÓÐË÷ÒýÖÐËÑË÷ STRING¡£\n"
+#~ "  -d, --directory=DIR          ½«Ä¿Â¼ DIR Ìí¼Óµ½ INFOPATH ÖС£\n"
+#~ "      --dribble=FILENAME       ½«Óû§µÄ°´¼ü¼Ç¼ÔÚÎļþ FILENAME ÖС£\n"
+#~ "  -f, --file=FILENAME          Ö¸¶¨ÒªÔĶÁµÄ Info Îļþ¡£\n"
+#~ "  -h, --help                   ÏÔʾ¸ÃÇóÖúÐÅÏ¢²¢Í˳ö¡£\n"
+#~ "      --index-search=STRING    תÒƵ½Ë÷ÒýÌõÄ¿ STRING ËùÖ¸ÏòµÄ½Úµã¡£\n"
+#~ "  -n, --node=NODENAME          Ö¸¶¨Ê×ÏÈÔĶÁµÄ Info ÎļþÖеĽڵ㡣\n"
+#~ "  -o, --output=FILENAME        ½«Ñ¡ÖеĽڵãÊä³öµ½Îļþ FILENAME ÖС£\n"
+#~ "  -R, --raw-escapes            ²»ÒªÉ¾³ýÀ´×Ô man Ò³ÃæµÄ ANSI תÒå·û¡£\n"
+#~ "      --restore=FILENAME       ´ÓÎļþ FILENAME ÖжÁÈ¡³õʼ°´¼ü¡£\n"
+#~ "  -O, --show-options, --usage  תÒƵ½ÃüÁîÐÐÑ¡Ïî½Úµã¡£\n"
+#~ "%s      --subnodes               µÝ¹éÊä³ö²Ëµ¥ÌõÄ¿¡£\n"
+#~ "      --vi-keys                ʹÓÃÀà vi ºÍÀà less µÄ°´¼ü°ó¶¨¡£\n"
+#~ "      --version                ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
+#~ "\n"
+#~ "Èç¹û´æÔÚ·ÇÑ¡Ïî²ÎÊý£¬ÔòµÚÒ»¸ö·ÇÑ¡Ïî²ÎÊý¾ÍÊÇÆðµã²Ëµ¥ÌõÄ¿£»\n"
+#~ "ËüÊÇ´Ó INFOPATH Öеġ°dir¡±ÎļþÖÐËÑË÷¶øµÃµÄ¡£\n"
+#~ "Èç¹ûËÑË÷²»µ½£¬info ¾ÍºÏ²¢ËùÓеġ°dir¡±Îļþ²¢ÏÔʾºÏ²¢½á¹û¡£\n"
+#~ "ËùÓÐÊ£ÓàµÄ²ÎÊý¾ù×÷ΪÏà¶ÔÓÚÔĶÁµÄ³õʼ½ÚµãµÄ²Ëµ¥ÏîÄ¿Ãû³Æ¡£\n"
+#~ "\n"
+#~ "ʾÀý£º\n"
+#~ "  info                       ÏÔʾ¶¥²ãĿ¼²Ëµ¥\n"
+#~ "  info emacs                 ´Ó¶¥²ãĿ¼ÖÐµÄ emacs ½Úµã¿ªÊ¼\n"
+#~ "  info emacs buffers         ´Ó emacs ÊÖ²áµÄ buffers ½Úµã¿ªÊ¼\n"
+#~ "  info --show-options emacs  ´Ó emacs µÄÃüÁîÐÐÑ¡Ïî½Úµã¿ªÊ¼\n"
+#~ "  info -f ./foo.info         ÏÔʾÎļþ ./foo.info£¬¶ø²»ÊÇËÑË÷Ŀ¼\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr "              Ñ¡È¡Ò»¸ö²Ëµ¥ÏîÄ¿½«Ñ¡ÖÐÁíÒ»¸ö½Úµã¡£\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr "              Äú»¹¿ÉÒÔͬʱ¸ø³öÎļþÃû£¬ÐÎʽΪ (ÎļþÃû)½ÚµãÃû¡£\n"
+
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr "  %-10s  ÏòºóËÑË÷Ö¸¶¨µÄ×Ö·û´®\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "              ²¢Ñ¡ÔñÕÒµ½µÄÏÂÒ»¸öʵÀýËùÔڵĽڵ㡣\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "¸úËæÏÂÒ»¸ö½Úµã..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "Ñ¡ÔñµÚÒ»¸ö²Ëµ¥Ïî..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "Ñ¡ÔñÏÂÒ»¸ö½Úµã..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "ÏòÉÏÒƶ¯ %d ´Î£¬¶øºóºóÒÆ¡£"
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "ÔÚ±¾´°¿ÚÖÐÏòÉÏÒƶ¯¡£"
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "ÔÚ±¾´°¿ÚÖÐÏòÉϲãÒƶ¯"
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "Òƶ¯µ½Ç°Ò»¸öµÄ×îºóÒ»¸ö²Ëµ¥ÏîÄ¿¡£"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Function"
+#~ msgstr "º¯Êý"
+
+#~ msgid "Macro"
+#~ msgstr "ºê"
+
+#~ msgid "Special Form"
+#~ msgstr "ÌØÊâÐÎʽ"
+
+#~ msgid "Variable"
+#~ msgstr "±äÁ¿"
+
+#~ msgid "User Option"
+#~ msgstr "Óû§Ñ¡Ïî"
+
+#~ msgid "Instance Variable"
+#~ msgstr "ʵÀý±äÁ¿"
+
+#~ msgid "Method"
+#~ msgstr "·½·¨"
+
+#~ msgid "Untitled"
+#~ msgstr "ÎÞ±êÌâ"
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "ÕâÊÇ %s£¬ÓÉ makeinfo °æ±¾ %s ´Ó %s Éú³É¡£\n"
+
+#~ msgid "Next:"
+#~ msgstr "ÏÂÒ»¸ö£º"
+
+#~ msgid "Previous:"
+#~ msgstr "ÉÏÒ»¸ö£º"
+
+#~ msgid "Up:"
+#~ msgstr "Éϲ㣺"
+
+#~ msgid "Menu"
+#~ msgstr "²Ëµ¥"
+
+#~ msgid "Cross"
+#~ msgstr "½»²æÒýÓÃ"
+
+#~ msgid "Prev"
+#~ msgstr "ÉÏÒ»¸ö"
+
+#~ msgid "Up"
+#~ msgstr "Éϲã"
+
+#~ msgid "see "
+#~ msgstr "²ÎÔÄ "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "Ó÷¨£º%s [Ñ¡Ïî]... [INFO-Îļþ [DIR-Îļþ]]\n"
+#~ "\n"
+#~ "½« INFO-ÎļþÖеÄĿ¼ÌõÄ¿°²×°µ½ Info Ŀ¼Îļþ DIR-ÎļþÖУ¬»ò´ÓÖÐ\n"
+#~ "ɾ³ý¡£\n"
+#~ "\n"
+#~ "Ñ¡Ï\n"
+#~ " --delete          ´Ó DIR-ÎļþÖÐɾ³ý¹ØÓÚ INFO-ÎļþµÄÏÖÓÐÌõÄ¿£»\n"
+#~ "                     ²»É¾³ýÈκÎÐÂÌõÄ¿¡£\n"
+#~ " --dir-file=NAME   Ö¸¶¨ Info Ŀ¼ÎļþµÄÎļþÃû¡£\n"
+#~ "                     ÕâµÈ¼ÛÓÚʹÓà DIR-Îļþ²ÎÊý¡£\n"
+#~ " --entry=TEXT      ½« TEXT ×÷Ϊ Info Ŀ¼ÌõÄ¿²åÈë¡£\n"
+#~ "                     TEXT µÄÐÎʽӦ¸ÃÊÇ Info ²Ëµ¥ÏîÄ¿\n"
+#~ "                     ÐÐÒÔ¼°Áã¸ö»ò¶à¸öÒԿհ׿ªÍ·µÄÐС£\n"
+#~ "                     Èç¹ûÄúÖ¸Ã÷¶à¸öÌõÄ¿£¬½«È«²¿Ìí¼Ó¡£\n"
+#~ "                     Èç¹ûÄúδָÃ÷ÈκÎÌõÄ¿£¬ËüÃǽ«´Ó\n"
+#~ "                     Info Îļþ×ÔÉíµÄÐÅÏ¢À´Åжϡ£\n"
+#~ " --help            ÏÔʾ±¾ÇóÖúÐÅÏ¢²¢Í˳ö¡£\n"
+#~ " --info-file=FILE  Ö¸¶¨Òª°²×°µ½Ä¿Â¼ÖÐµÄ Info Îļþ¡£\n"
+#~ "                     ÕâµÈ¼ÛÓÚʹÓà INFO-Îļþ²ÎÊý¡£\n"
+#~ " --info-dir=DIR    µÈͬÓÚ --dir-file=DIR/dir¡£\n"
+#~ " --item=TEXT       µÈͬÓÚ --entry Îı¾¡£\n"
+#~ "                     Info Ŀ¼ÌõĿʵ¼ÊÉÏÊDz˵¥ÏîÄ¿¡£\n"
+#~ " --quiet           ²»ÒªÊä³ö¾¯¸æ¡£\n"
+#~ " --remove          µÈͬÓÚ --delete¡£\n"
+#~ " --section=SEC     ½«¸ÃÎļþµÄÌõÄ¿´æ´¢µ½Ä¿Â¼µÄ½Ú SEC ÖС£\n"
+#~ "                     Èç¹ûÄúÖ¸Ã÷¶àÓÚÒ»¸ö½Ú£¬½«¼ÓÈë¸÷¸ö\n"
+#~ "                     ½ÚÖеÄËùÓÐÌõÄ¿¡£\n"
+#~ "                     Èç¹ûÄúδָÃ÷Èκνڣ¬½«¸ù¾Ý Info\n"
+#~ "                     Îļþ×ÔÉíµÄÐÅÏ¢À´ÅжÏËüÃÇ¡£\n"
+#~ " --version         ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "ÔÚÎļþ¡°%2$s¡±Öв˵¥Ïî¡°%1$s¡±ÒÑ´æÔÚ"
+
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr "\\%-10[menu-digit]  Ñ¡È¡½Úµã²Ëµ¥ÖеĵÚÒ»ÖÁµÚ¾Å¸öÏîÄ¿¡£\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "½Úµã¡°%s¡±Òѱ»ÒýÓÃÁË %d ´Î"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "°æȨËùÓÐ (C) %s ×ÔÓÉÈí¼þ»ù½ð»á¡£\n"
+#~ "±¾Èí¼þûÓÐÈκε£±£¡£Äú¿ÉÒÔ°´ÕÕͨÓÃ\n"
+#~ "¹«¹²Ðí¿ÉÖ¤(GPL)µÄÌõ¿î·¢Ðб¾Èí¼þ¡£\n"
+#~ "Õâ·½ÃæµÄÏêÇ飬ÇëÔĶÁÃûΪ COPYING µÄÎļþ¡£\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-arg Ö»¶Ôµ¥²ÎÊýºêÓÐÓÃ"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Ŀ¼"
+
+#~ msgid "Short Contents"
+#~ msgstr "¼ò¶ÌĿ¼"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "ÔÚ´¦ÀíÖ®ºó±£ÁôÁÙʱÎļþ"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "ÔÚ´¦ÀíÖ®ºóɾ³ýÁÙʱÎļþ (ĬÈÏ)"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr "              ²¢Ñ¡ÔñµÚÒ»¸öÕÒµ½µÄÌõÄ¿ËùÒýÓõĽڵ㡣\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "°æȨËùÓÐ (C) %s ×ÔÓÉÈí¼þ»ù½ð»á¡£\n"
+#~ "±¾Èí¼þûÓÐÈκε£±£¡£Äú¿ÉÒÔ°´ÕÕͨÓÃ\n"
+#~ "¹«¹²Ðí¿ÉÖ¤(GPL)µÄÌõ¿î·¢Ðб¾Èí¼þ¡£\n"
+#~ "Õâ·½ÃæµÄÏêÇ飬ÇëÔĶÁÃûΪ COPYING µÄÎļþ¡£\n"
+
 #~ msgid "%s: Specify the Info directory only once.\n"
 #~ msgstr "%s£ºInfo Ŀ¼ֻӦ¸ÃÖ¸¶¨Ò»´Î¡£\n"
 
@@ -3013,27 +3400,12 @@ msgstr "ÌõÄ¿ %s ³öÏÖÔÚ¾ßÓдÎÒªÃû³ÆµÄÌõÄ¿Ö®ºó"
 #~ msgid "File exists, but is not a directory"
 #~ msgstr "Îļþ´æÔÚ£¬µ«²»ÊÇĿ¼"
 
-#~ msgid "First argument to cross-reference may not be empty"
-#~ msgstr "½»²æÒýÓõĵÚÒ»¸ö²ÎÊý²»ÄÜΪ¿Õ"
-
-#~ msgid "see "
-#~ msgstr "²ÎÔÄ "
-
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "¡°.¡±»ò¡°,¡±Ö®ºó±ØÐëΪ½»²æÒýÓ㬶ø²»ÊÇ %c"
-
-#~ msgid "First argument to @inforef may not be empty"
-#~ msgstr "@inforef µÄµÚÒ»¸ö²ÎÊý²»ÄÜΪ¿Õ"
-
 #~ msgid "Node:"
 #~ msgstr "½Úµã£º"
 
 #~ msgid "%s: TOC should be here, but it was not found"
 #~ msgstr "%s£ºÄ¿Â¼Ó¦¸ÃÔÚÕâÀµ«Ëü²¢Î´³öÏÖ"
 
-#~ msgid "virtual memory exhausted"
-#~ msgstr "ÐéÄâÄÚ´æºÄ¾¡"
-
 #~ msgid "No `%s.png' or `.jpg', and no extension supplied"
 #~ msgstr "²»ÊÇ¡°%s.png¡±»ò¡°.jpg¡±£¬¶øÇÒûÓиø³öÀ©Õ¹Ãû"
 
@@ -3042,9 +3414,3 @@ msgstr "ÌõÄ¿ %s ³öÏÖÔÚ¾ßÓдÎÒªÃû³ÆµÄÌõÄ¿Ö®ºó"
 
 #~ msgid "`%s' has no Up field"
 #~ msgstr "¡°%s¡±Ã»ÓÐÉϲãÓò"
-
-#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-#~ msgstr "\\%-10[scroll-forward]  ÏòÇ°¹ö¶¯Ò»ÐС£\n"
-
-#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-#~ msgstr "\\%-10[scroll-backward]  Ïòºó¹ö¶¯Ò»ÐС£\n"
diff --git a/Build/source/utils/texinfo/po/zh_TW.gmo b/Build/source/utils/texinfo/po/zh_TW.gmo
index 0b973198cdd..d29e49d8f6a 100644
--- a/Build/source/utils/texinfo/po/zh_TW.gmo
+++ b/Build/source/utils/texinfo/po/zh_TW.gmo
diff --git a/Build/source/utils/texinfo/po/zh_TW.po b/Build/source/utils/texinfo/po/zh_TW.po
index 404a08953a3..8551f16a127 100644
--- a/Build/source/utils/texinfo/po/zh_TW.po
+++ b/Build/source/utils/texinfo/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.1\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2008-04-19 10:05-0700\n"
 "PO-Revision-Date: 2002-03-08 04:56+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -14,132 +14,198 @@ msgstr ""
 "Content-Type: text/plain; charset=Big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: ¿ï¶µ `%s' ¤£©ú\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: ¿ï¶µ `--%s' ¤£¥i§t¦³¤Þ¼Æ\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: ¿ï¶µ `%c%s' ¤£¥i§t¦³¤Þ¼Æ\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: ¿ï¶µ `%s' ¥²¶·§t¦³¤Þ¼Æ\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ¥¼ª¾ªº¿ï¶µ `--%s'\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ¤£¦Xªkªº¿ï¶µ -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: µL®Äªº¿ï¶µ -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ¿ï¶µ¥²¶·§t¦³¤Þ¼Æ -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: ¿ï¶µ `-W %s' ¤£©ú½T\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: ¿ï¶µ `-W %s' ¤£¥i§t¦³¤Þ¼Æ\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, fuzzy, c-format
+msgid "memory exhausted"
+msgstr "µêÀÀ°O¾ÐÅé¯ÓºÉ"
+
+#: info/echo-area.c:283 info/session.c:735
 msgid "Move forward a character"
 msgstr "¦V«e²¾°Ê¤@­Ó¦r¤¸"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:767
 msgid "Move backward a character"
 msgstr "¦V«á²¾°Ê¤@­Ó¦r¤¸"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "²¾¦Ü¥»¦æ¶}ÀY"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "²¾¦Ü¥»¦æµ²§À"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:808
 msgid "Move forward a word"
 msgstr "¦V«e²¾°Ê¤@­Ó¦r"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:881
 msgid "Move backward a word"
 msgstr "¦V«á²¾°Ê¤@­Ó¦r"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "§R°£´å¼Ð¦ì¸mªº¦r¤¸"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "§R°£´å¼Ð¦ì¸m«áªº¦r¤¸"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "¨ú®ø©Îµ²§ô¥Ø«eªº°Ê§@"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "±µ¨ü (©Î±j­¢§¹¦¨) ¥»¦æ"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "¤£§@Âà´«, ´¡¤J¤U¤@­Ó¦r¤¸"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "´¡¤J¥»¦r¤¸"
 
-#: info/echo-area.c:498
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "´¡¤J¤@­Ó TAB ¦r¤¸"
 
-#: info/echo-area.c:505
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "ÅÜ´«´å¼Ð¦ì¸mªº¦r¤¸ªº¶¶§Ç"
 
-#: info/echo-area.c:556
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "¶K¤J¤W¤@¦¸°Å¤Uªº¤º®e"
 
-#: info/echo-area.c:563
+#: info/echo-area.c:562
 msgid "Kill ring is empty"
 msgstr "°Å¶Kï¨S¦³¤º®e"
 
-#: info/echo-area.c:576
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "¶K¤W«e¦¸ªº°Å¤U¤º®e"
 
-#: info/echo-area.c:609
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "§R°£¦Ü¥»¦æµ²§À, ¨Ã¸m¤J°Å¶Kï"
 
-#: info/echo-area.c:622
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶Kï"
 
-#: info/echo-area.c:634
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "§R°£´å¼Ð«áªº³æ¦r, ¨Ã¸m¤J°Å¶Kï"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "§R°£´å¼Ð«eªº³æ¦r, ¨Ã¸m¤J°Å¶Kï"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:867 info/echo-area.c:923
 msgid "No completions"
 msgstr "¨S¦³¥i¯àªº§¹¦¨¥y"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:869
 msgid "Not complete"
 msgstr "¥¼§¹¦¨"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:910
 msgid "List possible completions"
 msgstr "¦C¥X¥i¯àªº§¹¦¨¥y"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:927
 msgid "Sole completion"
 msgstr "³æ¤@ªº§¹¦¨¥y"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:936
 msgid "One completion:\n"
 msgstr "¤@­Ó§¹¦¨¥y:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:937
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d ­Ó§¹¦¨¥y:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1084
 msgid "Insert completion"
 msgstr "´¡¤J§¹¦¨¥y"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1219
 msgid "Building completions..."
 msgstr "«Ø¥ß§¹¦¨¥y¤¤..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1339
 msgid "Scroll the completions window"
 msgstr "±²°Ê§¹¦¨¥y¤À¹jµøµ¡"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "µLªkÅã¥Üµù¸}"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr "±N¥»¸`ÂIªºµù¸}Åã¥Ü¦b¥t¤@­Ó¤À¹jµøµ¡¤º"
 
@@ -148,72 +214,72 @@ msgstr "±N¥»¸`ÂIªºµù¸}Åã¥Ü¦b¥t¤@­Ó¤À¹jµøµ¡¤º"
 msgid "---------- Footnotes ----------"
 msgstr "---------------------\n"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "¦b¥»Àɮתº¯Á¤Þ¤º¬d¸ß¦r¦ê"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "§ä´M¯Á¤Þ¶µ¥Ø..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "§ä¤£¨ì¯Á¤Þ"
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "¯Á¤Þ¶µ¥Ø: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr "²¾°Ê¦Ü¤U¤@­Ó²Å¦X¤W¤@¦¸ªº `\\[index-search] ©R¥Oªº·j´M¶µ¥Ø"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "¨S¦³«e¤@­Ó¯Á¤Þ·j´M¦r¦ê"
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "¨S¦³¯Á¤Þ¶µ¥Ø."
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, fuzzy, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "§ó¦hªº "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr ""
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, fuzzy, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr "§ä¨ì \"%s\" ¦b %s ¤§¤¤. (`\\[next-index-match]' ¹Á¸Õ­n§ä¨ì¤U¤@­Ó¦r¦ê.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, fuzzy, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "±½ºË \"%s\" ªº¯Á¤Þ¤¤..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr ""
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr "¾ã²z©Ò¦³¤wª¾ info Àɤ¤¥]§t¬d¸ß¦r¦êªº¯Á¤Þ, ¨Ã«Ø¥ß¤@­Ó¿ï³æ"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr ""
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -222,108 +288,97 @@ msgstr ""
 "\n"
 "* Menu: ¨ä¯Á¤Þ¤¤¥]§t \"%s\" ªº¸`ÂI:\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:273 info/infokey.c:899
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
-#, fuzzy, c-format
+#: info/info.c:292 info/infokey.c:145 install-info/install-info.c:2091
+#: makeinfo/makeinfo.c:783 util/texindex.c:295
+#, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Copyright (C) %s ¦Û¥Ñ³nÅé°òª÷·| Free Software Foundation, Inc.\n"
-"¥»³nÅé*¤£§@¥ô¦ó«OÃÒ*. ±z¥i¦b GNU ¤½¦@±ÂÅv \n"
-"(GNU General Public License) ªº±ø´Ú¤U´²§G¥»³nÅé.\n"
-"±ýª¾§ó¦hªº¸Ô±¡, ½Ð¬ÝÀɦW¬° COPYING ªºÀÉ®×.\n"
 
-#: info/info.c:498
+#: info/info.c:504
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-
-#: info/info.c:597
-#, fuzzy, c-format
+#: info/info.c:598
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:604
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:611
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:617
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:624
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+
+#: info/info.c:628
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:634
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:641
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"¥Îªk: %s [OPTION]... [MENU-ITEM...]\n"
-"\n"
-"¾\Ū Info ®æ¦¡ªº¤å¥ó.\n"
-"\n"
-"Options:\n"
-" --apropos=SUBJECT        ¦b©Ò¦³ªº¤â¥Uªº¯Á¤Þ¤¤´M§ä SUBJECT.\n"
-" --directory=DIR          ±N DIR ¥[¦Ü INFOPATH ¤¤.\n"
-" --dribble=FILENAME       ±N¨Ï¥ÎªÌªº«öÁä°O¿ý¦b FILENAME ¤¤.\n"
-" --file=FILENAME          «ü©w«ô³Xªº Info ÀÉ®×.\n"
-" --help                   Åã¥Ü¥»¨D§U¸ê°T, µM«áÂ÷¶}.\n"
-" --index-search=STRING    ¸õ¦Ü¯Á¤Þ¶µ¥Ø STRING ©Ò«ü¦Vªº¸`ÂI.\n"
-" --node=NODENAME          «ü©w²Ä¤@­Ó«ô³Xªº Info Àɮפ¤ªº¸`ÂI.\n"
-" --output=FILENAME        ±N¿ï¾Üªº¸`ÂI¿é¥X¦ÜÀÉ®× FILENAME.\n"
-" --restore=FILENAME       ¦ÛÀÉ®× FILENAME Ū¨úªì©lªº«öÁä.\n"
-" --show-options, --usage  ¸õ¦Ü©R¥O¦C¿ï¶µªº¸`ÂI.\n"
-" --subnodes               ¥H»¼°j¤è¦¡¿é¥X¿ï³æ¶µ¥Ø.\n"
-"%s --vi-keys                ¨Ï¥ÎÃþ¦ü vi »P less ªº«öÁä¤è¦¡.\n"
-" --version                Åã¥Üª©¥»¸ê°T, µM«áµ²§ô.\n"
-"\n"
-"¦pªG¦³«D¿ï¶µªº¤Þ¼Æ, ²Ä¤@­Ó«D¿ï¶µªº¤Þ¼Æ¬O¶}©lªº¿ï³æ¶µ¥Ø;\n"
-"¥¦·|³Q¥Î¨Ó·í§@¦b INFOPATH ¤ºªº©Ò¦³ dir Àɮתº·j´M¼Ðªº.\n"
-"¦pªG¨S¦³ªº¸Ü, info ·|²Î¦X©Ò¦³ªº dir ÀÉ®×, µM«áÅã¥Üµ²ªG.\n"
-"³Ñ¤Uªº¤Þ¼Æ·|³Q·í§@¬Û¹ï©ó³Ìªì«ô³X¸`ÂIªº¿ï³æ¶µ¥Øªº¦WºÙ.\n"
-"\n"
-"½d¨Ò:\n"
-"  info                       Åã¥Ü³Ì¤W¼hªº¿ï³æ\n"
-"  info emacs                 ¥H³Ì¤W¼h¤¤ªº emacs ¸`ÂI§@¬°°_ÂI\n"
-"  info emacs buffers         ¥H emacs ¤â¥U¤¤ªº buffers ¸`ÂI§@¬°°_ÂI\n"
-"  info --show-options emacs  ¥H¤¶²Ð emacs ªº°õ¦æ¿ï¶µªº¸`ÂI§@¬°°_ÂI\n"
-"  info -f ./foo.info         Åã¥ÜÀÉ®× ./foo.info, ¤£·j´M¥Ø¿ý\n"
-"\n"
-"µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
-"¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
 
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+#: info/info.c:650 info/infokey.c:918 makeinfo/makeinfo.c:474
+#: util/texindex.c:259
 #, fuzzy
 msgid ""
 "\n"
@@ -335,405 +390,390 @@ msgstr ""
 "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
 "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
 
-#: info/info.c:669
+#: info/info.c:684
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "§ä¤£¨ì `%s' ¸`ÂI."
 
-#: info/info.c:670
+#: info/info.c:685
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "§ä¤£¨ì `(%s)%s' ¸`ÂI."
 
-#: info/info.c:671
+#: info/info.c:686
 msgid "Cannot find a window!"
 msgstr "§ä¤£¨ì¤À¹jµøµ¡!"
 
-#: info/info.c:672
+#: info/info.c:687
 msgid "Point doesn't appear within this window's node!"
 msgstr "´å¼Ð¦ì¸m¤£¦b¥»¤À¹jµøµ¡ªº¸`ÂI¤º!"
 
-#: info/info.c:673
+#: info/info.c:688
 msgid "Cannot delete the last window."
 msgstr "µLªk§R°£¤W¤@­Ó¤À¹jµøµ¡."
 
-#: info/info.c:674
+#: info/info.c:689
 msgid "No menu in this node."
 msgstr "¥»¸`ÂI¨S¦³¿ï³æ."
 
-#: info/info.c:675
+#: info/info.c:690
 msgid "No footnotes in this node."
 msgstr "¥»¸`ÂI¨S¦³µù¸}."
 
-#: info/info.c:676
+#: info/info.c:691
 msgid "No cross references in this node."
 msgstr "¥»¸`ÂI¨S¦³¥æ¤¬°Ñ·Ó."
 
-#: info/info.c:677
+#: info/info.c:692
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "¥»¸`ÂI¨S¦³ `%s' pointer."
 
-#: info/info.c:678
+#: info/info.c:693
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "¥¼ª¾ªº Info ©R¥O `%c'; ¸Õ¸Õ `?' ¥H¨ú±o¨D§U¸ê°T."
 
-#: info/info.c:679
+#: info/info.c:694
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "²×ºÝ¾÷Ãþ«¬ `%s' µLªk¤ä´©°õ¦æ Info ©Ò»Ýªº»Ý¨D."
 
-#: info/info.c:680
+#: info/info.c:695
 msgid "You are already at the last page of this node."
 msgstr "±z¤w¦b¥»¸`ÂIªº³Ì«á¤@­¶."
 
-#: info/info.c:681
+#: info/info.c:696
 msgid "You are already at the first page of this node."
 msgstr "±z¤w¦b¥»¸`ÂIªº²Ä¤@­¶."
 
-#: info/info.c:682
+#: info/info.c:697
 msgid "Only one window."
 msgstr "¥u¦³¤@­Ó¤À¹jµøµ¡."
 
-#: info/info.c:683
+#: info/info.c:698
 msgid "Resulting window would be too small."
 msgstr "²£¥Íªº¤À¹jµøµ¡·|¤Ó¤p."
 
-#: info/info.c:684
+#: info/info.c:699
 msgid "Not enough room for a help window, please delete a window."
 msgstr "³Ñ¤UªºªÅ¶¡¤Ó¤p, µLªk®e¯Ç¨D§U¤À¹jµøµ¡, ½Ð§R°£¤@­Ó¤À¹jµøµ¡."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-#, fuzzy
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
-msgstr "******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
+msgstr ""
 
-#: info/infodoc.c:49
+#: info/infodoc.c:47
 #, fuzzy
-msgid "\\%-10[quit-help]  Quit this help.\n"
+msgid "\\%-10[quit-help]  Close this help window.\n"
 msgstr "  %-10s  µ²§ô¥»¨D§U.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 #, fuzzy
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "  %-10s  ¤@¨Öµ²§ô Info µ{¦¡.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 #, fuzzy
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "  %-10s  °õ¦æ Info «ü¾É½Òµ{.\n"
 
-#: info/infodoc.c:53 info/infodoc.c:102
+#: info/infodoc.c:51
 #, fuzzy
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
-msgstr "----------------------\n"
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr "  %-10s  ©¹«á±²°Ê¤@¦æ.\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:52
 #, fuzzy
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤U¤@­Ó (next)' ¸`ÂI.\n"
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr "  %-10s  ©¹«e±²°Ê¤@¦æ.\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:53
 #, fuzzy
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@­Ó (previous)' ¸`ÂI.\n"
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr "  %-10s  ¦V«á±²°Ê¤@­¶.\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:54
 #, fuzzy
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@¼h (up)' ¸`ÂI.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+msgstr "  %-10s  ¦V«e±²°Ê¤@­¶.\n"
+
+#: info/infodoc.c:55
+#, fuzzy
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº¶}ÀY.\n"
+
+#: info/infodoc.c:56
+#, fuzzy
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªºµ²§À.\n"
 
 #: info/infodoc.c:58
 #, fuzzy
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
-msgstr "              ¿ï¨ú¿ï³æ¶µ¥Ø¥H¿ï¾Ü¥t¤@­Ó¸`ÂI.\n"
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+msgstr "  %-10s  ¸õ¨ì¥»¸`ÂI¤¤ªº¤U¤@­Ó¶W¥»¤å³sµ².\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
 #, fuzzy
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
-msgstr "  %-10s  ¸òÀH¥æ¤¬°Ñ·Ó.  Ū¨ú°Ñ·Óªº¦WºÙ.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
+msgstr "  %-10s  ¸òÀH´å¼Ð¤Uªº¶W¥»¤å³sµ².\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:60
 #, fuzzy
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr "  %-10s  ²¾°Ê¦Ü¥»¤À¹jµøµ¡¤¤, ¤W¤@­ÓÆ[¬Ýªº¸`ÂI.\n"
 
 #: info/infodoc.c:62
 #, fuzzy
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr "  %-10s  ¸õ¨ì¥»¸`ÂI¤¤ªº¤U¤@­Ó¶W¥»¤å³sµ².\n"
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@­Ó (previous)' ¸`ÂI.\n"
 
 #: info/infodoc.c:63
 #, fuzzy
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
-msgstr "  %-10s  ¸õ¨ì¥»¸`ÂI¤¤ªº¤U¤@­Ó¶W¥»¤å³sµ².\n"
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤U¤@­Ó (next)' ¸`ÂI.\n"
 
 #: info/infodoc.c:64
 #, fuzzy
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr "  %-10s  ¸òÀH´å¼Ð¤Uªº¶W¥»¤å³sµ².\n"
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@­Ó (previous)' ¸`ÂI.\n"
 
 #: info/infodoc.c:65
 #, fuzzy
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
-msgstr "  %-10s  ²¾¦Ü `directory' ¸`ÂI.  ¦P `g (DIR)'.\n"
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤U¤@­Ó (next)' ¸`ÂI.\n"
 
 #: info/infodoc.c:66
 #, fuzzy
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr "  %-10s  ²¾¦Ü Top ¸`ÂI.  ¦P `g TOP'.\n"
+msgid "\\%-10[up-node]  Go up one level.\n"
+msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@¼h (up)' ¸`ÂI.\n"
 
-#: info/infodoc.c:68 info/infodoc.c:116
+#: info/infodoc.c:67
 #, fuzzy
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
-msgstr "---------------------\n"
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªºµ²§À.\n"
+
+#: info/infodoc.c:68
+#, fuzzy
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
+msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªºµ²§À.\n"
 
 #: info/infodoc.c:70
 #, fuzzy
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº¶}ÀY.\n"
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr "  %-10s  ¬D¿ï¸`ÂI¥Ø¿ý¤¤ªº²Ä¤@­Ó...²Ä¤E­Ó¶µ¥Ø.\n"
 
 #: info/infodoc.c:71
 #, fuzzy
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªºµ²§À.\n"
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr "  %-10s  ¬D¿ï¸`ÂI¥Ø¿ýªº³Ì«á¤@­Ó¶µ¥Ø.\n"
 
 #: info/infodoc.c:72
 #, fuzzy
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "  %-10s  ©¹«e±²°Ê¤@¦æ.\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr "  %-10s  ¥H¦WºÙ¿ï¨ú¿ï³æ¶µ¥Ø.\n"
 
 #: info/infodoc.c:73
 #, fuzzy
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "  %-10s  ©¹«á±²°Ê¤@¦æ.\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr "  %-10s  ¸òÀH¥æ¤¬°Ñ·Ó.  Ū¨ú°Ñ·Óªº¦WºÙ.\n"
 
 #: info/infodoc.c:74
 #, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "  %-10s  ¦V«e±²°Ê¤@­¶.\n"
-
-#: info/infodoc.c:75
-#, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "  %-10s  ¦V«á±²°Ê¤@­¶.\n"
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+msgstr "  %-10s  ²¾°Ê¨ì«ü©w¦WºÙªº¸`ÂI.\n"
 
-#: info/infodoc.c:77 info/infodoc.c:125
+#: info/infodoc.c:76
 #, fuzzy
-msgid ""
-"Other commands:\n"
-"---------------\n"
-msgstr "---------------\n"
+msgid "\\%-10[search]  Search forward for a specified string.\n"
+msgstr "  %-10s  ¦b¥» Info Àɤ¤, ¦V«e·j´M¤@­Ó«ü©wªº¦r¦ê,\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:77
 #, fuzzy
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "  %-10s  ¬D¿ï¸`ÂI¥Ø¿ý¤¤ªº²Ä¤@­Ó...²Ä¤E­Ó¶µ¥Ø.\n"
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@­Ó (previous)' ¸`ÂI.\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:78
 #, fuzzy
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "  %-10s  ¬D¿ï¸`ÂI¥Ø¿ýªº³Ì«á¤@­Ó¶µ¥Ø.\n"
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
+msgstr "  %-10s  ¦b¥» Info Àɪº¯Á¤Þ¶µ¥Ø¤¤, ·j´M¤@­Ó«ü©wªº¦r¦ê,\n"
 
-#: info/infodoc.c:81
+#: info/infodoc.c:79
 #, fuzzy
 msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr "              ¨Ã¥B¿ï¾Ü²Ä¤@­Ó·j´M¨ìªº¶µ¥Ø©Ò°Ñ·Óªº¸`ÂI.\n"
 
-#: info/infodoc.c:83
-#, fuzzy
-msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
-msgstr "              ±z¤]¥i¥H¥]§tÀɦW, ¦p: (ÀɦW)¸`ÂI¦W.\n"
-
-#: info/infodoc.c:85
+#: info/infodoc.c:81
 #, fuzzy
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
-msgstr "              ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+msgstr "¨ú®ø¥Ø«eªº§@·~"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 #, fuzzy
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
-msgstr "              ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr "******************************\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  µ²§ô¥»¨D§U.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  ¤@¨Öµ²§ô Info µ{¦¡.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  °õ¦æ Info «ü¾É½Òµ{.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤U¤@­Ó (next)' ¸`ÂI.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@­Ó (previous)' ¸`ÂI.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@¼h (up)' ¸`ÂI.\n"
 
-#: info/infodoc.c:107
-#, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  ¥H¦WºÙ¿ï¨ú¿ï³æ¶µ¥Ø.\n"
-
-#: info/infodoc.c:108
-msgid "              Picking a menu item causes another node to be selected.\n"
+#: info/infodoc.c:101
+#, fuzzy, c-format
+msgid ""
+"  %-10s  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
 msgstr "              ¿ï¨ú¿ï³æ¶µ¥Ø¥H¿ï¾Ü¥t¤@­Ó¸`ÂI.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  ¸òÀH¥æ¤¬°Ñ·Ó.  Ū¨ú°Ñ·Óªº¦WºÙ.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  ²¾°Ê¦Ü¥»¤À¹jµøµ¡¤¤, ¤W¤@­ÓÆ[¬Ýªº¸`ÂI.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  ¸õ¨ì¥»¸`ÂI¤¤ªº¤U¤@­Ó¶W¥»¤å³sµ².\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  ¸òÀH´å¼Ð¤Uªº¶W¥»¤å³sµ².\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  ²¾¦Ü `directory' ¸`ÂI.  ¦P `g (DIR)'.\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  ²¾¦Ü Top ¸`ÂI.  ¦P `g TOP'.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:110
+#, fuzzy
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr "---------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  ¦V«e±²°Ê¤@­¶.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  ¦V«á±²°Ê¤@­¶.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº¶}ÀY.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªºµ²§À.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  ©¹«e±²°Ê¤@¦æ.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  ©¹«á±²°Ê¤@¦æ.\n"
 
-#: info/infodoc.c:127
-#, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:119
+#, fuzzy
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr "---------------\n"
+
+#: info/infodoc.c:121
+#, fuzzy, c-format
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr "  %-10s  ¬D¿ï¸`ÂI¥Ø¿ý¤¤ªº²Ä¤@­Ó...²Ä¤E­Ó¶µ¥Ø.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  ¬D¿ï¸`ÂI¥Ø¿ýªº³Ì«á¤@­Ó¶µ¥Ø.\n"
 
-#: info/infodoc.c:129
-#, c-format
+#: info/infodoc.c:125
+#, fuzzy, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr "  %-10s  ¦b¥» Info Àɪº¯Á¤Þ¶µ¥Ø¤¤, ·j´M¤@­Ó«ü©wªº¦r¦ê,\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr "              ¨Ã¥B¿ï¾Ü²Ä¤@­Ó·j´M¨ìªº¶µ¥Ø©Ò°Ñ·Óªº¸`ÂI.\n"
 
-#: info/infodoc.c:131
-#, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  ²¾°Ê¨ì«ü©w¦WºÙªº¸`ÂI.\n"
-
-#: info/infodoc.c:132
+#: info/infodoc.c:127
+#, fuzzy, c-format
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr "              ±z¤]¥i¥H¥]§tÀɦW, ¦p: (ÀɦW)¸`ÂI¦W.\n"
 
-#: info/infodoc.c:133
+#: info/infodoc.c:129
 #, fuzzy, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  ¦b¥» Info Àɤ¤, ¦V«e·j´M¤@­Ó«ü©wªº¦r¦ê,\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr "              ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
 
-#: info/infodoc.c:135
+#: info/infodoc.c:131
 #, fuzzy, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  ¦b¥» Info Àɤ¤, ¦V«á·j´M¤@­Ó«ü©wªº¦r¦ê,\n"
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr "              ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "¥Ø«eªº·j´M¸ô®|¬°:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -741,7 +781,7 @@ msgstr ""
 "¦b Info ¤À¹jµøµ¡¤¤¥i¥Îªº«ü¥O:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -749,7 +789,7 @@ msgstr ""
 "¦^À³°Ï¤¤¥i¥Îªº«ü¥O:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, fuzzy, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -758,7 +798,7 @@ msgstr ""
 "¥H¤Uªº«ü¥O, ¥u¥i¸g¥Ñ M-x °õ¦æ:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 #, fuzzy
 msgid ""
 "The following commands cannot be invoked at all:\n"
@@ -767,82 +807,72 @@ msgstr ""
 "¥H¤Uªº«ü¥O, ¥u¥i¸g¥Ñ M-x °õ¦æ:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr "--- ¨Ï¥Î `\\[history-node]' ©Î `\\[kill-node]' Â÷¶}---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "Åã¥Ü¨D§U°T®§"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "«ô³X Info ¸`ÂI `(info)Help'"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "¦C¥X KEY ªº¤å¥ó"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "´y­z«öÁä«ü¥O: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s ¥¼©w¸q."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s ¥¼©w¸q."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s ©w¸q¦¨ %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1145
 msgid "Show what to type to execute a given command"
 msgstr "Åã¥Ü°õ¦æ¬Y©R¥O©Ò»ÝÁä¤Jªº«öÁä"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1149
 msgid "Where is command: "
 msgstr ""
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1171
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' ¥¼Ãìµ²¨ì¥ô¦ó«öÁä"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1178
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s ¥u¯à¸g¥Ñ %s °õ¦æ."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1182
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s ¥i¸g¥Ñ %s °õ¦æ."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1187
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "¨S¦³¦W¬° `%s' ªº¨ç¦¡"
 
-#: info/infokey.c:145
-#, c-format
+#: info/infodoc.c:96
+#, fuzzy
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
-msgstr ""
-"Copyright (C) %s ¦Û¥Ñ³nÅé°òª÷·| Free Software Foundation, Inc.\n"
-"¥»³nÅé*¤£§@¥ô¦ó«OÃÒ*. ±z¥i¦b GNU ¤½¦@±ÂÅv \n"
-"(GNU General Public License) ªº±ø´Ú¤U´²§G¥»³nÅé.\n"
-"±ýª¾§ó¦hªº¸Ô±¡, ½Ð¬ÝÀɦW¬° COPYING ªºÀÉ®×.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr "----------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -944,95 +974,95 @@ msgid ""
 "  --version            display version information and exit.\n"
 msgstr ""
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr ""
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr ""
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr ""
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "Ū¨ú Info ©R¥Oªº¦WºÙ, ¨Ã¥B´y­z¥¦"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "´y­z©R¥O: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "¦b¦^À³°Ï¤¤Åª¨ú©R¥O¦WºÙ, ¨Ã¥B°õ¦æ¥¦"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "µLªk¦b³o¸Ì°õ¦æ `echo-area' ©R¥O."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, fuzzy, c-format
 msgid "Undefined command: %s"
 msgstr "¥¼ª¾ªº©R¥O `%s'"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "³]©wÅã¥Üµøµ¡ªº°ª«×"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "³]©w¿Ã¹õ°ª«×¬° (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "µLªk³B²zÀÉ®× %s.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1044,7 +1074,7 @@ msgstr ""
 "  (ÀÉ®×)¸`ÂI                        ¦æ ¼Æ   ¤j¤p    ¥]  §t  ÀÉ  ®×\n"
 "  ----------                        -----   ----   ---------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1052,24 +1082,29 @@ msgstr ""
 "³o¬O±z³Ìªñ«ô³X¹Lªº¸`ÂI¿ï³æ.\n"
 "¦Û¥»¿ï³æ¿ï¨ú¤@¶µ, ©Î¬O¦b¥t¤@­Ó¤À¹jµøµ¡¨Ï¥Î `\\[history-node]' ©R¥O.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "²£¥Í¤@­Ó¤À¹jµøµ¡, ¥]§t©Ò¦³³Ìªñ«ô³X¹Lªº¸`ÂI¿ï³æ"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "¿ï¨ú¤§«e¦b¥i¨£¤À¹jµøµ¡«ô³X¹Lªº¸`ÂI"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "¿ï¨ú«ô³X¹Lªº¸`ÂI: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2443
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "¥æ¤¬°Ñ·Ó¤£¨£¤F! (%s)."
 
-#: info/session.c:162
+#: info/search.c:161
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1078,506 +1113,510 @@ msgstr ""
 "Åwªï¨Ï¥Î Info ª©¥» %s. Áä¤J \\[get-help-window] ¥H¨ú±o¨D§U¸ê°T, \\[menu-"
 "item] ¥H¨ú±o¿ï³æ¶µ¥Ø."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "²¾¦Ü¤U¤@¦æ"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "²¾¦Ü¤W¤@¦æ"
 
-#: info/session.c:650
+#: info/session.c:696
 msgid "Move to the end of the line"
 msgstr "²¾¦Ü¥»¦æµ²§À"
 
-#: info/session.c:670
+#: info/session.c:716
 msgid "Move to the start of the line"
 msgstr "²¾¦Ü¥»¦æ¶}ÀY"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1007
 msgid "Next"
 msgstr "¤U¤@­Ó"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "¸òÀH¤U¤@­Ó¸`ÂI..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "¿ï¨ú²Ä¤@­Ó¿ï³æ¶µ¥Ø..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "¿ï¨ú¤U¤@­Ó¸`ÂI..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "©¹¤W¤@¼h²¾°Ê %d ¦¸, µM«á©¹¤U¤@­Ó¤è¦V²¾°Ê."
-
-#: info/session.c:988
+#: info/session.c:1023 info/session.c:1148
 msgid "No more nodes within this document."
 msgstr "¥»¤å¥ó¤¤¨S¦³§ó¦hªº¸`ÂI¤F."
 
-#: info/session.c:1011
+#: info/session.c:1174
 msgid "No `Prev' for this node."
 msgstr "¥»¸`ÂI¨S¦³ `¤W¤@­Ó (Prev)' ¸`ÂI."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "¦V¥»¤À¹jµøµ¡ªº ¤W¤@­Ó (Prev) ¸`ÂI²¾°Ê."
-
-#: info/session.c:1030
+#: info/session.c:1194
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "¦b¥»¤å¥ó¤¤, ¥»¸`ÂI¨S¦³ `¤W¤@­Ó (Prev)' ¸`ÂI©Î `¤W¤@¼h (Up)' ¸`ÂI."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "¦V¥»¤À¹jµøµ¡ªº¤W¤@¼h¸`ÂI²¾°Ê."
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "²¾¦Ü«e¤@­Ó¸`ÂIªº³Ì«á¤@­Ó¥Ø¿ý¶µ¥Ø."
-
-#: info/session.c:1095
+#: info/session.c:1256
 msgid "Move forwards or down through node structure"
 msgstr "¦b¸`ÂIµ²ºc¤¤, ©¹«e©Î©¹¤U²¾°Ê"
 
-#: info/session.c:1111
+#: info/session.c:1272
 msgid "Move backwards or up through node structure"
 msgstr "¦b¸`ÂIµ²ºc¤¤, ©¹«á©Î©¹¤U²¾°Ê"
 
-#: info/session.c:1205
+#: info/session.c:1373
 msgid "Scroll forward in this window"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê"
 
-#: info/session.c:1213
+#: info/session.c:1381
 msgid "Scroll forward in this window and set default window size"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
 
-#: info/session.c:1221
+#: info/session.c:1389
 #, fuzzy
 msgid "Scroll forward in this window staying within node"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê"
 
-#: info/session.c:1229
+#: info/session.c:1397
 #, fuzzy
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
 
-#: info/session.c:1237
+#: info/session.c:1405
 msgid "Scroll backward in this window"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê"
 
-#: info/session.c:1245
+#: info/session.c:1413
 msgid "Scroll backward in this window and set default window size"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
 
-#: info/session.c:1254
+#: info/session.c:1422
 #, fuzzy
 msgid "Scroll backward in this window staying within node"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê"
 
-#: info/session.c:1262
+#: info/session.c:1430
 #, fuzzy
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
 
-#: info/session.c:1270
+#: info/session.c:1438
 msgid "Move to the start of this node"
 msgstr "²¾¦Ü¥»¸`ÂIªº°_ÂI"
 
-#: info/session.c:1277
+#: info/session.c:1445
 msgid "Move to the end of this node"
 msgstr "²¾¦Ü¥»¸`ÂIªºµ²§À"
 
-#: info/session.c:1284
+#: info/session.c:1452
 msgid "Scroll down by lines"
 msgstr "¤@¦æ¦æ¦V¤U±²°Ê"
 
-#: info/session.c:1301
+#: info/session.c:1469
 msgid "Scroll up by lines"
 msgstr "¤@¦æ¦æ¦V¤W±²°Ê"
 
-#: info/session.c:1319
+#: info/session.c:1487
 msgid "Scroll down by half screen size"
 msgstr "¦V¤U±²°Ê¥b­Ó¿Ã¹õªº¤j¤p"
 
-#: info/session.c:1345
+#: info/session.c:1513
 msgid "Scroll up by half screen size"
 msgstr "¦V¤W±²°Ê¥b­Ó¿Ã¹õªº¤j¤p"
 
-#: info/session.c:1374
+#: info/session.c:1542
 msgid "Select the next window"
 msgstr "¿ï¾Ü¤U¤@­Ó¤À¹jµøµ¡"
 
-#: info/session.c:1413
+#: info/session.c:1581
 msgid "Select the previous window"
 msgstr "¿ï¾Ü«e¤@­Ó¤À¹jµøµ¡"
 
-#: info/session.c:1464
+#: info/session.c:1632
 msgid "Split the current window"
 msgstr "¤À¹j¥Ø«eªº¤À¹jµøµ¡"
 
-#: info/session.c:1545
+#: info/session.c:1713
 msgid "Delete the current window"
 msgstr "§R°£¥Ø«eªº¤À¹jµøµ¡"
 
-#: info/session.c:1553
+#: info/session.c:1721
 msgid "Cannot delete a permanent window"
 msgstr "µLªk§R°£©T©wªº¤À¹jµøµ¡"
 
-#: info/session.c:1585
+#: info/session.c:1753
 msgid "Delete all other windows"
 msgstr "§R°£©Ò¦³¨ä¥¦ªº¤À¹jµøµ¡"
 
-#: info/session.c:1631
+#: info/session.c:1799
 msgid "Scroll the other window"
 msgstr "±²°Ê¥t¤@­Ó¤À¹jµøµ¡"
 
-#: info/session.c:1652
+#: info/session.c:1820
 msgid "Scroll the other window backward"
 msgstr "¦V«á±²°Ê¥t¤@­Ó¤À¹jµøµ¡"
 
-#: info/session.c:1658
+#: info/session.c:1826
 msgid "Grow (or shrink) this window"
 msgstr "ÂX¤j (©ÎÁY¤p) ³o­Ó¤À¹jµøµ¡"
 
-#: info/session.c:1669
+#: info/session.c:1837
 msgid "Divide the available screen space among the visible windows"
 msgstr "¦b¥i¥Îªº¿Ã¹õªÅ¶¡¤¤, ¥­§¡¤À³Î©Ò¦³ªº¥i¨£¤À¹jµøµ¡"
 
-#: info/session.c:1676
+#: info/session.c:1844
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "¤Á´«¥Ø«e¤À¹jµøµ¡ªº¦Û°Ê´«¦æª¬ºA"
 
-#: info/session.c:1848
+#: info/session.c:1851
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1855
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1856
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2027
 msgid "Select the Next node"
 msgstr "¿ï¨ú ¤U¤@­Ó ¸`ÂI"
 
-#: info/session.c:1856
+#: info/session.c:2035
 msgid "Select the Prev node"
 msgstr "¿ï¨ú «e¤@­Ó ¸`ÂI"
 
-#: info/session.c:1864
+#: info/session.c:2043
 msgid "Select the Up node"
 msgstr "¿ï¨ú ¤W¤@¼h ¸`ÂI"
 
-#: info/session.c:1871
+#: info/session.c:2050
 msgid "Select the last node in this file"
 msgstr "¿ï¨ú¥»Àɮתº³Ì«á¤@­Ó¸`ÂI"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2077 info/session.c:2110
 msgid "This window has no additional nodes"
 msgstr "¥»¤À¹jµøµ¡¨S¦³ÃB¥~ªº¸`ÂI"
 
-#: info/session.c:1904
+#: info/session.c:2083
 msgid "Select the first node in this file"
 msgstr "¿ï¨ú¥»Àɮתº²Ä¤@­Ó¸`ÂI"
 
-#: info/session.c:1938
+#: info/session.c:2117
 msgid "Select the last item in this node's menu"
 msgstr "¿ï¨ú¥»¸`ÂI¿ï³æ¤¤, ³Ì«á¤@­Ó¶µ¥Ø"
 
-#: info/session.c:1944
+#: info/session.c:2123
 msgid "Select this menu item"
 msgstr "¿ï¾Ü³o¤@­Ó¿ï³æ¶µ¥Ø"
 
-#: info/session.c:1977
+#: info/session.c:2156
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "¥»¿ï³æ¤¤¨S¦³ %d ­Ó¶µ¥Ø"
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2350 info/session.c:2351
 #, c-format
 msgid "Menu item (%s): "
 msgstr "¿ï³æ¶µ¥Ø (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2354
 msgid "Menu item: "
 msgstr "¿ï³æ¶µ¥Ø: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2361 info/session.c:2362
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "¸òÀH¥æ¤¬°Ñ·Ó (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2365
 msgid "Follow xref: "
 msgstr "¸òÀH¥æ¤¬°Ñ·Ó: "
 
-#: info/session.c:2315
+#: info/session.c:2494
 msgid "Read a menu item and select its node"
 msgstr "Ū¨ú¤@­Ó¿ï³æ¶µ¥Ø, ¨Ã¥B¿ï¾Ü¥¦ªº¸`ÂI"
 
-#: info/session.c:2323
+#: info/session.c:2502
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Ū¨ú¤@­Óµù¸}©Î¥æ¤¬°Ñ·Ó, ¨Ã¥B¿ï¾Ü¥¦ªº¸`ÂI"
 
-#: info/session.c:2329
+#: info/session.c:2508
 msgid "Move to the start of this node's menu"
 msgstr "²¾¦Ü¥»¸`ÂIªº¿ï³æ¶}ÀY"
 
-#: info/session.c:2353
+#: info/session.c:2532
 msgid "Visit as many menu items at once as possible"
 msgstr "¾¨¥i¯à¤@¦¸«ô³X³Ì¦h­Ó¿ï³æ¶µ¥Ø"
 
-#: info/session.c:2381
+#: info/session.c:2560
 msgid "Read a node name and select it"
 msgstr "Ū¨ú¸`ÂI¦WºÙ, ¨Ã¥B¿ï¾Ü¥¦"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2615 info/session.c:2620
 msgid "Goto node: "
 msgstr "¸õ¦Ü¸`ÂI: "
 
-#: info/session.c:2505
+#: info/session.c:2684
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "¸`ÂI `%s' ¤¤¨S¦³¿ï³æ."
 
-#: info/session.c:2551
+#: info/session.c:2730
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "¿ï³æ¶µ¥Ø `%s' ¤£¦b¸`ÂI `%s' ¤¤."
 
-#: info/session.c:2581
+#: info/session.c:2760
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "³Q°Ñ·Óªº¸`ÂI `%s' ¦b `%s' ¤¤§ä¤£¨ì."
 
-#: info/session.c:2631
+#: info/session.c:2810
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Ū¨ú¦Û dir ¶}©lªº¸`ÂI±ø¦C, ¨Ã¥B¸òÀH¥¦­Ì"
 
-#: info/session.c:2633
+#: info/session.c:2812
 msgid "Follow menus: "
 msgstr "¸òÀH¿ï³æ: "
 
-#: info/session.c:2826
+#: info/session.c:3005
 msgid "Find the node describing program invocation"
 msgstr "§ä´M´y­zµ{¦¡°õ¦æ¤èªkªº¸`ÂI"
 
-#: info/session.c:2828
+#: info/session.c:3007
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "§ä´M [%s] ªº°õ¦æ¤èªk¸`ÂI: "
 
-#: info/session.c:2866
+#: info/session.c:3045
 msgid "Read a manpage reference and select it"
 msgstr "Ū¨ú½u¤W¤â¥U (manpage) ªº°Ñ·Ó, ¨Ã¥B¿ï¾Ü¥¦"
 
-#: info/session.c:2870
+#: info/session.c:3049
 msgid "Get Manpage: "
 msgstr "¨ú±o½u¤W¤â¥U (Manpage): "
 
-#: info/session.c:2900
+#: info/session.c:3079
 msgid "Select the node `Top' in this file"
 msgstr "¿ï¨ú¥»Àɮפ¤ªº `Top' ¸`ÂI"
 
-#: info/session.c:2906
+#: info/session.c:3085
 msgid "Select the node `(dir)'"
 msgstr "¿ï¨ú¸`ÂI `(dir)'"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3102 info/session.c:3104
 #, c-format
 msgid "Kill node (%s): "
 msgstr "§R°£¸`ÂI (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3156
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "µLªk§R°£¸`ÂI `%s'"
 
-#: info/session.c:2987
+#: info/session.c:3166
 msgid "Cannot kill the last node"
 msgstr "µLªk§R°£¤W¤@­Ó¸`ÂI"
 
-#: info/session.c:3073
+#: info/session.c:3252
 msgid "Select the most recently selected node"
 msgstr "¿ï¾Ü³Ìªñ¤@¦¸³Q¿ï¾Üªº¸`ÂI"
 
-#: info/session.c:3079
+#: info/session.c:3258
 msgid "Kill this node"
 msgstr "§R°£¥»¸`ÂI"
 
-#: info/session.c:3087
+#: info/session.c:3266
 msgid "Read the name of a file and select it"
 msgstr "Ū¨úÀɮצWºÙ, µM«á¿ï¨ú¥¦"
 
-#: info/session.c:3091
+#: info/session.c:3270
 msgid "Find file: "
 msgstr "§ä´MÀÉ®×: "
 
-#: info/session.c:3108
+#: info/session.c:3287
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "µLªk§ä¨ì `%s'."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3330 info/session.c:3448
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3344 info/session.c:3466 info/session.c:3526
 msgid "Done."
 msgstr "§¹¦¨."
 
-#: info/session.c:3220
+#: info/session.c:3399
 #, c-format
 msgid "Writing node %s..."
 msgstr "¼g¤J¸`ÂI %s ¤¤..."
 
-#: info/session.c:3296
+#: info/session.c:3475
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "±N¥»¸`ÂIªº¤º®e, ¸g¥ÑºÞ¹D (pipe) °e¦Ü INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3510
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
 
-#: info/session.c:3337
+#: info/session.c:3516
 #, c-format
 msgid "Printing node %s..."
 msgstr "¦C¦L¸`ÂI %s ¤¤..."
 
-#: info/session.c:3567
+#: info/session.c:3733
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3738
+#, fuzzy
+msgid "Search continued from the beginning of the document."
+msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶Kï"
+
+#: info/session.c:3755
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "·j´M¤lÀÉ®× %s ..."
 
-#: info/session.c:3619
+#: info/session.c:3812
 msgid "Read a string and search for it case-sensitively"
 msgstr "Ū¨ú¤@­Ó¦r¦ê, µM«á¥H°Ï¤À¤j¤p¼g¤è¦¡·j´M"
 
-#: info/session.c:3626
+#: info/session.c:3819
 msgid "Read a string and search for it"
 msgstr "Ū¨ú¤@­Ó¦r¦ê, µM«á·j´M"
 
-#: info/session.c:3634
+#: info/session.c:3827
 msgid "Read a string and search backward for it"
 msgstr "Ū¨ú¤@­Ó¦r¦ê, µM«á¦V«á·j´M"
 
-#: info/session.c:3670 info/session.c:3677
-#, c-format
-msgid "%s%sfor string [%s]: "
+#: info/session.c:3863 info/session.c:3869
+#, fuzzy, c-format
+msgid "%s%s%s [%s]: "
 msgstr "%s%s [%s]: "
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
+#: info/session.c:3864 info/session.c:3870
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:3865 info/session.c:3871
+#, fuzzy
+msgid " case-sensitively"
+msgstr ", ¥H°Ï¤À¤j¤p¼gªº¤è¦¡"
+
+#: info/session.c:3866 info/session.c:3872
+#, fuzzy
+msgid " backward"
 msgstr "¦V«á·j´M¦r¦ê"
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:3870
 msgid "Search"
 msgstr "·j´M¦r¦ê"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr ", ¥H°Ï¤À¤j¤p¼gªº¤è¦¡"
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:3911
 msgid "Search failed."
 msgstr "·j´M¥¢±Ñ."
 
-#: info/session.c:3736
+#: info/session.c:3929
 msgid "Repeat last search in the same direction"
 msgstr "¥H¦P¼Ëªº·j´M¤è¦V­«ÂФW¦¸ªº·j´M"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:3932 info/session.c:3942
 msgid "No previous search string"
 msgstr "¨S¦³«e¤@¦¸ªº·j´M¦r¦ê"
 
-#: info/session.c:3746
+#: info/session.c:3939
 msgid "Repeat last search in the reverse direction"
 msgstr "¥H¬Û¤Ïªº·j´M¤è¦V­«ÂФW¦¸ªº·j´M"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:3958 info/session.c:3964
 msgid "Search interactively for a string as you type it"
 msgstr "¥H¤¬°Ê¤è¦¡, Ãä¿é¤J¦r¦êÃä·j´M"
 
-#: info/session.c:3851
+#: info/session.c:4044
+#, fuzzy
+msgid "Regexp I-search backward: "
+msgstr "¤Ï¦V¤¬°Ê·j´M: "
+
+#: info/session.c:4045
 msgid "I-search backward: "
 msgstr "¤Ï¦V¤¬°Ê·j´M: "
 
-#: info/session.c:3853
+#: info/session.c:4047
+#, fuzzy
+msgid "Regexp I-search: "
+msgstr "¤¬°Ê·j´M: "
+
+#: info/session.c:4048
 msgid "I-search: "
 msgstr "¤¬°Ê·j´M: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4073 info/session.c:4075
 msgid "Failing "
 msgstr "¥¢±Ñ "
 
-#: info/session.c:4340
+#: info/session.c:4560
 msgid "Move to the previous cross reference"
 msgstr "²¾°Ê¦Ü«e¤@­Ó¥æ¤¬°Ñ·Ó"
 
-#: info/session.c:4349
+#: info/session.c:4578
 msgid "Move to the next cross reference"
 msgstr "²¾°Ê¦Ü¤U¤@­Ó¥æ¤¬°Ñ·Ó"
 
-#: info/session.c:4359
+#: info/session.c:4600
 msgid "Select reference or menu item appearing on this line"
 msgstr "¿ï¾Ü¥X²{¦b¥»¦æªº°Ñ·Ó©Î¿ï³æ¶µ¥Ø"
 
-#: info/session.c:4382
+#: info/session.c:4623
 msgid "Cancel current operation"
 msgstr "¨ú®ø¥Ø«eªº§@·~"
 
-#: info/session.c:4389
+#: info/session.c:4630
 msgid "Quit"
 msgstr "µ²§ô"
 
-#: info/session.c:4398
+#: info/session.c:4639
 msgid "Move the cursor to a specific line of the window"
 msgstr "²¾°Ê´å¼Ð¦Ü¤À¹jµøµ¡¤¤ªº«ü©w¦ì¸m"
 
-#: info/session.c:4430
+#: info/session.c:4671
 msgid "Redraw the display"
 msgstr "­«Ã¸µe­±"
 
-#: info/session.c:4467
+#: info/session.c:4708
 msgid "Quit using Info"
 msgstr "µ²§ô¨Ï¥Î Info"
 
-#: info/session.c:4480
+#: info/session.c:4721
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
 
-#: info/session.c:4491
+#: info/session.c:4732
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "¥¼ª¾ªº©R¥O (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4735
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" ¤£¦Xªk"
 
-#: info/session.c:4495
+#: info/session.c:4736
 #, fuzzy, c-format
 msgid "`%s' is invalid"
 msgstr "\"%s\" ¤£¦Xªk"
 
-#: info/session.c:4709
+#: info/session.c:4950
 msgid "Add this digit to the current numeric argument"
 msgstr "±N¥»¼Æ¦r¥[¦Ü¥Ø«eªº¼Æ­È¤Þ¼Æ"
 
-#: info/session.c:4718
+#: info/session.c:4959
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "¶}©l¥Ø«eªº¼Æ­È¤Þ¼Æ (©Î¬O­¼¥H 4)"
 
-#: info/session.c:4733
+#: info/session.c:4974
 msgid "Internally used by \\[universal-argument]"
 msgstr "¦b¤º³¡³Q \\[universal-argument] ¨Ï¥Î"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: ¯ÓºÉµêÀÀ°O¾ÐÅé!\n"
@@ -1610,521 +1649,671 @@ msgstr "³]©w¦b \"On\" ®É, ²Å¦X·j´M¦r¦êªº³¡¥÷·|³Q¼Ð¥Ü°_¨Ó"
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr "±±¨î¦b¸`ÂIªºµ²§À®É, ±²°Ê·|¦³¤°»ò¤ÏÀ³"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "±±¨î·í´å¼Ð²¾°Ê¦Ü¤À¹jµøµ¡¥~®É, ±²°Êªº¦æ¼Æ"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "·í³]©w¦b \"On\" ®É, Info ¥i±µ¨ü¨ÃÅã¥Ü ISO Latin ¦r¤¸"
 
-#: info/variables.c:74
+#: info/variables.c:81
+#, fuzzy
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr "±±¨î¦b¸`ÂIªºµ²§À®É, ±²°Ê·|¦³¤°»ò¤ÏÀ³"
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "¸ÑÄÀÅܼƪº¥Îªk"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "´y­zÅܼÆ: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "³]©w Info Åܼƪº¼Æ­È"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "³]©wÅܼÆ: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "³]©w %s ªº¼Æ­È (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "³]©w %s ªº¼Æ­È (%s): "
 
-#: info/window.c:1138
+#: info/window.c:1150
 msgid "--*** Tags out of Date ***"
 msgstr ""
 
-#: info/window.c:1149
+#: info/window.c:1161
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), ¦æ¼Æ  ----, "
 
-#: info/window.c:1156
+#: info/window.c:1168
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, ¦@ %d ¦æ --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1172
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, ¦@ %d ¦æ --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1179
 #, c-format
 msgid " Subfile: %s"
 msgstr " ¤lÀÉ®×: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: ¿ï¶µ `%s' ¤£©ú\n"
+msgid "%s: warning: "
+msgstr "%s: ĵ§i: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: ¿ï¶µ `--%s' ¤£¥i§t¦³¤Þ¼Æ\n"
+msgid " for %s"
+msgstr ""
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: ¿ï¶µ `%c%s' ¤£¥i§t¦³¤Þ¼Æ\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\t¸Õ¸Õ Try `%s --help' ¥H¨ú±o§¹¾ãªº°Ñ¼Æ¦Cªí.\n"
+
+#: install-info/install-info.c:508
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr "¥Îªk: %s [OPTION]... FILE...\n"
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
+
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+#, fuzzy
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
+"¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:597
+#, fuzzy, c-format
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"³o¬OÀÉ®× .../info/dir, ¸Ì­±¥]§t¦³ Info ¿ï³æ¬[ºc¤¤³Ì¤W¼hªº¸`ÂI,\n"
+"ºÙ¬° (dir) TOP.\n"
+"±z²Ä¤@¦¸°õ¦æ Info ®É, ±z·|±q³o¸Ì¶}©l·j´M©Ò¶·ªº¸`ÂI.\n"
+"\n"
+"%s\t³o¬O INFO ¿ï³æ¾ðªº³Ì¤W¼h\n"
+"\n"
+"  ³o¸Ì (Directory ¸`ÂI) ´£¨Ñ¥D­n¶µ¥Øªº¿ï³æ.\n"
+"  Áä¤J \"q\" Â÷¶}, \"?\" ¦C¥X©Ò¦³ªº Info «ü¥O, \"d\" ¦^¨ì³o¸Ì,\n"
+"  \"h\" Æ[¬Ýµ¹ªì¦¸¨Ï¥ÎªÌªº¤Jªù«ü¤Þ,\n"
+"  \"mEmacs<Return>\" ¥iÆ[¬Ý Emacs ¤â¥U, µ¥µ¥.\n"
+"\n"
+"  ¦b Emacs ¤¤, ±z¥i¥H¦b¿ï³æ¶µ¥Ø©Î¥æ¤¬°Ñ·Ó¤W, ³æÀ»·Æ¹«ªº²Ä 2 Áä\n"
+"  ¥H¿ï¾Ü¥¦­Ì.\n"
+"\n"
+"* Menu:\n"
+
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: ¿ï¶µ `%s' ¥²¶·§t¦³¤Þ¼Æ\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ¥¼ª¾ªº¿ï¶µ `--%s'\n"
+msgid "%s: empty file"
+msgstr "%s: ªÅÀÉ®×"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "¦³ START-INFO-DIR-ENTRY, ¦ý¬O¨S¦³¬Û¹ïÀ³ªº END-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "¦³ END-INFO-DIR-ENTRY, ¦ý¬O¨S¦³¬Û¹ïÀ³ªº START-INFO-DIR-ENTRY"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:1936 install-info/install-info.c:1946
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:2026
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ¤£¦Xªkªº¿ï¶µ -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: ¥u¦³«ü©w Info Àɮפ@¦¸.\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:2059
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: µL®Äªº¿ï¶µ -- %c\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2071
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ¿ï¶µ¥²¶·§t¦³¤Þ¼Æ -- %c\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2129
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: ¿ï¶µ `-W %s' ¤£©ú½T\n"
+msgid "excess command line argument `%s'"
+msgstr "¦h¾lªº©R¥O¦C¤Þ¼Æ `%s'"
+
+#: install-info/install-info.c:2133
+msgid "No input file specified; try --help for more information."
+msgstr "¥¼«ü©w¿é¤JÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T."
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2136
+msgid "No dir file specified; try --help for more information."
+msgstr "¥¼«ü©w dir ÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o¨ú¦hªº¸ê°T."
+
+#: install-info/install-info.c:2278
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: ¿ï¶µ `-W %s' ¤£¥i§t¦³¤Þ¼Æ\n"
+msgid "no info dir entry in `%s'"
+msgstr "`%s' ¤º¨S¦³ info dir ¶µ¥Ø"
+
+#: install-info/install-info.c:2526
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "§ä¤£¨ì `%s' ªº¶µ¥Ø; ¥¼§R°£¥ô¦ó¶µ¥Ø"
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "¤@¤ë"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "¤G¤ë"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "¤T¤ë"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "¥|¤ë"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "¤­¤ë"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "¤»¤ë"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "¤C¤ë"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "¤K¤ë"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "¤E¤ë"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "¤Q¤ë"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "¤Q¤@¤ë"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "¤Q¤G¤ë"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc ªº¤Þ¼Æ¥þ¬O¤j¼g, ©Ò¥H¨S¦³§@¥Î"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s ¤w¼o¤î¤£¥Î"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp ¥²¶·¦³¤@­Ó¥¿¾ã¼Æªº¤Þ¼Æ, ¦Ó¤£¬O `%s'"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4270
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4272
 msgid "none"
 msgstr ""
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr ""
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "@def °Ñ¼Æ¤¤¿òº| `}'"
-
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr ""
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr ""
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr ""
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr ""
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr ""
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr ""
+#: makeinfo/cmds.c:2079
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
 
-#: makeinfo/defun.c:424
-msgid "Method"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr ""
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "@def °Ñ¼Æ¤¤¿òº| `}'"
 
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr ""
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr ""
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr ""
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr ""
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:948
+#: makeinfo/index.c:954
+msgid "See "
+msgstr ""
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "`%c%s' ¥²¶·¥]§t¤Þ¼Æ `{...}', ¦Ó¤£¬O¥u¦³ `%s'"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "µù¸} `%s' ¨S¦³¥k¤j¬A¸¹"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "©w¸qµù¸}, ¦ý¬O¨S¦³¤÷¸`ÂI"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 #, fuzzy
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "©w¸qµù¸}, ¦ý¬O¨S¦³¤÷¸`ÂI"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "µù¸}"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:86
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:175
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr ""
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:421
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:764
 #, fuzzy, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "¯Á¤Þ `%s' ¤w¦s¦b"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "@synindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s' »P/©Î `%s'"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:764
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s'"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:833
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "¯Á¤Þ `%s' ªº¶µ¥Ø¤£¦b¥ô¦óªº¸`ÂI¤º"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:836 makeinfo/index.c:872
 msgid "(outside of any node)"
 msgstr "(¤£¦b¥ô¦óªº¸`ÂI¤º)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr ""
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr ""
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr ""
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr ""
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr ""
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr ""
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr ""
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "No matching `%cend %s'"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s ¥²¶·­n¦³¦r¤¸©Î¬O¼Æ¦r"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr ""
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu ¦b²Ä¤@­Ó @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "¤]³\±zÀ³¸Ó§â @top ¸`ÂI¥]§t¦b @ifnottex, ¦Ó¤£¬O @ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "¦b²Ä¤@­Ó¸`ÂI¤§«e¥X²{ @detailmenu, ±N«Ø¥ß `Top' ¸`ÂI"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, fuzzy, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "¥¼°t¹ïªº `%c%s'"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "¦b `%c%s' ¤§«á¥²¶·­n¦³ªF¦è"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, fuzzy, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "`%s' °Ï¶ô¤§¤º, @itemx ¨ÃµL·N¸q"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr ""
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s ´Á±æ¨Ï¥Î `i' ©Î `j' §@¬°¤Þ¼Æ, ¦Ó¤£¬O `%c'"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s ´Á±æ¨Ï¥Î¤@­Ó¦r¥À `i' ©Î `j' §@¬°¤Þ¼Æ"
@@ -2139,7 +2328,7 @@ msgstr "¥¨¶° `%s' ¤w©w¸q¹L"
 msgid "here is the previous definition of `%s'"
 msgstr "³o¸Ì¬O `%s' ¤§«eªº©w¸q"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
@@ -2149,104 +2338,114 @@ msgstr ""
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "¥¨¶° `%s' ¦b²Ä %d ¦æ³Q©I¥s, ¦ý¬O¤Þ¼Æ¹L¦h"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr ""
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg ¥u¦b³æ¤@¤Þ¼Æªº¥¨¶°¦³¥Î"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s »P @%s ¤£²Å¦X"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "¿ù»~¹L¦h! ©ñ±ó.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: ĵ§i: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2295
 #, c-format
 msgid "Misplaced %c"
 msgstr "»~¸mªº %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¸Õ¸Õ `%s --help' ¥H¨ú±o§ó¦hªº¸ê°T.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "¥Îªk: %s [OPTION]... FILE...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:350
+#: makeinfo/makeinfo.c:354
 #, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default %"
-"d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:386
+#: makeinfo/makeinfo.c:391
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default %"
 "d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
 "d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
@@ -2254,24 +2453,27 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:418
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
 "d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2281,7 +2483,7 @@ msgid ""
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:434
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2301,7 +2503,7 @@ msgid ""
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:453
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2310,20 +2512,21 @@ msgid ""
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:461
 #, fuzzy
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 "\n"
 "@if... µ¥§PÂ_«ü¥Oªº¹w³]­È, ·|¨Ì¿é¥X®æ¦¡¤£¦P¦Ó¤£¦P:\n"
@@ -2340,156 +2543,151 @@ msgstr ""
 "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
 "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org."
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:761
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:750
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:825
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1016 makeinfo/makeinfo.c:4119
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1019
 #, c-format
 msgid "Expected `%s'"
 msgstr "Expected `%s'"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1496
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1542
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%s' ¥¼¥X²{¦b `%s' ¤º"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1622
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1652
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "³o¬O %s, ¥Ñ makeinfo ª©¥» %s ¦Û %s ²£¥Íªº.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1719
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s: ¦]¬°¿ù»~, ²¾°£¥¨¶°¿é¥XÀÉ `%s'; ­Y­n«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1774
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s: ¦]¬°¿ù»~, ²¾°£¿é¥XÀÉ `%s'; ­Y­n«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2068
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "¥¼ª¾ªº©R¥O `%s'"
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2090
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2349
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s ¹w­p­n¦³ `{...}'"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2362
 msgid "Unmatched }"
 msgstr "¥¼°t¹ïªº }"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2410
 msgid "NO_NAME!"
 msgstr "NO_NAME!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2431
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3434
 #, fuzzy, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3440
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "`%s' ¥¼¥X²{¦b `%s' ¤º"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3576
 #, fuzzy, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3585
 msgid "@image missing filename argument"
 msgstr "@image ¨S¦³ÀɦW¤Þ¼Æ"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3803
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3804
 #, c-format
 msgid "{No value for `%s'}"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3856
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s ¥²¶·­n¦³¦WºÙ"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3962
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "¦b°t¹ïªº @end %s ¤§«e, ¥ý¨ì¹FÀÉ®×µ²§À"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4211
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
@@ -2498,161 +2696,128 @@ msgstr ""
 msgid "Missing } in @multitable template"
 msgstr "¦b @multitable ¼Ëª©¤¤, ¨S¦³ }"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr ""
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "multitable ¶µ¥Ø¤¤¦³¤Ó¦hªºÄæ¦ì (³Ì¤j­È¬° %d)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, fuzzy, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "µLªk¿ï¨ú multitable ¤¤ªºÄæ¦ì #%d"
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "©¿²¤ multitable ¥~ªº @tab"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr ""
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* Äæ¦ì #%d: ¿é¥X = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "¸`ÂI `%s' ¤w¦b²Ä %d ¦æ©w¸q¹L¤F"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "½s±Æ¸`ÂI %s ªº®æ¦¡¤¤...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, fuzzy, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "¸`ÂI `%s' ¥²¶·¨Ï¥Î¤À¬q©R¥O (sectioning command) (¨Ò¦p: %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "`%c%s' ©R¥O¤¤¥¼«ü©w¸`ÂI¦WºÙ"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1160
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1163
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr ""
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "¤U¤@­Ó:"
-
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "¤W¤@­Ó:"
-
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "¤W¤@¼h:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1157
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1162
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1359
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "¥Ø¿ý"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr ""
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1459
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1462
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "¥»¸`ÂI (%s) ªº «e¤@­Ó (Prev) ¸`ÂI¦³°ÝÃD"
 
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "«e¤@­Ó"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1517
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr ""
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1521
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "¥»¸`ÂI (%s) ªº ¤U¤@­Ó (Next) ¸`ÂI¦³°ÝÃD"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1533
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "¤W¤@¼h"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1602
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "¸`ÂI `%s' ¤w³Q°Ñ·Ó %d ¦¸"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1634
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1724
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1728
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
@@ -2667,260 +2832,104 @@ msgstr "ªþ¿ý %c"
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "¤º³¡¿ù»~ (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "¤º³¡¿ù»~ (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s ¤w¼o±ó¤£¥Î; ½Ð§ï¥Î %c%s"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr ""
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr ""
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr ""
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr ""
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr ""
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: ĵ§i: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
+#: makeinfo/xml.c:2150
+msgid "of"
 msgstr ""
 
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\t¸Õ¸Õ Try `%s --help' ¥H¨ú±o§¹¾ãªº°Ñ¼Æ¦Cªí.\n"
-
-#: util/install-info.c:434
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"¥Îªk: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"¦Û Info ¥Ø¿ýÀÉ®× DIR-FILE ªº INFO-FILE ¤¤, ¦w¸Ë©Î²¾°£ dir ¶µ¥Ø.\n"
-"\n"
-"Options:\n"
-" --delete          ¦Û DIR-FILE ¤¤, §R°£²{¦³ªº INFO-FILE ¶µ¥Ø;\n"
-"                     ¤£·s¼W¥ô¦ó·sªº¶µ¥Ø.\n"
-" --dir-file=NAME   «ü©w Info ¥Ø¿ýÀɮתºÀɮצWºÙ.\n"
-"                     ¥»¿ï¶µ»P¨Ï¥Î DIR-FILE ¤Þ¼Æ¬Û¦P.\n"
-" --entry=TEXT      ¥H TEXT §@¬° Info directory ¶µ¥Ø.\n"
-"                     TEXT À³¸Ó»P Info ¥Ø¿ý¶µ¥Øªº¼gªk¦³¬Û¦P®æ¦¡\n"
-"                     ¦A¥[¤W¹s­Ó¥H¤Wªº¥HªÅ¥Õ¦r¤¸¶}©lªº¸ê®Æ¦æ.\n"
-"                     ¦pªG±z«ü©w¶W¹L¤@­Ó¥H¤Wªº¶µ¥Ø, ¥¦­Ì¥þ³£·|³Q¥[¶i¥h.\n"
-"                     ¦pªG±z¨S¦³«ü©w¥ô¦óªº¶µ¥Ø, ¥¦­Ì·|¥H Info Àɮפ¤ªº\n"
-"\t\t      ¸ê°T¨Ó¨M©w.\n"
-" --help            Åã¥Ü¨D§U¸ê°T, µM«áÂ÷¶}.\n"
-" --info-file=FILE  «ü©w­n¦w¸Ë¦b¥Ø¿ý¤¤ªº Info ÀÉ®×.\n"
-"                     ¥»¿ï¶µ»P¨Ï¥Î INFO-FILE ¤Þ¼Æ¬Û¦P.\n"
-" --info-dir=DIR    »P --dir-file=DIR/dir ¬Û¦P.\n"
-" --item=TEXT       »P --entry TEXT ¬Û¦P.\n"
-"                     ¤@­Ó Info directory ¶µ¥Ø¨ä¹ê´N¬O¤@­Ó¿ï³æ¶µ¥Ø.\n"
-" --quiet           ¤£Åã¥Üĵ§i°T®§.\n"
-" --remove          »P --delete ¬Û¦P.\n"
-" --section=SEC     ±N¥»Àɮתº¶µ¥Ø©ñ¦b¥Ø¿ý¤¤ªº SEC ¸`.\n"
-"                     ¦pªG±z«ü©w¶W¹L¤@­Ó¥H¤Wªº¸`, ©Ò¦³ªº¶µ¥Ø³£·|\n"
-"\t\t      ·s¼W¦b¨C¤@­Ó¸`¤º.\n"
-"                     ¦pªG±z¨S¦³«ü©w¥ô¦óªº¸`, ¥¦­Ì·|¥H Info Àɮפ¤ªº\n"
-"                     ¸ê°T¨Ó¨M©w.\n"
-" --version         Åã¥Üª©¥»¸ê°T, µM«áÂ÷¶}.\n"
-"\n"
-"µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
-"¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
-
-#: util/install-info.c:488
-#, fuzzy, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
+#: makeinfo/xml.c:2155
+msgid "on"
 msgstr ""
-"³o¬OÀÉ®× .../info/dir, ¸Ì­±¥]§t¦³ Info ¿ï³æ¬[ºc¤¤³Ì¤W¼hªº¸`ÂI,\n"
-"ºÙ¬° (dir) TOP.\n"
-"±z²Ä¤@¦¸°õ¦æ Info ®É, ±z·|±q³o¸Ì¶}©l·j´M©Ò¶·ªº¸`ÂI.\n"
-"\n"
-"%s\t³o¬O INFO ¿ï³æ¾ðªº³Ì¤W¼h\n"
-"\n"
-"  ³o¸Ì (Directory ¸`ÂI) ´£¨Ñ¥D­n¶µ¥Øªº¿ï³æ.\n"
-"  Áä¤J \"q\" Â÷¶}, \"?\" ¦C¥X©Ò¦³ªº Info «ü¥O, \"d\" ¦^¨ì³o¸Ì,\n"
-"  \"h\" Æ[¬Ýµ¹ªì¦¸¨Ï¥ÎªÌªº¤Jªù«ü¤Þ,\n"
-"  \"mEmacs<Return>\" ¥iÆ[¬Ý Emacs ¤â¥U, µ¥µ¥.\n"
-"\n"
-"  ¦b Emacs ¤¤, ±z¥i¥H¦b¿ï³æ¶µ¥Ø©Î¥æ¤¬°Ñ·Ó¤W, ³æÀ»·Æ¹«ªº²Ä 2 Áä\n"
-"  ¥H¿ï¾Ü¥¦­Ì.\n"
-"\n"
-"* Menu:\n"
 
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: ªÅÀÉ®×"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "¦³ START-INFO-DIR-ENTRY, ¦ý¬O¨S¦³¬Û¹ïÀ³ªº END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "¦³ END-INFO-DIR-ENTRY, ¦ý¬O¨S¦³¬Û¹ïÀ³ªº START-INFO-DIR-ENTRY"
-
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
 msgstr ""
 
-#: util/install-info.c:1236
+#: makeinfo/xref.c:252
 #, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: ¥u¦³«ü©w Info Àɮפ@¦¸.\n"
-
-#: util/install-info.c:1284
-#, c-format
-msgid "excess command line argument `%s'"
-msgstr "¦h¾lªº©R¥O¦C¤Þ¼Æ `%s'"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
-msgstr "¥¼«ü©w¿é¤JÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T."
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr ""
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
-msgstr "¥¼«ü©w dir ÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o¨ú¦hªº¸ê°T."
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr ""
 
-#: util/install-info.c:1313
-#, c-format
-msgid "no info dir entry in `%s'"
-msgstr "`%s' ¤º¨S¦³ info dir ¶µ¥Ø"
+#: makeinfo/xref.c:390
+#, fuzzy, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
 
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "¥Ø¿ý¶µ¥Ø `%s' ¤w¦s¦b, ¬Oµ¹ÀÉ®× `%s' ªº"
+#: makeinfo/xref.c:392
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "¥»¸`ÂI¨S¦³¥æ¤¬°Ñ·Ó."
 
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "§ä¤£¨ì `%s' ªº¶µ¥Ø; ¥¼§R°£¥ô¦ó¶µ¥Ø"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr ""
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "Åã¥Ü¨D§U¸ê°T, µM«áÂ÷¶}"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "³B²z§¹²¦«á, ¤£²¾°£¼È¦sÀÉ"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr "³B²z§¹²¦«á, ²¾°£¼È¦sÀÉ (¹w³]­È)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "±N¿é¥X°e¦Ü FILE"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "Åã¥Üª©¥»¸ê°T, µM«áÂ÷¶}"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "¥Îªk: %s [OPTION]... FILE...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "¬°¨C­Ó TeX ¿é¥X FILE ²£¥Í¤@­Ó±Æ§Çªº¯Á¤Þ.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr "³q±`¤å¥ó `foo.texi' ªº FILE... ¤Þ¼Æ·|«ü©w¬° `foo.%c%c'.\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -2929,27 +2938,360 @@ msgstr ""
 "\n"
 "¿ï¶µ:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: ¤£¬O¤@­Ó texinfo ¯Á¤ÞÀÉ"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "­«·s¶}±Ò %s ®Éµo¥Í¿ù»~"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: ¤£¬O¤@­Ó texinfo ¯Á¤ÞÀÉ"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "¦b %s ¤¤¨S¦³­¶½X"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[search]  Search forward for a specified string\n"
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "              ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[goto-node]  Move to node specified by name.\n"
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr "              ±z¤]¥i¥H¥]§tÀɦW, ¦p: (ÀɦW)¸`ÂI¦W.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[next-node]  Move to the next node of current section.\n"
+#~ msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤U¤@­Ó (next)' ¸`ÂI.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+#~ "node] (DIR)'.\n"
+#~ msgstr "  %-10s  ²¾¦Ü `directory' ¸`ÂI.  ¦P `g (DIR)'.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] "
+#~ "Top'.\n"
+#~ msgstr "  %-10s  ²¾¦Ü Top ¸`ÂI.  ¦P `g TOP'.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-forward-page-only]  Scroll forward within this node.\n"
+#~ msgstr "  %-10s  ©¹«e±²°Ê¤@¦æ.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[scroll-backward-page-only]  Scroll backward within this node.\n"
+#~ msgstr "  %-10s  ©¹«á±²°Ê¤@¦æ.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\\%-10[search-backward]  Search backward for a specified string\n"
+#~ "              and select the node in which the previous occurrence is "
+#~ "found.\n"
+#~ msgstr "              ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
+
+#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+#~ msgstr "--- ¨Ï¥Î `\\[history-node]' ©Î `\\[kill-node]' Â÷¶}---\n"
+
+#, fuzzy
+#~ msgid "\\%-10[move-to-prev-xref]  Skip to previous hypertext link [*].\n"
+#~ msgstr "  %-10s  ¸õ¨ì¥»¸`ÂI¤¤ªº¤U¤@­Ó¶W¥»¤å³sµ².\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "Read documentation in Info format.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "      --apropos=STRING         look up STRING in all indices of all "
+#~ "manuals.\n"
+#~ "  -d, --directory=DIR          add DIR to INFOPATH.\n"
+#~ "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+#~ "  -f, --file=FILENAME          specify Info file to visit.\n"
+#~ "  -h, --help                   display this help and exit.\n"
+#~ "      --index-search=STRING    go to node pointed by index entry STRING.\n"
+#~ "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+#~ "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+#~ "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+#~ "      --no-raw-escapes         output escapes as literal text.\n"
+#~ "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+#~ "  -O, --show-options, --usage  go to command-line options node.\n"
+#~ "%s      --subnodes               recursively output menu items.\n"
+#~ "  -w, --where, --location      print physical location of Info file.\n"
+#~ "      --vi-keys                use vi-like and less-like key bindings.\n"
+#~ "      --version                display version information and exit.\n"
+#~ "\n"
+#~ "The first non-option argument, if present, is the menu entry to start "
+#~ "from;\n"
+#~ "it is searched for in all `dir' files along INFOPATH.\n"
+#~ "If it is not present, info merges all `dir' files and shows the result.\n"
+#~ "Any remaining arguments are treated as the names of menu\n"
+#~ "items relative to the initial node visited.\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  info                       show top-level dir menu\n"
+#~ "  info emacs                 start at emacs node from top-level dir\n"
+#~ "  info emacs buffers         start at buffers node within emacs manual\n"
+#~ "  info --show-options emacs  start at node with emacs' command line "
+#~ "options\n"
+#~ "  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+#~ "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+#~ msgstr ""
+#~ "¥Îªk: %s [OPTION]... [MENU-ITEM...]\n"
+#~ "\n"
+#~ "¾\Ū Info ®æ¦¡ªº¤å¥ó.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --apropos=SUBJECT        ¦b©Ò¦³ªº¤â¥Uªº¯Á¤Þ¤¤´M§ä SUBJECT.\n"
+#~ " --directory=DIR          ±N DIR ¥[¦Ü INFOPATH ¤¤.\n"
+#~ " --dribble=FILENAME       ±N¨Ï¥ÎªÌªº«öÁä°O¿ý¦b FILENAME ¤¤.\n"
+#~ " --file=FILENAME          «ü©w«ô³Xªº Info ÀÉ®×.\n"
+#~ " --help                   Åã¥Ü¥»¨D§U¸ê°T, µM«áÂ÷¶}.\n"
+#~ " --index-search=STRING    ¸õ¦Ü¯Á¤Þ¶µ¥Ø STRING ©Ò«ü¦Vªº¸`ÂI.\n"
+#~ " --node=NODENAME          «ü©w²Ä¤@­Ó«ô³Xªº Info Àɮפ¤ªº¸`ÂI.\n"
+#~ " --output=FILENAME        ±N¿ï¾Üªº¸`ÂI¿é¥X¦ÜÀÉ®× FILENAME.\n"
+#~ " --restore=FILENAME       ¦ÛÀÉ®× FILENAME Ū¨úªì©lªº«öÁä.\n"
+#~ " --show-options, --usage  ¸õ¦Ü©R¥O¦C¿ï¶µªº¸`ÂI.\n"
+#~ " --subnodes               ¥H»¼°j¤è¦¡¿é¥X¿ï³æ¶µ¥Ø.\n"
+#~ "%s --vi-keys                ¨Ï¥ÎÃþ¦ü vi »P less ªº«öÁä¤è¦¡.\n"
+#~ " --version                Åã¥Üª©¥»¸ê°T, µM«áµ²§ô.\n"
+#~ "\n"
+#~ "¦pªG¦³«D¿ï¶µªº¤Þ¼Æ, ²Ä¤@­Ó«D¿ï¶µªº¤Þ¼Æ¬O¶}©lªº¿ï³æ¶µ¥Ø;\n"
+#~ "¥¦·|³Q¥Î¨Ó·í§@¦b INFOPATH ¤ºªº©Ò¦³ dir Àɮתº·j´M¼Ðªº.\n"
+#~ "¦pªG¨S¦³ªº¸Ü, info ·|²Î¦X©Ò¦³ªº dir ÀÉ®×, µM«áÅã¥Üµ²ªG.\n"
+#~ "³Ñ¤Uªº¤Þ¼Æ·|³Q·í§@¬Û¹ï©ó³Ìªì«ô³X¸`ÂIªº¿ï³æ¶µ¥Øªº¦WºÙ.\n"
+#~ "\n"
+#~ "½d¨Ò:\n"
+#~ "  info                       Åã¥Ü³Ì¤W¼hªº¿ï³æ\n"
+#~ "  info emacs                 ¥H³Ì¤W¼h¤¤ªº emacs ¸`ÂI§@¬°°_ÂI\n"
+#~ "  info emacs buffers         ¥H emacs ¤â¥U¤¤ªº buffers ¸`ÂI§@¬°°_ÂI\n"
+#~ "  info --show-options emacs  ¥H¤¶²Ð emacs ªº°õ¦æ¿ï¶µªº¸`ÂI§@¬°°_ÂI\n"
+#~ "  info -f ./foo.info         Åã¥ÜÀÉ®× ./foo.info, ¤£·j´M¥Ø¿ý\n"
+#~ "\n"
+#~ "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
+#~ "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
+
+#~ msgid ""
+#~ "              Picking a menu item causes another node to be selected.\n"
+#~ msgstr "              ¿ï¨ú¿ï³æ¶µ¥Ø¥H¿ï¾Ü¥t¤@­Ó¸`ÂI.\n"
+
+#~ msgid ""
+#~ "              You may include a filename as well, as in (FILENAME)"
+#~ "NODENAME.\n"
+#~ msgstr "              ±z¤]¥i¥H¥]§tÀɦW, ¦p: (ÀɦW)¸`ÂI¦W.\n"
+
+#, fuzzy
+#~ msgid "  %-10s  Search backward for a specified string\n"
+#~ msgstr "  %-10s  ¦b¥» Info Àɤ¤, ¦V«á·j´M¤@­Ó«ü©wªº¦r¦ê,\n"
+
+#~ msgid ""
+#~ "              and select the node in which the next occurrence is found.\n"
+#~ msgstr "              ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
+
+#~ msgid "Following Next node..."
+#~ msgstr "¸òÀH¤U¤@­Ó¸`ÂI..."
+
+#~ msgid "Selecting first menu item..."
+#~ msgstr "¿ï¨ú²Ä¤@­Ó¿ï³æ¶µ¥Ø..."
+
+#~ msgid "Selecting Next node..."
+#~ msgstr "¿ï¨ú¤U¤@­Ó¸`ÂI..."
+
+#~ msgid "Moving Up %d time(s), then Next."
+#~ msgstr "©¹¤W¤@¼h²¾°Ê %d ¦¸, µM«á©¹¤U¤@­Ó¤è¦V²¾°Ê."
+
+#~ msgid "Moving Prev in this window."
+#~ msgstr "¦V¥»¤À¹jµøµ¡ªº ¤W¤@­Ó (Prev) ¸`ÂI²¾°Ê."
+
+#~ msgid "Moving Up in this window."
+#~ msgstr "¦V¥»¤À¹jµøµ¡ªº¤W¤@¼h¸`ÂI²¾°Ê."
+
+#~ msgid "Moving to `Prev's last menu item."
+#~ msgstr "²¾¦Ü«e¤@­Ó¸`ÂIªº³Ì«á¤@­Ó¥Ø¿ý¶µ¥Ø."
+
+#~ msgid " "
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Macro"
+#~ msgstr "¤T¤ë"
+
+#, fuzzy
+#~ msgid "Variable"
+#~ msgstr "³]©wÅܼÆ: "
+
+#, fuzzy
+#~ msgid "User Option"
+#~ msgstr "´¡¤J§¹¦¨¥y"
+
+#, fuzzy
+#~ msgid "Instance Variable"
+#~ msgstr "´y­zÅܼÆ: "
+
+#~ msgid "This is %s, produced by makeinfo version %s from %s.\n"
+#~ msgstr "³o¬O %s, ¥Ñ makeinfo ª©¥» %s ¦Û %s ²£¥Íªº.\n"
+
+#~ msgid "Next:"
+#~ msgstr "¤U¤@­Ó:"
+
+#~ msgid "Previous:"
+#~ msgstr "¤W¤@­Ó:"
+
+#~ msgid "Up:"
+#~ msgstr "¤W¤@¼h:"
+
+#~ msgid "Menu"
+#~ msgstr "¥Ø¿ý"
+
+#~ msgid "Prev"
+#~ msgstr "«e¤@­Ó"
+
+#~ msgid "Up"
+#~ msgstr "¤W¤@¼h"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "Add or remove entries in INFO-FILE from the Info directory DIR-FILE.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --debug           report what is being done.\n"
+#~ " --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+#~ "                     don't insert any new entries.\n"
+#~ " --dir-file=NAME   specify file name of Info directory file.\n"
+#~ "                     This is equivalent to using the DIR-FILE argument.\n"
+#~ " --entry=TEXT      insert TEXT as an Info directory entry.\n"
+#~ "                     TEXT should have the form of an Info menu item line\n"
+#~ "                     plus zero or more extra lines starting with "
+#~ "whitespace.\n"
+#~ "                     If you specify more than one entry, they are all "
+#~ "added.\n"
+#~ "                     If you don't specify any entries, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --help            display this help and exit.\n"
+#~ " --info-file=FILE  specify Info file to install in the directory.\n"
+#~ "                     This is equivalent to using the INFO-FILE argument.\n"
+#~ " --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+#~ " --item=TEXT       same as --entry TEXT.\n"
+#~ "                     An Info directory entry is actually a menu item.\n"
+#~ " --quiet           suppress warnings.\n"
+#~ " --remove          same as --delete.\n"
+#~ " --remove-exactly  only remove if the info file name matches exactly;\n"
+#~ "                     .info and/or .gz suffixes are not ignored.\n"
+#~ " --section=SEC     put this file's entries in section SEC of the "
+#~ "directory.\n"
+#~ "                     If you specify more than one section, all the "
+#~ "entries\n"
+#~ "                     are added in each of the sections.\n"
+#~ "                     If you don't specify any sections, they are "
+#~ "determined\n"
+#~ "                     from information in the Info file itself.\n"
+#~ " --section-regex=R if an entry is added to a section that does not "
+#~ "exist,\n"
+#~ "                     look for a section matching basic regular expression "
+#~ "R\n"
+#~ "                     (and ignoring case) before starting a new section.\n"
+#~ " --test            suppress updating of DIR-FILE.\n"
+#~ " --silent          suppress warnings.\n"
+#~ " --version         display version information and exit.\n"
+#~ msgstr ""
+#~ "¥Îªk: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+#~ "\n"
+#~ "¦Û Info ¥Ø¿ýÀÉ®× DIR-FILE ªº INFO-FILE ¤¤, ¦w¸Ë©Î²¾°£ dir ¶µ¥Ø.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " --delete          ¦Û DIR-FILE ¤¤, §R°£²{¦³ªº INFO-FILE ¶µ¥Ø;\n"
+#~ "                     ¤£·s¼W¥ô¦ó·sªº¶µ¥Ø.\n"
+#~ " --dir-file=NAME   «ü©w Info ¥Ø¿ýÀɮתºÀɮצWºÙ.\n"
+#~ "                     ¥»¿ï¶µ»P¨Ï¥Î DIR-FILE ¤Þ¼Æ¬Û¦P.\n"
+#~ " --entry=TEXT      ¥H TEXT §@¬° Info directory ¶µ¥Ø.\n"
+#~ "                     TEXT À³¸Ó»P Info ¥Ø¿ý¶µ¥Øªº¼gªk¦³¬Û¦P®æ¦¡\n"
+#~ "                     ¦A¥[¤W¹s­Ó¥H¤Wªº¥HªÅ¥Õ¦r¤¸¶}©lªº¸ê®Æ¦æ.\n"
+#~ "                     ¦pªG±z«ü©w¶W¹L¤@­Ó¥H¤Wªº¶µ¥Ø, ¥¦­Ì¥þ³£·|³Q¥[¶i¥h.\n"
+#~ "                     ¦pªG±z¨S¦³«ü©w¥ô¦óªº¶µ¥Ø, ¥¦­Ì·|¥H Info Àɮפ¤ªº\n"
+#~ "\t\t      ¸ê°T¨Ó¨M©w.\n"
+#~ " --help            Åã¥Ü¨D§U¸ê°T, µM«áÂ÷¶}.\n"
+#~ " --info-file=FILE  «ü©w­n¦w¸Ë¦b¥Ø¿ý¤¤ªº Info ÀÉ®×.\n"
+#~ "                     ¥»¿ï¶µ»P¨Ï¥Î INFO-FILE ¤Þ¼Æ¬Û¦P.\n"
+#~ " --info-dir=DIR    »P --dir-file=DIR/dir ¬Û¦P.\n"
+#~ " --item=TEXT       »P --entry TEXT ¬Û¦P.\n"
+#~ "                     ¤@­Ó Info directory ¶µ¥Ø¨ä¹ê´N¬O¤@­Ó¿ï³æ¶µ¥Ø.\n"
+#~ " --quiet           ¤£Åã¥Üĵ§i°T®§.\n"
+#~ " --remove          »P --delete ¬Û¦P.\n"
+#~ " --section=SEC     ±N¥»Àɮתº¶µ¥Ø©ñ¦b¥Ø¿ý¤¤ªº SEC ¸`.\n"
+#~ "                     ¦pªG±z«ü©w¶W¹L¤@­Ó¥H¤Wªº¸`, ©Ò¦³ªº¶µ¥Ø³£·|\n"
+#~ "\t\t      ·s¼W¦b¨C¤@­Ó¸`¤º.\n"
+#~ "                     ¦pªG±z¨S¦³«ü©w¥ô¦óªº¸`, ¥¦­Ì·|¥H Info Àɮפ¤ªº\n"
+#~ "                     ¸ê°T¨Ó¨M©w.\n"
+#~ " --version         Åã¥Üª©¥»¸ê°T, µM«áÂ÷¶}.\n"
+#~ "\n"
+#~ "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
+#~ "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
+
+#~ msgid "menu item `%s' already exists, for file `%s'"
+#~ msgstr "¥Ø¿ý¶µ¥Ø `%s' ¤w¦s¦b, ¬Oµ¹ÀÉ®× `%s' ªº"
+
+#, fuzzy
+#~ msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#~ msgstr "  %-10s  ¬D¿ï¸`ÂI¥Ø¿ý¤¤ªº²Ä¤@­Ó...²Ä¤E­Ó¶µ¥Ø.\n"
+
+#~ msgid "node `%s' has been referenced %d times"
+#~ msgstr "¸`ÂI `%s' ¤w³Q°Ñ·Ó %d ¦¸"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s ¦Û¥Ñ³nÅé°òª÷·| Free Software Foundation, Inc.\n"
+#~ "¥»³nÅé*¤£§@¥ô¦ó«OÃÒ*. ±z¥i¦b GNU ¤½¦@±ÂÅv \n"
+#~ "(GNU General Public License) ªº±ø´Ú¤U´²§G¥»³nÅé.\n"
+#~ "±ýª¾§ó¦hªº¸Ô±¡, ½Ð¬ÝÀɦW¬° COPYING ªºÀÉ®×.\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-arg ¥u¦b³æ¤@¤Þ¼Æªº¥¨¶°¦³¥Î"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "³B²z§¹²¦«á, ¤£²¾°£¼È¦sÀÉ"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "³B²z§¹²¦«á, ²¾°£¼È¦sÀÉ (¹w³]­È)"
+
+#~ msgid ""
+#~ "              file, and select the node referenced by the first entry "
+#~ "found.\n"
+#~ msgstr "              ¨Ã¥B¿ï¾Ü²Ä¤@­Ó·j´M¨ìªº¶µ¥Ø©Ò°Ñ·Óªº¸`ÂI.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "There is NO warranty.  You may redistribute this software\n"
+#~ "under the terms of the GNU General Public License.\n"
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s ¦Û¥Ñ³nÅé°òª÷·| Free Software Foundation, Inc.\n"
+#~ "¥»³nÅé*¤£§@¥ô¦ó«OÃÒ*. ±z¥i¦b GNU ¤½¦@±ÂÅv \n"
+#~ "(GNU General Public License) ªº±ø´Ú¤U´²§G¥»³nÅé.\n"
+#~ "±ýª¾§ó¦hªº¸Ô±¡, ½Ð¬ÝÀɦW¬° COPYING ªºÀÉ®×.\n"
+
 #~ msgid "%s: Specify the Info directory only once.\n"
 #~ msgstr "%s: ¥u¦³«ü©w Info ¥Ø¿ý¤@¦¸.\n"
 
@@ -2960,27 +3302,13 @@ msgstr ""
 #~ msgid "%s is an invalid ISO code, using %c"
 #~ msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
 
-#~ msgid "`.' or `,' must follow cross reference, not %c"
-#~ msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
-
 #~ msgid "Node:"
 #~ msgstr "¸`ÂI:"
 
-#~ msgid "virtual memory exhausted"
-#~ msgstr "µêÀÀ°O¾ÐÅé¯ÓºÉ"
-
 #~ msgid "`%s' has no Up field"
 #~ msgstr "`%s' ¨S¦³ ¤W¤@¼h (Up) Äæ¦ì"
 
 #, fuzzy
-#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-#~ msgstr "  %-10s  ©¹«e±²°Ê¤@¦æ.\n"
-
-#, fuzzy
-#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-#~ msgstr "  %-10s  ©¹«á±²°Ê¤@¦æ.\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "Email bug reports to bug-texinfo@gnu.org,\n"
 #~ "general questions and discussion to help-texinfo@gnu.org."
diff --git a/Build/source/utils/texinfo/system.h b/Build/source/utils/texinfo/system.h
new file mode 100644
index 00000000000..f9c7ffef28e
--- /dev/null
+++ b/Build/source/utils/texinfo/system.h
@@ -0,0 +1,256 @@
+/* system.h: system-dependent declarations; include this first.
+   $Id: system.h,v 1.9 2008/03/04 09:44:06 gray Exp $
+
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef TEXINFO_SYSTEM_H
+#define TEXINFO_SYSTEM_H
+
+#define _GNU_SOURCE
+
+#include <config.h>
+
+#ifdef MIKTEX
+#include <gnu-miktex.h>
+#define S_ISDIR(x) ((x)&_S_IFDIR) 
+#else
+/* MiKTeX defines substring() in a separate DLL, where it has its
+   own __declspec declaration.  We don't want to try to duplicate 
+   this Microsoft-ism here.  */
+extern char *substring (const char *, const char *);
+#endif
+
+/* Assume ANSI C89 headers are available.  */
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+/* Use POSIX headers.  If they are not available, we use the substitute
+   provided by gnulib.  */
+#include <getopt.h>
+#include <unistd.h>
+
+/* For gettext (NLS).  */
+#define const
+#include "gettext.h"
+#undef const
+
+#define _(String) gettext (String)
+#define N_(String) (String)
+
+/* Additional gnulib includes.  */
+#include "mbswidth.h"
+#include "xalloc.h"
+#include "xsetenv.h"
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+#ifdef VMS
+#include <perror.h>
+#endif
+
+#ifndef HAVE_DECL_STRERROR
+extern char *strerror ();
+#endif
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifndef PATH_MAX
+#ifndef _POSIX_PATH_MAX
+# define _POSIX_PATH_MAX 255
+#endif
+#define PATH_MAX _POSIX_PATH_MAX
+#endif
+
+#ifndef HAVE_DECL_STRCOLL
+extern int strcoll ();
+#endif
+
+#include <sys/stat.h>
+#if STAT_MACROS_BROKEN
+# undef S_ISDIR
+#endif
+#if !defined(S_ISDIR) && defined(S_IFDIR)
+# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
+#endif
+
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif /* HAVE_SYS_FILE_H */
+
+#ifndef O_RDONLY
+/* Since <fcntl.h> is POSIX, prefer that to <sys/fcntl.h>.
+   This also avoids some useless warnings on (at least) Linux.  */
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#else /* not HAVE_FCNTL_H */
+#ifdef HAVE_SYS_FCNTL_H
+#include <sys/fcntl.h>
+#endif /* not HAVE_SYS_FCNTL_H */
+#endif /* not HAVE_FCNTL_H */
+#endif /* not O_RDONLY */
+
+/* MS-DOS and similar non-Posix systems have some peculiarities:
+    - they distinguish between binary and text files;
+    - they use both `/' and `\\' as directory separator in file names;
+    - they can have a drive letter X: prepended to a file name;
+    - they have a separate root directory on each drive;
+    - their filesystems are case-insensitive;
+    - directories in environment variables (like INFOPATH) are separated
+        by `;' rather than `:';
+    - text files can have their lines ended either with \n or with \r\n pairs;
+   These are all parameterized here except the last, which is
+   handled by the source code as appropriate (mostly, in info/).  */
+#ifndef O_BINARY
+# ifdef _O_BINARY
+#  define O_BINARY _O_BINARY
+# else
+#  define O_BINARY 0
+# endif
+#endif /* O_BINARY */
+
+/* We'd like to take advantage of _doprnt if it's around, a la error.c,
+   but then we'd have no VA_SPRINTF.  */
+#if HAVE_VPRINTF
+# if __STDC__
+#  include <stdarg.h>
+#  define VA_START(args, lastarg) va_start(args, lastarg)
+# else
+#  include <varargs.h>
+#  define VA_START(args, lastarg) va_start(args)
+# endif
+# define VA_FPRINTF(file, fmt, ap) vfprintf (file, fmt, ap)
+# define VA_SPRINTF(str, fmt, ap) vsprintf (str, fmt, ap)
+#else /* not HAVE_VPRINTF */
+# define VA_START(args, lastarg)
+# define va_alist a1, a2, a3, a4, a5, a6, a7, a8
+# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
+# define va_end(args)
+#endif
+
+#if O_BINARY
+# ifdef HAVE_IO_H
+#  include <io.h>
+# endif
+# ifdef __MSDOS__
+#  include <limits.h>
+#  ifdef __DJGPP__
+#   define HAVE_LONG_FILENAMES(dir)  (pathconf (dir, _PC_NAME_MAX) > 12)
+#   define NULL_DEVICE	"/dev/null"
+#   define DEFAULT_INFOPATH "c:/djgpp/info;/usr/local/info;/usr/info;."
+    /* DJGPP supports /dev/null, which is okay for Unix aficionados,
+       shell scripts and Makefiles, but interactive DOS die-hards
+       would probably want to have NUL as well.  */
+#   define ALSO_NULL_DEVICE  "NUL"
+#  else  /* O_BINARY && !__DJGPP__ */
+#   define HAVE_LONG_FILENAMES(dir)  (0)
+#   define NULL_DEVICE	"NUL"
+#  endif /* O_BINARY && !__DJGPP__ */
+#  define SET_SCREEN_SIZE_HELPER terminal_prep_terminal()
+#  define DEFAULT_INFO_PRINT_COMMAND ">PRN"
+# else   /* O_BINARY && !__MSDOS__ */
+#  define setmode(f,m)  _setmode(f,m)
+#  define HAVE_LONG_FILENAMES(dir)   (1)
+#  define NULL_DEVICE	"NUL"
+# endif  /* O_BINARY && !__MSDOS__ */
+# ifdef __CYGWIN__
+#  define DEFAULT_TMPDIR	"/tmp/"
+#  define PATH_SEP	":"
+#  define STRIP_DOT_EXE	0
+#  undef NULL_DEVICE
+#  define NULL_DEVICE "/dev/null"
+#  define PIPE_USE_FORK	1
+# else  /* O_BINARY && !__CYGWIN__ */
+#  define DEFAULT_TMPDIR	"c:/"
+#  define PATH_SEP	";"
+#  define STRIP_DOT_EXE	1
+# endif /* O_BINARY && !__CYGWIN__ */
+  /* Back to any O_BINARY system.  */
+# define FILENAME_CMP	mbscasecmp
+# define FILENAME_CMPN	mbsncasecmp
+# define FOPEN_RBIN	"rb"
+# define FOPEN_WBIN	"wb"
+# define HAVE_DRIVE(n)	((n)[0] && (n)[1] == ':')
+# define IS_SLASH(c)	((c) == '/' || (c) == '\\')
+# define IS_ABSOLUTE(n)	(IS_SLASH((n)[0]) || HAVE_DRIVE(n))
+# define PIPE_USE_FORK	0
+# define SET_BINARY(f)  do {if (!isatty(f)) setmode(f,O_BINARY);} while(0)
+
+#else  /* not O_BINARY, i.e., Unix */
+# define SET_BINARY(f)	(void)0
+# define FOPEN_RBIN	"r"
+# define FOPEN_WBIN	"w"
+# define IS_SLASH(c)	((c) == '/')
+# define HAVE_DRIVE(n)	(0)
+# define IS_ABSOLUTE(n)	((n)[0] == '/')
+# define FILENAME_CMP	strcmp
+# define FILENAME_CMPN	strncmp
+# define HAVE_LONG_FILENAMES(dir)   (1)
+# define PATH_SEP	":"
+# define STRIP_DOT_EXE	0
+# ifdef VMS
+#  define DEFAULT_TMPDIR "sys$scratch:"
+# else
+#  define DEFAULT_TMPDIR "/tmp/"
+# endif
+# define NULL_DEVICE	"/dev/null"
+# define PIPE_USE_FORK	1
+#endif /* not O_BINARY */
+
+/* Everything but DJGPP.  */
+#ifndef ALSO_NULL_DEVICE
+# define ALSO_NULL_DEVICE  ""
+#endif
+
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+/* Some systems don't declare this function in pwd.h. */
+struct passwd *getpwnam (const char *name);
+
+/* Our library routines not included in any system library.  */
+extern void *xmalloc (size_t), *xrealloc (void *, size_t);
+extern char *xstrdup (const char *);
+extern void xexit (int);
+
+/* For convenience.  */
+#define STREQ(s1,s2) (strcmp (s1, s2) == 0)
+#define STRCASEEQ(s1,s2) (strcasecmp (s1, s2) == 0)
+#define STRNCASEEQ(s1,s2,n) (strncasecmp (s1, s2, n) == 0)
+
+/* We don't need anything fancy.  If we did need something fancy, gnulib
+   has it.  */
+#ifdef MIN
+#undef MIN
+#endif
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#ifdef MAX
+#undef MAX
+#endif
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+
+#ifdef DMALLOC_DEBUG
+#define DMALLOC_FUNC_CHECK
+#include "dmalloc.h"
+#endif
+
+#endif /* TEXINFO_SYSTEM_H */
diff --git a/Build/source/utils/texinfo/util/Makefile.am b/Build/source/utils/texinfo/util/Makefile.am
index 6451fa9b653..fec2df92dbf 100644
--- a/Build/source/utils/texinfo/util/Makefile.am
+++ b/Build/source/utils/texinfo/util/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.14 2004/08/26 11:43:18 karl Exp $
+# $Id: Makefile.am,v 1.34 2008/03/25 10:51:20 akim Exp $
 # Makefile.am for texinfo/util.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -10,21 +10,20 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-bin_PROGRAMS = ginstall-info texindex
-bin_SCRIPTS = texi2dvi texi2pdf
+bin_PROGRAMS = texindex
+bin_SCRIPTS = texi2dvi texi2pdf pdftexi2dvi
 
-# Use `ginstall-info' in the definition of PROGRAMS and in dependencies
-# because automake generates an install-info target in every Makefile (a
-# bug, IMHO, but this is easier than patching Automake.)
-ginstall_info_SOURCES = install-info.c
-
-# Transform `ginstall-info' to `install-info' before applying any
-# user-specified name transformations.
-transform = s/ginstall-info/install-info/; $(program_transform_name)
+# for auctex.
+pdftexi2dvi: texi2pdf
+	cp -f $(srcdir)/texi2pdf $@
 
 localedir = $(datadir)/locale
-INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
-LDADD = ../lib/libtxi.a $(LIBINTL)
+AM_CPPFLAGS = 					\
+  -I$(top_srcdir)				\
+  -I$(top_srcdir)/gnulib/lib			\
+  -I$(top_builddir)/gnulib/lib			\
+  -DLOCALEDIR=\"$(localedir)\"
+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
 
 dist_pkgdata_DATA = texinfo.dtd texinfo.xsl
 pkgdata_DATA = texinfo.cat
@@ -35,11 +34,29 @@ texinfo.cat: texinfo-cat.in $(top_srcdir)/doc/version.texi
 	sed 's/__VERSION__/@VERSION@/g' $(srcdir)/texinfo-cat.in >$@
 
 # Most of these are for fun.  The only official/installed ones are the
-# texi2* scripts.
+# *texi2* scripts.
 #
 EXTRA_DIST = README deref.c dir-example fix-info-dir fixfonts \
   fixref.gawk gdoc gen-dir-node gendocs.sh gendocs_template infosrch \
-  install-info-html outline.gawk \
+  install-info-html outline.gawk pdftexi2dvi \
   prepinfo.awk tex3patch texi-docstring-magic.el texi2dvi texi2pdf txitextest \
   $(dist_pkgdata_DATA) texinfo-cat.in
 CLEANFILES = $(pkgdata_DATA)
+
+
+# Let's not stress people's TeX installations, etc.
+if MAINTAINER_MODE
+TESTS =						\
+bibtex.test					\
+dvipdf.test					\
+latex2html.test					\
+local.test					\
+texi2dvi.test
+
+EXTRA_DIST += $(TESTS)
+
+# Each test case depends on defs.
+check_SCRIPTS = defs
+distclean-local:
+	-rm -rf testSubDir
+endif
diff --git a/Build/source/utils/texinfo/util/Makefile.in b/Build/source/utils/texinfo/util/Makefile.in
index 3111b3c27ff..255d7fc2c09 100644
--- a/Build/source/utils/texinfo/util/Makefile.in
+++ b/Build/source/utils/texinfo/util/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am,v 1.14 2004/08/26 11:43:18 karl Exp $
+# $Id: Makefile.am,v 1.34 2008/03/25 10:51:20 akim Exp $
 # Makefile.am for texinfo/util.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -28,19 +28,16 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -49,57 +46,95 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = ginstall-info$(EXEEXT) texindex$(EXEEXT)
+bin_PROGRAMS = texindex$(EXEEXT)
+@MAINTAINER_MODE_TRUE@am__append_1 = $(TESTS)
 subdir = util
 DIST_COMMON = README $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+	$(srcdir)/Makefile.in $(srcdir)/defs.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
-	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \
-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mkstemp.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/onceonly_2_57.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
+	$(top_srcdir)/gnulib/m4/argz.m4 \
+	$(top_srcdir)/gnulib/m4/codeset.m4 \
+	$(top_srcdir)/gnulib/m4/eealloc.m4 \
+	$(top_srcdir)/gnulib/m4/environ.m4 \
+	$(top_srcdir)/gnulib/m4/error.m4 \
+	$(top_srcdir)/gnulib/m4/exitfail.m4 \
+	$(top_srcdir)/gnulib/m4/extensions.m4 \
+	$(top_srcdir)/gnulib/m4/getopt.m4 \
+	$(top_srcdir)/gnulib/m4/gettext.m4 \
+	$(top_srcdir)/gnulib/m4/gettimeofday.m4 \
+	$(top_srcdir)/gnulib/m4/glibc21.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
+	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib/m4/iconv.m4 \
+	$(top_srcdir)/gnulib/m4/include_next.m4 \
+	$(top_srcdir)/gnulib/m4/inline.m4 \
+	$(top_srcdir)/gnulib/m4/intlmacosx.m4 \
+	$(top_srcdir)/gnulib/m4/lib-ld.m4 \
+	$(top_srcdir)/gnulib/m4/lib-link.m4 \
+	$(top_srcdir)/gnulib/m4/lib-prefix.m4 \
+	$(top_srcdir)/gnulib/m4/localcharset.m4 \
+	$(top_srcdir)/gnulib/m4/longlong.m4 \
+	$(top_srcdir)/gnulib/m4/malloc.m4 \
+	$(top_srcdir)/gnulib/m4/malloca.m4 \
+	$(top_srcdir)/gnulib/m4/mbchar.m4 \
+	$(top_srcdir)/gnulib/m4/mbiter.m4 \
+	$(top_srcdir)/gnulib/m4/mbrtowc.m4 \
+	$(top_srcdir)/gnulib/m4/mbscasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbsncasecmp.m4 \
+	$(top_srcdir)/gnulib/m4/mbstate_t.m4 \
+	$(top_srcdir)/gnulib/m4/mbswidth.m4 \
+	$(top_srcdir)/gnulib/m4/memchr.m4 \
+	$(top_srcdir)/gnulib/m4/memcpy.m4 \
+	$(top_srcdir)/gnulib/m4/memmove.m4 \
+	$(top_srcdir)/gnulib/m4/mkstemp.m4 \
+	$(top_srcdir)/gnulib/m4/nls.m4 \
+	$(top_srcdir)/gnulib/m4/onceonly.m4 \
+	$(top_srcdir)/gnulib/m4/po.m4 \
+	$(top_srcdir)/gnulib/m4/progtest.m4 \
+	$(top_srcdir)/gnulib/m4/setenv.m4 \
+	$(top_srcdir)/gnulib/m4/stdbool.m4 \
+	$(top_srcdir)/gnulib/m4/stdint.m4 \
+	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
+	$(top_srcdir)/gnulib/m4/strdup.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
+	$(top_srcdir)/gnulib/m4/string_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_stat_h.m4 \
+	$(top_srcdir)/gnulib/m4/sys_time_h.m4 \
+	$(top_srcdir)/gnulib/m4/tempname.m4 \
+	$(top_srcdir)/gnulib/m4/unistd_h.m4 \
+	$(top_srcdir)/gnulib/m4/wchar.m4 \
+	$(top_srcdir)/gnulib/m4/wchar_t.m4 \
+	$(top_srcdir)/gnulib/m4/wctype.m4 \
+	$(top_srcdir)/gnulib/m4/wcwidth.m4 \
+	$(top_srcdir)/gnulib/m4/wint_t.m4 \
+	$(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = defs
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
-ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
-ginstall_info_LDADD = $(LDADD)
-am__DEPENDENCIES_1 =
-ginstall_info_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1)
 texindex_SOURCES = texindex.c
 texindex_OBJECTS = texindex.$(OBJEXT)
 texindex_LDADD = $(LDADD)
-texindex_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_1 =
+texindex_DEPENDENCIES = ../lib/libtxi.a \
+	$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(ginstall_info_SOURCES) texindex.c
-DIST_SOURCES = $(ginstall_info_SOURCES) texindex.c
+SOURCES = texindex.c
+DIST_SOURCES = texindex.c
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -112,28 +147,26 @@ DATA = $(dist_pkgdata_DATA) $(pkgdata_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-# Transform `ginstall-info' to `install-info' before applying any
-# user-specified name transformations.
-transform = s/ginstall-info/install-info/; $(program_transform_name)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+ARGZ_H = @ARGZ_H@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -141,41 +174,155 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
+GETOPT_H = @GETOPT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_IO_H = @HAVE_IO_H@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRNDUP = @HAVE_STRNDUP@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRSEP = @HAVE_STRSEP@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNSETENV = @HAVE_UNSETENV@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
+HEVEA = @HEVEA@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@
-INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -185,20 +332,50 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
 RANLIB = @RANLIB@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDINT_H = @STDINT_H@
 STRIP = @STRIP@
+SYS_STAT_H = @SYS_STAT_H@
+SYS_TIME_H = @SYS_TIME_H@
 TERMLIBS = @TERMLIBS@
-TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@
-TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+TEX = @TEX@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VOID_UNSETENV = @VOID_UNSETENV@
+WCHAR_H = @WCHAR_H@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WCTYPE_H = @WCTYPE_H@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -210,11 +387,16 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -238,29 +420,45 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-bin_SCRIPTS = texi2dvi texi2pdf
-
-# Use `ginstall-info' in the definition of PROGRAMS and in dependencies
-# because automake generates an install-info target in every Makefile (a
-# bug, IMHO, but this is easier than patching Automake.)
-ginstall_info_SOURCES = install-info.c
-INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
-LDADD = ../lib/libtxi.a $(LIBINTL)
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+bin_SCRIPTS = texi2dvi texi2pdf pdftexi2dvi
+AM_CPPFLAGS = \
+  -I$(top_srcdir)				\
+  -I$(top_srcdir)/gnulib/lib			\
+  -I$(top_builddir)/gnulib/lib			\
+  -DLOCALEDIR=\"$(localedir)\"
+
+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
 dist_pkgdata_DATA = texinfo.dtd texinfo.xsl
 pkgdata_DATA = texinfo.cat
 
 # Most of these are for fun.  The only official/installed ones are the
-# texi2* scripts.
+# *texi2* scripts.
 #
 EXTRA_DIST = README deref.c dir-example fix-info-dir fixfonts \
-  fixref.gawk gdoc gen-dir-node gendocs.sh gendocs_template infosrch \
-  install-info-html outline.gawk \
-  prepinfo.awk tex3patch texi-docstring-magic.el texi2dvi texi2pdf txitextest \
-  $(dist_pkgdata_DATA) texinfo-cat.in
-
+	fixref.gawk gdoc gen-dir-node gendocs.sh gendocs_template \
+	infosrch install-info-html outline.gawk pdftexi2dvi \
+	prepinfo.awk tex3patch texi-docstring-magic.el texi2dvi \
+	texi2pdf txitextest $(dist_pkgdata_DATA) texinfo-cat.in \
+	$(am__append_1)
 CLEANFILES = $(pkgdata_DATA)
+
+# Let's not stress people's TeX installations, etc.
+@MAINTAINER_MODE_TRUE@TESTS = \
+@MAINTAINER_MODE_TRUE@bibtex.test					\
+@MAINTAINER_MODE_TRUE@dvipdf.test					\
+@MAINTAINER_MODE_TRUE@latex2html.test					\
+@MAINTAINER_MODE_TRUE@local.test					\
+@MAINTAINER_MODE_TRUE@texi2dvi.test
+
+
+# Each test case depends on defs.
+@MAINTAINER_MODE_TRUE@check_SCRIPTS = defs
 all: all-am
 
 .SUFFIXES:
@@ -294,9 +492,11 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+defs: $(top_builddir)/config.status $(srcdir)/defs.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -317,15 +517,12 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-ginstall-info$(EXEEXT): $(ginstall_info_OBJECTS) $(ginstall_info_DEPENDENCIES) 
-	@rm -f ginstall-info$(EXEEXT)
-	$(LINK) $(ginstall_info_LDFLAGS) $(ginstall_info_OBJECTS) $(ginstall_info_LDADD) $(LIBS)
 texindex$(EXEEXT): $(texindex_OBJECTS) $(texindex_DEPENDENCIES) 
 	@rm -f texindex$(EXEEXT)
-	$(LINK) $(texindex_LDFLAGS) $(texindex_OBJECTS) $(texindex_LDADD) $(LIBS)
+	$(LINK) $(texindex_OBJECTS) $(texindex_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@@ -349,26 +546,24 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install-info.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texindex.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -385,7 +580,7 @@ uninstall-dist_pkgdataDATA:
 	done
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(pkgdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -406,8 +601,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -419,8 +614,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -430,13 +625,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -449,23 +643,95 @@ GTAGS:
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+	srcdir=$(srcdir); export srcdir; \
+	list=' $(TESTS) '; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *$$ws$$tst$$ws*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+		echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *$$ws$$tst$$ws*) \
+		xfail=`expr $$xfail + 1`; \
+		echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      echo "SKIP: $$tst"; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    dir=''; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    skipped="($$skip tests were not run)"; \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
 	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -477,11 +743,13 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -508,6 +776,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@MAINTAINER_MODE_FALSE@distclean-local:
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -516,7 +785,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-local distclean-tags
 
 dvi: dvi-am
 
@@ -530,12 +799,20 @@ info-am:
 
 install-data-am: install-dist_pkgdataDATA install-pkgdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS install-binSCRIPTS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -556,28 +833,37 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-dist_pkgdataDATA uninstall-info-am \
-	uninstall-pkgdataDATA
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-binSCRIPTS install-data install-data-am \
-	install-dist_pkgdataDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-pkgdataDATA \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \
-	uninstall-info-am uninstall-pkgdataDATA
-
+	uninstall-dist_pkgdataDATA uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+	clean-binPROGRAMS clean-generic ctags distclean \
+	distclean-compile distclean-generic distclean-local \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-binSCRIPTS \
+	install-data install-data-am install-dist_pkgdataDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-pkgdataDATA \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-dist_pkgdataDATA uninstall-pkgdataDATA
+
+
+# for auctex.
+pdftexi2dvi: texi2pdf
+	cp -f $(srcdir)/texi2pdf $@
 
 # we don't actually use version.texi in the rule, but it's one way of
 # noticing when the version changes.
 texinfo.cat: texinfo-cat.in $(top_srcdir)/doc/version.texi
 	sed 's/__VERSION__/@VERSION@/g' $(srcdir)/texinfo-cat.in >$@
+@MAINTAINER_MODE_TRUE@distclean-local:
+@MAINTAINER_MODE_TRUE@	-rm -rf testSubDir
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/utils/texinfo/util/README b/Build/source/utils/texinfo/util/README
index 5354c3520b2..8ed7b074812 100644
--- a/Build/source/utils/texinfo/util/README
+++ b/Build/source/utils/texinfo/util/README
@@ -1,14 +1,13 @@
-$Id: README,v 1.5 2004/04/11 17:56:47 karl Exp $
+$Id: README,v 1.6 2008/01/02 01:36:32 karl Exp $
 texinfo/util/README
 
-  Copyright (C) 2002 Free Software Foundation, Inc.
+  Copyright (C) 2002, 2008 Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
-Assorted Texinfo-related programs and scripts.
+Assorted Texinfo-related files.
 
-texindex, texi2dvi, and install-info get installed.
+texindex, texi2dvi, texi2pdf, pdftexi2dvi, and the XML stuff get installed.
 The other items here are for your amusement and/or hacking pleasure.
-
diff --git a/Build/source/utils/texinfo/util/bibtex.test b/Build/source/utils/texinfo/util/bibtex.test
new file mode 100755
index 00000000000..0bb29a05965
--- /dev/null
+++ b/Build/source/utils/texinfo/util/bibtex.test
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+#
+# This file is part of GNU Texinfo.
+#
+# GNU Texinfo is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# GNU Texinfo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+required='hevea'
+
+. ./defs || exit 1
+
+set -e
+
+create_input_tex <<EOF
+\cite{texinfo.doc}
+\bibliographystyle{plain}
+\bibliography{sample}
+EOF
+
+cat >sample.bib <<EOF
+@misc{texinfo.doc,
+  title =	 "{GNU Texinfo}: The {GNU} documentation format",
+  author =	 "Robert J. Chassell and Richard M. Stallman",
+  year =	 "1988"
+}
+EOF
+
+
+# check HTML|INFO|TEXT|DVI|PDF
+# ----------------------------
+check ()
+{
+  out=$1
+  # Testing the local build mode.
+  TEXI2DVI_pass --$out --batch --tidy input.tex
+  # There should only be the DVI and the TEXI file.
+  assert_files input.$out input.tex sample.bib input.t2d
+  cp input.$out /tmp/foo
+  rm input.$out
+}
+
+# Currently we don't use bibtex with hevea.  This is to be fixed.
+for out in dvi pdf # html info text
+do
+  check $out
+done
diff --git a/Build/source/utils/texinfo/util/defs.in b/Build/source/utils/texinfo/util/defs.in
new file mode 100644
index 00000000000..f70b1e71a84
--- /dev/null
+++ b/Build/source/utils/texinfo/util/defs.in
@@ -0,0 +1,364 @@
+# -*- shell-script -*-
+# @configure_input@
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#
+# (This file was originally part of GNU Automake.)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Defines for Automake testing environment.
+# Tom Tromey <tromey@cygnus.com>
+
+# Be Bourne compatible.
+# (Snippet copied from configure's initialization in Autoconf 2.57.)
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Ensure we are running from the right directory.
+test -f ./defs || {
+   echo "defs: not found in current directory" 1>&2
+   exit 1
+}
+
+# If srcdir is not set, then we are not running from `make check', be verbose.
+if test -z "$srcdir"; then
+   VERBOSE=x
+   # compute $srcdir.
+   srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'`
+   test $srcdir = $0 && srcdir=.
+fi
+
+# Ensure $srcdir is set correctly.
+test -f $srcdir/defs.in || {
+   echo "$srcdir/defs.in not found, check \$srcdir" 1>&2
+   exit 1
+}
+
+me=`echo "$0" | sed -e 's,.*[\\/],,;s/\.test$//'`
+
+# See how redirections should work.  User can set VERBOSE to see all
+# output.
+test -z "$VERBOSE" && {
+   exec > /dev/null 2>&1
+}
+
+# Make sure we override the user shell.
+SHELL='@SHELL@'
+export SHELL
+
+srcdir_abs=`cd $srcdir && pwd`
+test -z "$TEXI2DVI" && TEXI2DVI=$srcdir_abs/texi2dvi
+
+# be sure we use texi2dvi and texindex from our own directory, not
+# whatever happens to be in the path.
+echo "defs: prepending $srcdir_abs to PATH for testing."
+PATH="@abs_builddir@:@abs_srcdir@:$PATH"
+
+# Some shells forget to export modified environment variables.
+# (See note about `export' in the Autoconf manual.)
+export PATH
+
+# User can override various tools used.
+test -z "$PERL" && PERL='@PERL@'
+
+if test -n "$required"
+then
+  for tool in $required
+  do
+    # Check that each required tool is present.
+    case $tool in
+      hevea)
+        # HeVeA supports -version only.  Use configure to find it.
+        test -n "@HEVEA@" || exit 77
+	;;
+      tex)
+        # No all versions of Tex support `--version', so we use
+        # a configure check.
+        test -n "@TEX@" || exit 77
+	;;
+      # Generic case: the tool must support --version.
+      *)
+	echo "$me: running $tool --version"
+	( $tool --version ) || exit 77
+	;;
+    esac
+  done
+fi
+
+
+# Always use an absolute srcdir.  Otherwise symlinks made in subdirs
+# of the test dir just won't work.
+case "$srcdir" in
+ [\\/]* | ?:[\\/]*)
+    ;;
+
+ *)
+    srcdir=`CDPATH=: && cd "$srcdir" && pwd`
+    ;;
+esac
+
+chmod -R a+rwx testSubDir > /dev/null 2>&1
+rm -rf testSubDir > /dev/null 2>&1
+mkdir testSubDir
+
+# Copy in some files we need.
+cp $srcdir/../doc/texinfo.tex testSubDir || exit 1
+
+cd ./testSubDir
+
+
+# Unset the user's envvars that might change the behavior.
+unset TEXI2DVI_BUILD_MODE
+unset TEXI2DVI_BUILD_DIRECTORY
+
+echo "=== Running test $0"
+
+# POSIX no longer requires 'egrep' and 'fgrep',
+# but some hosts lack 'grep -E' and 'grep -F'.
+EGREP='@EGREP@'
+FGREP='@FGREP@'
+
+# The amount we should wait after modifying files depends on the platform.
+# For instance, Windows '95, '98 and ME have 2-second granularity
+# and can be up to 3 seconds in the future w.r.t. the system clock.
+sleep='sleep @MODIFICATION_DELAY@'
+
+# The tests call `make -e' but we do not want $srcdir from the environment
+# to override the definition from the Makefile.
+testsrcdir=$srcdir
+unset srcdir
+
+
+# create_input_texi < INPUT
+# -------------------------
+# Create input.texi adding stdin inside a default prologue/epilogue
+create_input_texi ()
+{
+  {
+    cat << END
+\input texinfo   @c -*-texinfo-*-
+@setfilename input
+@settitle input
+
+@ifnottex
+@node Top
+@top input
+@end ifnottex
+
+END
+    cat
+    cat << END
+@bye
+END
+  } >input.texi
+}
+
+
+# create_input_tex < INPUT
+# ------------------------
+# Create input.tex adding stdin inside a default prologue/epilogue
+create_input_tex ()
+{
+  {
+    cat << END
+\documentclass{article}
+
+\begin{document}
+END
+    cat
+    cat << END
+\end{document}
+END
+  } >input.tex
+}
+
+
+# TEXI2DVI_run status [options...]
+# --------------------------------
+# Run texi2dvi with OPTIONS, and fail if does not exit with STATUS.
+TEXI2DVI_run ()
+{
+  expected_exitcode=$1
+  shift
+  exitcode=0
+  if test -n "$VERBOSE"; then
+    set x --debug --verbose ${1+"$@"}
+    shift
+  fi
+  texi2dvi ${1+"$@"} 2>stderr >stdout || exitcode=$?
+  cat stderr
+  cat stdout
+  test $exitcode = $expected_exitcode || exit 1
+}
+
+
+# TEXI2DVI_fail [options...]
+# ---------------------------
+# Run texi2dvi with OPTIONS, and fail if does not exit with failure.
+TEXI2DVI_fail ()
+{
+  TEXI2DVI_run 1 ${1+"$@"}
+}
+
+
+# TEXI2DVI_pass [options...]
+# ---------------------------
+# Run texi2dvi with OPTIONS, and fail if does not exit with failure.
+TEXI2DVI_pass ()
+{
+  TEXI2DVI_run 0 ${1+"$@"}
+}
+
+
+# optionset_get N OPTIONSET<1> -- OPTIONSET<2> -- ...
+# ---------------------------------------------------
+# Return OPTIONSET<N>
+optionset_get ()
+{
+  n=$1
+  shift
+  # Find the optionset.
+  while test $n != 1; do
+    case $1 in
+      --) n=`expr $n - 1`;;
+    esac
+    shift
+  done
+  # Return the optionset.
+  while true; do
+    case $#:$1 in
+      0:) break;;
+    *:--) shift; break;;
+       *) echo "$1"; shift;;
+    esac
+  done
+}
+
+# list_files ()
+# -------------
+# Return the sorted list of files in this directory, except the "invisible" ones.
+list_files ()
+{
+  for f in *
+  do
+    case $f in
+      texinfo.tex | stdout | stderr | ls.expected | ls.value );;
+      *) echo $f;;
+    esac
+  done | sort
+}
+
+
+# assert_files (EXPECTED-FILES)
+# -----------------------------
+# Only those files are valid in the current directory.
+assert_files ()
+{
+  if test -n "$VERBOSE"; then
+    ls
+  fi
+  list_files > ls.value
+  echo "$*" | tr ' ' '\n' | sort > ls.expected
+  diff -u ls.expected ls.value
+}
+
+
+# assert_and_remove_files (EXPECTED-FILES)
+# ----------------------------------------
+# Only those files are valid in the current directory.  Remove them
+# afterwards.
+assert_and_remove_files ()
+{
+  assert_files "$@"
+  rm -rf "$@"
+}
+
+
+# title TITLE...
+# --------------
+# Make a huge title to ease the reading of the output.
+title ()
+{
+  (
+    set +x
+    echo "    $@    " | sed -e 's/./=/g'
+    echo "    $@    "
+    echo "    $@    " | sed -e 's/./=/g'
+  )
+}
+
+# $latex_paragraph
+# ----------------
+# Some lengthy LaTeX.
+# grep -E '^[a-zA-Z]+$' /usr/share/dict/words | sed 200q | pr --page-width=76 --column=5 --omit-header
+latex_paragraph='
+A              Acrux        Aegean           Ahmad          Albany
+AOL            Actaeon        Aelfric        Ahmadabad      Albee
+Aachen         Acton        Aeneas           Ahmed          Alberio
+Aaliyah        Acts         Aeneid           Ahriman        Albert
+Aaron          Acuff        Aeolus           Aida           Alberta
+Abbas          Ada          Aeroflot         Aiken          Alberto
+Abbasid        Adam         Aeschylus        Aileen         Albigensian
+Abbott         Adams        Aesculapius    Aimee     Albion
+Abby           Adan         Aesop            Ainu           Albireo
+Abdul          Adana        Afghan           Airedale       Albuquerque
+Abe            Adar         Afghanistan    Airedales        Alcatraz
+Abel           Addams       Afghans          Aisha          Alcestis
+Abelard        Adderley       Africa         Ajax           Alcibiades
+Abelson        Addie        African          Akbar          Alcmena
+Aberdeen       Addison        Africans       Akhmatova      Alcoa
+Abernathy      Adela        Afrikaans        Akihito        Alcott
+Abidjan        Adelaide       Afrikaner      Akita          Alcuin
+Abigail        Adele        Afrikaners     Akkad     Alcyone
+Abilene        Adeline        Afro           Akron          Aldan
+Abner          Aden         Afrocentrism   Al        Aldebaran
+Abraham        Adenauer       Afros          Ala     Alden
+Abram          Adhara       Ag       Alabama        Alderamin
+Abrams         Adidas       Agamemnon        Alabaman       Aldo
+Absalom        Adirondack     Agassi         Alabamans      Aldrin
+Abuja          Adirondacks    Agassiz        Alabamian      Alec
+Abyssinia      Adkins       Agatha           Alabamians     Aleichem
+Abyssinian     Adler        Aggie            Aladdin        Alejandra
+Ac             Adolf        Aglaia           Alamo          Alejandro
+Acadia         Adolfo       Agnes            Alamogordo     Alembert
+Acapulco       Adolph       Agnew            Alan           Aleppo
+Accra          Adonis       Agni             Alana          Aleut
+Acevedo        Adonises       Agra           Alar           Aleutian
+Achaean        Adrian       Agricola         Alaric         Alex
+Achebe         Adriana        Agrippa        Alaska         Alexander
+Achernar       Adriatic       Agrippina      Alaskan        Alexandra
+Acheson        Adrienne       Aguilar        Alaskans       Alexandria
+Achilles       Advent       Aguinaldo        Alba           Alexei
+Aconcagua      Adventist      Aguirre        Albania        Alexis
+Acosta         Advents        Agustin        Albanian       Alfonso
+Acropolis      Advil        Ahab             Albanians      Alfonzo
+'
+
+
+# Turn on shell traces when VERBOSE is set.
+if test -n "$VERBOSE"; then
+  set -x
+else
+  :
+fi
+pwd
diff --git a/Build/source/utils/texinfo/util/deref.c b/Build/source/utils/texinfo/util/deref.c
index e08be48105f..98e8ce0563d 100644
--- a/Build/source/utils/texinfo/util/deref.c
+++ b/Build/source/utils/texinfo/util/deref.c
@@ -8,11 +8,11 @@
  * Written: December, 1991
  * Released: November, 1998
  *
- * Copyright, 1991, 1998 Arnold David Robbins
+ * Copyright 1991, 1998 Arnold David Robbins
  *
  * DEREF is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * DEREF is distributed in the hope that it will be useful,
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/Build/source/utils/texinfo/util/dir-example b/Build/source/utils/texinfo/util/dir-example
index 2b88f5f9217..eac9490af52 100644
--- a/Build/source/utils/texinfo/util/dir-example
+++ b/Build/source/utils/texinfo/util/dir-example
@@ -10,7 +10,7 @@ rms suggested that we follow the categories of the Free Software
 If you have dir entries for Texinfo manuals you'd like to be added here,
   please send them to karl@gnu.org.
 
-$Id: dir-example,v 1.51 2004/12/18 02:11:43 karl Exp $
+$Id: dir-example,v 1.77 2008/03/25 15:09:14 karl Exp $
 
 File: dir,	Node: Top,	This is the top of the INFO tree.
 
@@ -33,17 +33,18 @@ Basics
 * Coreutils: (coreutils).       Core GNU (file, text, shell) utilities.
 * DC: (dc).                     Postfix desk calculator.
 * Date input formats: (coreutils)Date input formats.
+* Ed: (ed).                     The GNU line editor.
 * File permissions: (coreutils)File permissions.  Access modes.
 * Finding files: (find).        Operating on files matching certain criteria.
 * Gcal: (gcal).                 GNU calendar program.
+* Hello: (hello).               Hello, GNU world.
 * Time: (time).                 Measuring program resource usage.
 
 Text creation and manipulation
 * Diffutils: (diff).            Comparing and merging files.
-* Ed: (ed).                     Line editor.
 * Gawk: (gawk).                 A text scanning and processing language.
+* M4: (m4).                     A powerful macro processor.
 * grep: (grep).                 Print lines matching a pattern.
-* m4: (m4).			General-purpose text macro processor.
 * sed: (sed).                   Stream EDitor.
 * Wdiff: (wdiff).               Word difference finder and related tools.
 
@@ -76,11 +77,12 @@ Network applications
 * Wget: (wget).                 Non-interactive network downloader.
 
 Printing Tools
-* a2ps: (a2ps).                    PostScript Generating Utility
 * PreScript: (a2ps) PreScript.     Input language for a2ps
+* a2ps: (a2ps).                    PostScript Generating Utility
 * card: (a2ps) card.               Print Reference Cards
-* fixps: (a2ps) fixps.             Fixing Some Ill Designed PostScript Files
 * fixnt: (a2ps) fixnt.             Fixing Microsoft NT PostScript Files
+* fixps: (a2ps) fixps.             Fixing Some Ill Designed PostScript Files
+* ogonkify: (ogonkify).            Ogonkify
 * pdiff: (a2ps) pdiff.             Produce Pretty Comparison of Files
 * psmandup: (a2ps) psmandup.       Printing Duplex on Simplex Printers
 * psset: (a2ps) psset.             Inserting calls to setpagedevice
@@ -88,14 +90,15 @@ Printing Tools
 Software development
 * As: (as).                     Assembler.
 * Autoconf: (autoconf).         Create source code configuration scripts.
-* Binutils: (binutils).         ar/copy/objdump/nm/size/strip/ranlib.
-* automake: (automake).         Making Makefile.in's.
-* bison: (bison).               GNU parser generator (Yacc replacement).
+* Automake: (automake).         Making GNU standards-compliant Makefiles.
+* Binutils: (binutils).         The GNU binary utilities.
 * Cpp: (cpp).		        The GNU C preprocessor.
 * Cpplib: (cppinternals).       Cpplib internals.
-* CVS: (cvs).                   Concurrent versions system for source control.
+* CVS: (cvs).                   Concurrent Versions System
 * DejaGnu: (dejagnu).           Testing framework.
+* Dmalloc: (dmalloc).		Malloc debug library.
 * Gdb: (gdb).                   The GNU debugger.
+* bison: (bison).       	GNU parser generator (Yacc replacement).
 * egcs: (egcs).                 Experimental GNU C compiler.
 * Flex: (flex).                 A fast scanner generator.
 * g77: (g77).                   GNU Fortran 77 compiler.
@@ -109,7 +112,7 @@ Software development
 * Gprof: (gprof).               Profiler.
 * Guile Reference: (guile).     The Guile reference manual.
 * Guile Tutorial: (guile-tut).	The Guile Tutorial.
-* Identifier DB: (id-utils).    Identifier database utilities.
+* ID database: (id-utils).      Identifier database utilities.
 * Indent: (indent).             Prettyprinter for programs.
 * Ld: (ld).                     Linker.
 * Libtool: (libtool).           Generic library support script.
@@ -123,7 +126,7 @@ Emacs
 * Ada mode: (ada-mode). The GNU Emacs mode for editing Ada.
 * Autotype: (autotype). Convenient features for text that you enter frequently
                           in Emacs.
-* CC Mode: (ccmode).   Emacs mode for editing C, C++, Objective-C,
+* CC Mode: (ccmode).    Emacs mode for editing C, C++, Objective-C,
                           Java, Pike, and IDL code.
 * CL: (cl).		Partial Common Lisp support for Emacs Lisp.
 * Dired-X: (dired-x).   Dired Extra Features.
@@ -131,7 +134,7 @@ Emacs
 * Ebrowse: (ebrowse).   A C++ class browser for Emacs.
 * Ediff: (ediff).       A visual interface for comparing and merging programs.
 * Emacs: (emacs).	The extensible self-documenting text editor.
-* Elisp: (elisp).               GNU Emacs Lisp reference manual.
+* Elisp: (elisp).       The Emacs Lisp Reference Manual.
 * Emacs FAQ: (efaq).	Frequently Asked Questions about Emacs.
 * Emacs MIME: (emacs-mime).   The MIME de/composition library.
 * Eshell: (eshell).     A command shell implemented in Emacs Lisp.
@@ -167,7 +170,6 @@ Typesetting
 GNU Gettext Utilities
 * ISO3166: (gettext)Country Codes.             ISO 3166 country codes.
 * ISO639: (gettext)Language Codes.             ISO 639 language codes.
-* xgettext: (gettext)xgettext Invocation.      Extract strings into a PO file.
 * autopoint: (gettext)autopoint Invocation.    Copy gettext infrastructure.
 * envsubst: (gettext)envsubst Invocation.      Expand environment variables.
 * gettext: (gettext).                          GNU gettext utilities.
@@ -187,11 +189,11 @@ GNU Gettext Utilities
 * msgunfmt: (gettext)msgunfmt Invocation.      Uncompile MO file into PO file.
 * msguniq: (gettext)msguniq Invocation.        Unify duplicates for PO file.
 * ngettext: (gettext)ngettext Invocation.      Translate a message with plural.
+* xgettext: (gettext)xgettext Invocation.      Extract strings into a PO file.
 
 Software libraries
 * Annotate: (annotate).         High-level GDB to GUI's.
 * Bfd: (bfd).                   The Binary File Descriptor library.
-* CVS protocol: (cvsclient).    CVS client/server protocol specification.
 * Gdb-Internals: (gdbint).      The GNU debugger's internals.
 * GDB library: (libgdb).        Application programming interface to GDB.
 * GDBM: (gdbm).                 Hashed databases.
@@ -203,18 +205,16 @@ Software libraries
 * Mmalloc: (mmalloc).           The GNU mapped-malloc package.
 * Stabs: (stabs).               The "stabs" debugging information format.
 * Readline: (readline).         General command-line interface.
-* Regex: (regex).               Regular expressions.
 * Termcap: (termcap).           All about /etc/termcap.
 
 C++ libraries
 * Iostream: (iostream).         C++ input/output.
-* Libg++: (libg++).             C++ classes.
 * autosprintf: (autosprintf).   Support for printf format strings in C++.
 
 GNU organization
 * Maintain: (maintain).         GNU maintainer guidelines.
+* Maintaining Findutils: (find-maint).        Maintaining GNU findutils.
 * Standards: (standards).       GNU coding standards.
-* Tasks: (tasks).               GNU task list.
 
 GNU music project
 * LilyPond: (lilypond).                        The GNU music typesetter.
@@ -234,7 +234,7 @@ TeX
 * DVI-to-PNG: (dvipng).         DVI to Portable Network Graphics (PNG).
 * Eplain: (eplain).             Expanding on plain TeX.
 * Kpathsearch: (kpathsea).      File lookup along search paths.
-* LaTeX: (latex).               LaTeX.
+* LaTeX: (latex2e).             LaTeX2e.
 * MakeIndex: (makeindex).       Index creation for TeX.
 * Naming TeX fonts: (fontname). Filenames for TeX fonts.
 * TDS: (tds).                   Standard TeX directory structure.
@@ -249,41 +249,30 @@ Science
 * R FAQ: (R-FAQ).               The R statistical language FAQ.
 
 Other things
-* Amd: (am-utils).              Filesystem automounter.
-* CMUCL: (cmu-user).            CMU Common Lisp.
-* File headers: (filehdr).      Bibliographic information for computer files.
-* GCP: (gcp).                   Game club protocol.
-* GIMP: (pdb).                  The GIMP procedural database.
-* HTML: (snafu).                Hypertext Markup Language 2.0 specification.
 * Jargon: (jargon).             The jargon file.
 * Netpbm: (netpbm).             Images/graphics manipulation programs.
 * JED: (jed).                   JED editor documentation.
-* octave: (octave).             Octave - A language for numerical computation.
-* Perl: (perl).                 Practical extraction and report language.
+* Octave: (octave).             Octave - A language for numerical computation.
 * PRCS: (prcs).                 Project revision control system.
 * Screen: (screen).             Terminal multiplexer.
 
 Individual utilities
 * aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
-* aid: (id-utils)aid invocation.                Matching strings.
-* ar: (binutils)ar.                             Create/modify/extract archives.
+* addr2line: (binutils)addr2line. Convert addresses to file and line.
+* ar: (binutils)ar.             Create, modify, and extract from archives.
 * at-pr: (gnats)at-pr.                          Bug report timely reminders.
-* autoconf: (autoconf)autoconf Invocation.
-                                How to create configuration scripts
-* autoheader: (autoconf)autoheader Invocation.
-                                How to create configuration templates
-* autom4te: (autoconf)autom4te Invocation.
-                                The Autoconf executables backbone
-* autoreconf: (autoconf)autoreconf Invocation.
-                                Remaking multiple `configure' scripts
-* autoscan: (autoconf)autoscan Invocation.
-                                Semi-automatic `configure.ac' writing
-* autoupdate: (autoconf)autoupdate Invocation.
-                                Automatic update of `configure.ac'
+* autoconf: (autoconf)autoconf Invocation. How to create configuration scripts.
+* autoheader: (autoconf)autoheader Invocation. How to create configuration templates
+* autom4te: (autoconf)autom4te Invocation. The Autoconf executables backbone.
+* automake: (automake)Invoking Automake.        Generating Makefile.in.
+* autoreconf: (autoconf)autoreconf Invocation. Remaking multiple `configure' scripts
+* autoscan: (autoconf)autoscan Invocation.     Semi-automatic `configure.ac' writing
+* autoupdate: (autoconf)autoupdate Invocation. Automatic update of `configure.ac'
 * awk: (gawk)Invoking gawk.                     Text scanning and processing.
+* base64: (coreutils)base64 invocation.         Base64 encode/decode data.
 * basename: (coreutils)basename invocation.     Strip directory and suffix.
 * bibtex: (web2c)BibTeX invocation.             Maintaining bibliographies.
-* c++filt: (binutils)c++filt.                   Demangle C++ symbols.
+* c++filt: (binutils)c++filt.	Filter to demangle encoded C++ symbols.
 * cat: (coreutils)cat invocation.               Concatenate and write files.
 * chgrp: (coreutils)chgrp invocation.           Change file groups.
 * chmod: (coreutils)chmod invocation.           Change file permissions.
@@ -298,14 +287,18 @@ Individual utilities
 * cp: (coreutils)cp invocation.                 Copy files.
 * csplit: (coreutils)csplit invocation.         Split by context.
 * cut: (coreutils)cut invocation.               Print selected parts of lines.
+* cvs: (cvs)CVS commands.       Concurrent Versions System
+* cvsclient: (cvsclient).      The CVS client/server protocol.
+* cxxfilt: (binutils)c++filt.   MS-DOS name for c++filt.
 * date: (coreutils)date invocation.             Print/set system date and time.
 * dd: (coreutils)dd invocation.                 Copy and convert a file.
-* df: (coreutils)df invocation.                 Report filesystem disk usage.
-* diff: (diff)Invoking diff.                    Compare 2 files line by line.
+* df: (coreutils)df invocation.                 Report file system disk usage.
 * diff3: (diff)Invoking diff3.                  Compare 3 files line by line.
+* diff: (diff)Invoking diff.                    Compare 2 files line by line.
 * dir: (coreutils)dir invocation.               List directories briefly.
 * dircolors: (coreutils)dircolors invocation.   Color setup for ls.
 * dirname: (coreutils)dirname invocation.       Strip non-directory suffix.
+* dlltool: (binutils)dlltool.	Create files needed to build and use DLLs.
 * dmp: (web2c)Dmp invocation.                   Troff->MPX (MetaPost pictures).
 * du: (coreutils)du invocation.                 Report on disk usage.
 * dvicopy: (web2c)DVIcopy invocation.           Virtual font expansion
@@ -315,24 +308,25 @@ Individual utilities
 * echo: (coreutils)echo invocation.             Print a line of text.
 * edit-pr: (gnats)Invoking edit-pr.             Changing bugs.
 * egrep: (grep)Invoking.                        grep -E.
-* eid: (id-utils)eid invocation.                Invoking an editor on matches.
 * env: (coreutils)env invocation.               Modify the environment.
 * expand: (coreutils)expand invocation.         Convert tabs to spaces.
 * expr: (coreutils)expr invocation.             Evaluate expressions.
 * factor: (coreutils)factor invocation.         Print prime factors
 * false: (coreutils)false invocation.           Do nothing, unsuccessfully.
 * fgrep: (fgrep)Invoking.                       grep -F.
-* fid: (id-utils)fid invocation.                Listing a file's identifiers.
+* fid: (id-utils)fid invocation.        	Listing a file's tokens.
 * file-pr: (gnats)file-pr.                      Processing incoming traffic.
 * find: (find)Invoking find.                    Finding and acting on files.
 * fmt: (coreutils)fmt invocation.               Reformat paragraph text.
+* fnid: (id-utils)fnid invocation.      	Looking up file names.
 * fold: (coreutils)fold invocation.             Wrap long input lines.
 * frm: (mailutils)frm.                          List headers from a mailbox.
+* ftp: (inetutils)ftp invocation.               File Transfer Protocol.
+* ftpd: (inetutils)ftpd invocation.             FTP Daemon.
 * gcal2txt: (gcal)Invoking gcal2txt.            Calendar resource to text file.
 * gftodvi: (web2c)GFtoDVI invocation.           Generic font proofsheets.
 * gftopk: (web2c)GFtoPK invocation.             Generic to packed fonts.
 * gftype: (web2c)GFtype invocation.             GF to human-readable text.
-* gid: (id-utils)gid invocation.                Listing all matching lines.
 * git: (git).                                   GNU interactive tools.
 * groups: (coreutils)groups invocation.         Print group names a user is in.
 * guimb: (mailutils)guimb.                      Mailbox processing language.
@@ -341,11 +335,10 @@ Individual utilities
 * head: (coreutils)head invocation.             Output the first part of files.
 * hostid: (coreutils)hostid invocation.         Print numeric host identifier.
 * hostname: (coreutils)hostname invocation.     Print or set system name.
-* id: (coreutils)id invocation.                 Print real/effective uid/gid.
-* idx: (id-utils)idx invocation.                Testing mkid scanners.
+* id: (coreutils)id invocation.                 Print user identity.
 * ifnames: (autoconf)ifnames Invocation.        Listing conditionals in source.
-* iid: (id-utils)iid invocation.                Interactive complex queries.
 * imap4d: (mailutils)imap4d.                    IMAP4 daemon.
+* inetd: (inetutils)inetd invocation.           Internet super-server.
 * inimf: (web2c)inimf invocation.               Initial Metafont.
 * inimp: (web2c)inimp invocation.               Initial MetaPost.
 * initex: (web2c)initex invocation.             Initial TeX.
@@ -354,10 +347,11 @@ Individual utilities
 * kill: (coreutils)kill invocation.             Send a signal to processes.
 * kpsewhich: (kpathsea)Invoking kpsewhich.      TeX file searching.
 * libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
-* lid: (id-utils)lid invocation.                Matching identifier patterns.
+* lid: (id-utils)lid invocation.        	Matching words and patterns.
 * link: (coreutils)link invocation.             Make hard links between files.
 * ln: (coreutils)ln invocation.                 Make links between files.
 * locate: (find)Invoking locate.                Finding files in a database.
+* logger: (inetutils)logger invocation.         Logger.
 * logname: (coreutils)logname invocation.       Print current login name.
 * ls: (coreutils)ls invocation.                 List directory contents.
 * mail-files: (sharutils)mail-files invocation. Send files to remote site.
@@ -369,7 +363,7 @@ Individual utilities
 * maketexpk: (kpathsea)MakeTeX scripts.         PK bitmap generation.
 * maketextex: (kpathsea)MakeTeX scripts.        TeX source generation.
 * maketextfm: (kpathsea)MakeTeX scripts.        TeX font metric generation.
-* md5sum: (coreutils)md5sum invocation.         Print or check message-digests.
+* md5sum: (coreutils)md5sum invocation.         Print or check MD5 digests.
 * mdiff: (wdiff)mdiff invocation.               Line cluster finder.
 * messages: (mailutils)messages.                Count messages in mailbox.
 * mf: (web2c)mf invocation.                     Creating typeface families.
@@ -377,65 +371,78 @@ Individual utilities
 * mgetty: (mgetty).                             Faxes, voicemail and more.
 * mkdir: (coreutils)mkdir invocation.           Create directories.
 * mkfifo: (coreutils)mkfifo invocation.         Create FIFOs (named pipes).
-* mkid: (id-utils)mkid invocation.              Creating an ID database.
+* mkid: (id-utils)mkid invocation.      	Creating an ID database.
 * mknod: (coreutils)mknod invocation.           Create special files.
 * mp: (web2c)mp invocation.                     Creating technical diagrams.
 * mpto: (web2c)MPto invocation.                 MetaPost label extraction.
 * mv: (coreutils)mv invocation.                 Rename files.
+* networking(inet) utilities: (inetutils).      GNU networking utilities.
 * newer: (web2c)Newer invocation.               Compare modification times.
-* nice: (coreutils)nice invocation.             Modify scheduling priority.
+* nice: (coreutils)nice invocation.             Modify niceness.
 * nl: (coreutils)nl invocation.                 Number lines and write files.
-* nlmconv: (binutils)nlmconv.                   Convert object to NetWare LM.
-* nm: (binutils)nm.                             List symbols in object files.
+* nlmconv: (binutils)nlmconv.   Converts object code into an NLM.
+* nm: (binutils)nm.             List symbols from object files.
 * nohup: (coreutils)nohup invocation.           Immunize to hangups.
-* objcopy: (binutils)objcopy.                   Copy/translate object files.
-* objdump: (binutils)objdump.                   Display info from object files.
+* objcopy: (binutils)objcopy.	Copy and translate object files.
+* objdump: (binutils)objdump.   Display information from object files.
 * od: (coreutils)od invocation.                 Dump files in octal, etc.
 * paste: (coreutils)paste invocation.           Merge lines of files.
 * patch: (diff)Invoking patch.                  Apply a patch to a file.
 * patgen: (web2c)Patgen invocation.             Creating hyphenation patterns.
 * pathchk: (coreutils)pathchk invocation.       Check file name portability.
-* pid: (id-utils)pid invocation.                Looking up filenames.
+* ping: (inetutils)ping invocation.             Packets to network hosts.
 * pktogf: (web2c)PKtoGF invocation.             Packed to generic fonts.
 * pktype: (web2c)PKtype invocation.             PK to human-readable text.
 * pltotf: (web2c)PLtoTF invocation.             Property list to TFM.
 * pooltype: (web2c)Pooltype invocation.         Display WEB pool files.
 * pop3d: (mailutils)pop3d.                      POP3 daemon.
-* pr: (coreutils)pr invocation.                 Paginate or columnate files.
 * pr-addr: (gnats)pr-addr.                      Bug report address retrieval.
 * pr-edit: (gnats)pr-edit.                      The edit-pr driver.
+* pr: (coreutils)pr invocation.                 Paginate or columnate files.
 * printenv: (coreutils)printenv invocation.     Print environment variables.
 * printf: (coreutils)printf invocation.         Format and print data.
-* protoize: (gcc)Running Protoize.		Add prototypes to sources.
 * ptx: (coreutils)ptx invocation.               Produce permuted indexes.
 * pwd: (coreutils)pwd invocation.               Print working directory.
 * query-pr: (gnats)Invoking query-pr.           Bug searching/reporting.
 * queue-pr: (gnats)queue-pr.                    Handling incoming traffic.
-* ranlib: (binutils)ranlib.                     Index archive file contents.
+* ranlib: (binutils)ranlib.     Generate index to archive contents.
+* rcp: (inetutils)rcp invocation.               Strip non-directory suffix.
+* readelf: (binutils)readelf.	Display the contents of ELF format files.
 * readlink: (coreutils)readlink invocation.     Print referent of a symlink.
 * readmsg: (mailutils)readmsg.                  Extract messages from a folder.
+* rexecd: (inetutils)rexecd invocation.         Remote execution server.
+* rlogin: (inetutils)rlogin invocation.         Remote login.
+* rlogind: (inetutils)rlogind invocation.       Remote login server.
 * rm: (coreutils)rm invocation.                 Remove files.
 * rmdir: (coreutils)rmdir invocation.           Remove empty directories.
+* rsh: (inetutils)rsh invocation.               Remote shell.
+* rshd: (inetutils)rshd invocation.             Remote shell server.
 * sdiff: (diff)Invoking sdiff.                  Merge 2 files side-by-side.
 * send-pr: (gnats)Invoking send-pr.             Submitting bugs.
 * seq: (coreutils)seq invocation.               Print numeric sequences
-* shar: (sharutils)shar invocation.             Create shell archive.
+* sha1sum: (coreutils)sha1sum invocation.       Print or check SHA-1 digests.
+* sha2: (coreutils)sha2 utilities.              Print or check SHA-2 digests.
+* shar: (sharutils)shar invocation.             Make a shell archive.
 * shred: (coreutils)shred invocation.           Remove files more securely.
+* shuf: (coreutils)shuf invocation.             Shuffling text files.
 * sieve: (mailutils)sieve.                      Mail filtering utility.
-* size: (binutils)size.                         List object file section sizes.
+* size: (binutils)size.         List section sizes and total size.
 * sleep: (coreutils)sleep invocation.           Delay for a specified time.
 * sort: (coreutils)sort invocation.             Sort text files.
 * split: (coreutils)split invocation.           Split into fixed-size pieces.
 * stat: (coreutils)stat invocation.             Report file(system) status.
-* strings: (binutils)strings.                   List printable strings.
-* strip: (binutils)strip.                       Discard symbols.
+* strings: (binutils)strings.   List printable strings from files.
+* strip: (binutils)strip.       Discard symbols.
 * stty: (coreutils)stty invocation.             Print/change terminal settings.
-* su: (coreutils)su invocation.                 Modify user and group id.
+* su: (coreutils)su invocation.                 Modify user and group ID.
 * sum: (coreutils)sum invocation.               Print traditional checksum.
 * sync: (coreutils)sync invocation.             Synchronize memory and disk.
+* syslogd: (inetutils)syslogd invocation.       Syslog server.
 * tabs: (tput)Invoking tabs.                    Tab settings.
 * tac: (coreutils)tac invocation.               Reverse files.
 * tail: (coreutils)tail invocation.             Output the last part of files.
+* talk: (inetutils)talk invocation.             Talk client.
+* talkd: (inetutils)talkd invocation.           Talk server.
 * tangle: (web2c)Tangle invocation.             WEB to Pascal.
 * tar: (tar)tar invocation.                     Invoking GNU `tar'.
 * tcal: (gcal)Invoking tcal.                    Run Gcal with tomorrow's date.
@@ -444,6 +451,7 @@ Individual utilities
 * testsuite: (autoconf)testsuite Invocation.    Running an Autotest test suite.
 * tex: (web2c)tex invocation.                   Typesetting.
 * tftopl: (web2c)TFtoPL invocation.             TFM -> property list.
+* tftp: (inetutils)tftp invocation.             Trivial FTP.
 * touch: (coreutils)touch invocation.           Change file timestamps.
 * tput: (tput)Invoking tput.                    Termcap in shell scripts.
 * tr: (coreutils)tr invocation.                 Translate characters.
@@ -457,10 +465,11 @@ Individual utilities
 * unify: (wdiff)unify invocation.               Diff format converter.
 * uniq: (coreutils)uniq invocation.             Uniquify files.
 * unlink: (coreutils)unlink invocation.         Removal via unlink(2).
-* unprotoize: (gcc)Running Protoize.		Remove prototypes from sources.
-* unshar: (sharutils)unshar invocation.         Extract from shell archive.
+* unshar: (sharutils)unshar invocation.         Explode a shell archive.
 * updatedb: (find)Invoking updatedb.            Building the locate database.
 * users: (coreutils)users invocation.           Print current user names.
+* uudecode: (sharutils)uudecode invocation.     Restore file from 7-bits.
+* uuencode: (sharutils)uuencode invocation.     Force binary file to 7-bits.
 * vdir: (coreutils)vdir invocation.             List directories verbosely.
 * vftovp: (web2c)VFtoVP invocation.             Virtual font -> virtual pl.
 * view-pr: (gnats)Invoking view-pr.             Showing bug reports.
@@ -471,8 +480,11 @@ Individual utilities
 * wc: (coreutils)wc invocation.                 Line, word, and byte counts.
 * weave: (web2c)Weave invocation.               WEB to TeX.
 * who: (coreutils)who invocation.               Print who is logged in.
-* whoami: (coreutils)whoami invocation.         Print effective user id.
+* whoami: (coreutils)whoami invocation.         Print effective user ID.
+* windmc: (binutils)windmc.	Generator for Windows message resources.
+* windres: (binutils)windres.	Manipulate Windows resources.
 * xargs: (find)Invoking xargs.                  Operating on many files.
+* xtokid: (id-utils)xtokid invocation.  	Testing mkid scanners.
 * yes: (coreutils)yes invocation.               Print a string indefinitely.
 * zcat: (gzip)Overview.                         Decompression to stdout.
 * zdiff: (gzip)Overview.                        Compare compressed files.
diff --git a/Build/source/utils/texinfo/util/dvipdf.test b/Build/source/utils/texinfo/util/dvipdf.test
new file mode 100755
index 00000000000..f66375be55d
--- /dev/null
+++ b/Build/source/utils/texinfo/util/dvipdf.test
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+#
+# This file is part of GNU Texinfo.
+#
+# GNU Texinfo is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# GNU Texinfo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+required='tex'
+
+. ./defs || exit 1
+
+set -e
+
+# one_run ARGS -- FILES
+# ---------------------
+# Run texi2dvi with ARGS, expect the FILES to be left.  Remove them.
+one_run ()
+{
+  # Use pstricks.
+  cat >input.tex <<EOF
+\documentclass[a4paper]{article}
+\usepackage{pst-node}
+\pagestyle{empty}
+\begin{document}
+\begin{psmatrix}
+  A & B & C & D & E & F
+\end{psmatrix}
+\psset{arrows=->}
+\nccircle{1,1}{0.5}
+\nccircle[angleA=30]{1,2}{0.4}
+\nccircle[arrows=-,nodesep=0.05]{1,3}{0.2}
+\ncloop[angleB=180]{1,4}{1,4}
+\ncloop[angleB=180,linearc=0.35,nodesep=0.1]{1,5}{1,5}
+\ncloop[angleB=180,linearc=0.15,loopsize=0.4]{1,6}{1,6}
+
+\vspace{1cm}
+\begin{psmatrix}
+  A & B & C & D
+\end{psmatrix}
+\psset{arrows=->,nodesep=0.05}
+\ncangles[armA=0.8,armB=0,angleA=70,angleB=110,linearc=0.22]{1,1}{1,1}
+\ncdiag[arm=0.9,angleA=70,angleB=110,linearc=0.3]{1,2}{1,2}
+\ncdiag[arm=0.8,angleA=50,angleB=130,linearc=0.25]{1,3}{1,3}
+\ncdiag[arm=0.8,angleA=50,angleB=130,linearc=0.28]{1,4}{1,4}
+\end{document}
+EOF
+
+  TEXI2DVI_pass $(optionset_get 1 "$@") input.tex
+  # There should only be the expected and input files.
+  assert_and_remove_files $(optionset_get 2 "$@") input.tex
+}
+
+one_run --dvipdf --batch --clean \
+   -- \
+   input.pdf
diff --git a/Build/source/utils/texinfo/util/fixref.gawk b/Build/source/utils/texinfo/util/fixref.gawk
index f0e3cf6d606..4a692f7b7b1 100644
--- a/Build/source/utils/texinfo/util/fixref.gawk
+++ b/Build/source/utils/texinfo/util/fixref.gawk
@@ -1,12 +1,11 @@
 #! /usr/local/bin/gawk -f
 
 # fixref.awk --- fix xrefs in texinfo documents
-# Copyright, 1991, Arnold David Robbins, arnold@skeeve.atl.ga.us
-# Copyright, 1998, Arnold David Robbins, arnold@gnu.org
+# Copyright 1991, 1998 Arnold David Robbins
 
 # FIXREF is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # FIXREF is distributed in the hope that it will be useful,
@@ -15,8 +14,7 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Updated: Jul 21  1992	--- change unknown
 # Updated: Jul 18  1997 --- bug fix
diff --git a/Build/source/utils/texinfo/util/gendocs.sh b/Build/source/utils/texinfo/util/gendocs.sh
index 27d4f52d653..5247034fe0b 100755
--- a/Build/source/utils/texinfo/util/gendocs.sh
+++ b/Build/source/utils/texinfo/util/gendocs.sh
@@ -1,14 +1,16 @@
 #!/bin/sh
 # gendocs.sh -- generate a GNU manual in many formats.  This script is
 #   mentioned in maintain.texi.  See the help message below for usage details.
-# $Id: gendocs.sh,v 1.13 2004/09/01 11:40:20 karl Exp $
-# 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+scriptversion=2008-03-05.14
+
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,35 +18,33 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, you can either send email to this
-# program's maintainer or write to: The Free Software Foundation,
-# Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
-#
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
 # Original author: Mohit Agarwal.
 # Send bug reports and any other correspondence to bug-texinfo@gnu.org.
 
-prog="`basename \"$0\"`"
+prog=`basename "$0"`
 srcdir=`pwd`
 
-scripturl="http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendocs.sh"
-templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendocs_template"
+scripturl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs.sh"
+templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs_template"
 
+: ${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="}
 : ${MAKEINFO="makeinfo"}
 : ${TEXI2DVI="texi2dvi -t @finalout"}
 : ${DVIPS="dvips"}
-: ${DOCBOOK2TXT="docbook2txt"}
 : ${DOCBOOK2HTML="docbook2html"}
 : ${DOCBOOK2PDF="docbook2pdf"}
 : ${DOCBOOK2PS="docbook2ps"}
+: ${DOCBOOK2TXT="docbook2txt"}
 : ${GENDOCS_TEMPLATE_DIR="."}
+: ${TEXI2HTML="texi2html"}
 unset CDPATH
+unset use_texi2html
 
-rcs_revision='$Revision: 1.13 $'
-rcs_version=`set - $rcs_revision; echo $2`
-program=`echo $0 | sed -e 's!.*/!!'`
-version="gendocs.sh $rcs_version
+version="gendocs.sh $scriptversion
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2007 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."
@@ -58,7 +58,8 @@ See the GNU Maintainers document for a more extensive discussion:
 Options:
   -o OUTDIR   write files into OUTDIR, instead of manual/.
   --docbook   convert to DocBook too (xml, txt, html, pdf and ps).
-  --html ARG  pass indicated ARG to makeinfo for HTML targets.
+  --html ARG  pass indicated ARG to makeinfo or texi2html for HTML targets.
+  --texi2html use texi2html to generate HTML targets.
   --help      display this help and exit successfully.
   --version   display version information and exit successfully.
 
@@ -85,16 +86,27 @@ times with different YOURMANUAL values, specifying a different output
 directory with -o each time.  Then write (by hand) an overall index.html
 with links to them all.
 
+If a manual's texinfo sources are spread across several directories,
+first copy or symlink all Texinfo sources into a single directory.
+(Part of the script's work is to make a tar.gz of the sources.)
+
 You can set the environment variables MAKEINFO, TEXI2DVI, and DVIPS to
 control the programs that get executed, and GENDOCS_TEMPLATE_DIR to
-control where the gendocs_template file is looked for.
+control where the gendocs_template file is looked for.  (With --docbook,
+the environment variables DOCBOOK2HTML, DOCBOOK2PDF, DOCBOOK2PS, and
+DOCBOOK2TXT are also respected.) 
+
+By default, makeinfo is run in the default (English) locale, since
+that's the language of most Texinfo manuals.  If you happen to have a
+non-English manual and non-English web site, check the SETLANG setting
+in the source.
 
 Email bug reports or enhancement requests to bug-texinfo@gnu.org.
 "
 
 calcsize()
 {
-  size="`ls -ksl $1 | awk '{print $1}'`"
+  size=`ls -ksl $1 | awk '{print $1}'`
   echo $size
 }
 
@@ -110,6 +122,7 @@ while test $# -gt 0; do
     -o) shift; outdir=$1;;
     --docbook) docbook=yes;;
     --html) shift; html=$1;;
+    --texi2html) use_texi2html=1;;
     -*)
       echo "$0: Unknown or ambiguous option \`$1'." >&2
       echo "$0: Try \`--help' for more information." >&2
@@ -127,11 +140,11 @@ while test $# -gt 0; do
   shift
 done
 
-if test -s $srcdir/$PACKAGE.texinfo; then
+if test -s "$srcdir/$PACKAGE.texinfo"; then
   srcfile=$srcdir/$PACKAGE.texinfo
-elif test -s $srcdir/$PACKAGE.texi; then
+elif test -s "$srcdir/$PACKAGE.texi"; then
   srcfile=$srcdir/$PACKAGE.texi
-elif test -s $srcdir/$PACKAGE.txi; then
+elif test -s "$srcdir/$PACKAGE.txi"; then
   srcfile=$srcdir/$PACKAGE.txi
 else
   echo "$0: cannot find .texinfo or .texi or .txi for $PACKAGE in $srcdir." >&2
@@ -146,91 +159,123 @@ fi
 
 echo Generating output formats for $srcfile
 
-cmd="${MAKEINFO} -o $PACKAGE.info $srcfile"
+cmd="$SETLANG $MAKEINFO -o $PACKAGE.info \"$srcfile\""
 echo "Generating info files... ($cmd)"
-$cmd
+eval "$cmd"
 mkdir -p $outdir/
 tar czf $outdir/$PACKAGE.info.tar.gz $PACKAGE.info*
-info_tgz_size="`calcsize $outdir/$PACKAGE.info.tar.gz`"
+info_tgz_size=`calcsize $outdir/$PACKAGE.info.tar.gz`
 # do not mv the info files, there's no point in having them available
 # separately on the web.
 
-cmd="${TEXI2DVI} $srcfile"
+cmd="${TEXI2DVI} \"$srcfile\""
 echo "Generating dvi ... ($cmd)"
-$cmd
+eval "$cmd"
 
 # now, before we compress dvi:
 echo Generating postscript...
 ${DVIPS} $PACKAGE -o
 gzip -f -9 $PACKAGE.ps
-ps_gz_size="`calcsize $PACKAGE.ps.gz`"
+ps_gz_size=`calcsize $PACKAGE.ps.gz`
 mv $PACKAGE.ps.gz $outdir/
 
 # compress/finish dvi:
 gzip -f -9 $PACKAGE.dvi
-dvi_gz_size="`calcsize $PACKAGE.dvi.gz`"
+dvi_gz_size=`calcsize $PACKAGE.dvi.gz`
 mv $PACKAGE.dvi.gz $outdir/
 
-cmd="${TEXI2DVI} --pdf $srcfile"
+cmd="${TEXI2DVI} --pdf \"$srcfile\""
 echo "Generating pdf ... ($cmd)"
-$cmd
-pdf_size="`calcsize $PACKAGE.pdf`"
+eval "$cmd"
+pdf_size=`calcsize $PACKAGE.pdf`
 mv $PACKAGE.pdf $outdir/
 
-cmd="${MAKEINFO} -o $PACKAGE.txt --no-split --no-headers $srcfile"
+cmd="$SETLANG $MAKEINFO -o $PACKAGE.txt --no-split --no-headers \"$srcfile\""
 echo "Generating ASCII... ($cmd)"
-$cmd
-ascii_size="`calcsize $PACKAGE.txt`"
+eval "$cmd"
+ascii_size=`calcsize $PACKAGE.txt`
 gzip -f -9 -c $PACKAGE.txt >$outdir/$PACKAGE.txt.gz
-ascii_gz_size="`calcsize $outdir/$PACKAGE.txt.gz`"
+ascii_gz_size=`calcsize $outdir/$PACKAGE.txt.gz`
 mv $PACKAGE.txt $outdir/
 
-cmd="${MAKEINFO} --no-split --html -o $PACKAGE.html $html $srcfile"
-echo "Generating monolithic html... ($cmd)"
-rm -rf $PACKAGE.html  # in case a directory is left over
-$cmd
-html_mono_size="`calcsize $PACKAGE.html`"
-gzip -f -9 -c $PACKAGE.html >$outdir/$PACKAGE.html.gz
-html_mono_gz_size="`calcsize $outdir/$PACKAGE.html.gz`"
-mv $PACKAGE.html $outdir/
-
-cmd="${MAKEINFO} --html -o $PACKAGE.html $html $srcfile"
-echo "Generating html by node... ($cmd)"
-$cmd
-split_html_dir=$PACKAGE.html
-(
-  cd ${split_html_dir} || exit 1
-  tar -czf ../$outdir/${PACKAGE}.html_node.tar.gz -- *.html
-)
-html_node_tgz_size="`calcsize $outdir/${PACKAGE}.html_node.tar.gz`"
-rm -f $outdir/html_node/*.html
-mkdir -p $outdir/html_node/
-mv ${split_html_dir}/*.html $outdir/html_node/
-rmdir ${split_html_dir}
+html_split() {
+  cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html --split=$1 $html --node-files \"$srcfile\""
+  echo "Generating html by $1... ($cmd)"
+  eval "$cmd"
+  split_html_dir=$PACKAGE.html
+  (
+    cd ${split_html_dir} || exit 1
+    ln -sf ${PACKAGE}.html index.html
+    tar -czf ../$outdir/${PACKAGE}.html_$1.tar.gz -- *.html
+  )
+  eval html_$1_tgz_size=`calcsize $outdir/${PACKAGE}.html_$1.tar.gz`
+  rm -f $outdir/html_$1/*.html
+  mkdir -p $outdir/html_$1/
+  mv ${split_html_dir}/*.html $outdir/html_$1/
+  rmdir ${split_html_dir}
+}
+
+if test -z "$use_texi2html"; then
+  cmd="$SETLANG $MAKEINFO --no-split --html -o $PACKAGE.html $html \"$srcfile\""
+  echo "Generating monolithic html... ($cmd)"
+  rm -rf $PACKAGE.html  # in case a directory is left over
+  eval "$cmd"
+  html_mono_size=`calcsize $PACKAGE.html`
+  gzip -f -9 -c $PACKAGE.html >$outdir/$PACKAGE.html.gz
+  html_mono_gz_size=`calcsize $outdir/$PACKAGE.html.gz`
+  mv $PACKAGE.html $outdir/
+
+  cmd="$SETLANG $MAKEINFO --html -o $PACKAGE.html $html \"$srcfile\""
+  echo "Generating html by node... ($cmd)"
+  eval "$cmd"
+  split_html_dir=$PACKAGE.html
+  (
+   cd ${split_html_dir} || exit 1
+   tar -czf ../$outdir/${PACKAGE}.html_node.tar.gz -- *.html
+  )
+  html_node_tgz_size=`calcsize $outdir/${PACKAGE}.html_node.tar.gz` 
+  rm -f $outdir/html_node/*.html
+  mkdir -p $outdir/html_node/
+  mv ${split_html_dir}/*.html $outdir/html_node/
+  rmdir ${split_html_dir}
+else
+  cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html $html \"$srcfile\"" 
+  echo "Generating monolithic html... ($cmd)"
+  rm -rf $PACKAGE.html  # in case a directory is left over
+  eval "$cmd"
+  html_mono_size=`calcsize $PACKAGE.html`
+  gzip -f -9 -c $PACKAGE.html >$outdir/$PACKAGE.html.gz
+  html_mono_gz_size=`calcsize $outdir/$PACKAGE.html.gz`
+  mv $PACKAGE.html $outdir/
+
+  html_split node
+  html_split chapter
+  html_split section
+fi
 
 echo Making .tar.gz for sources...
 srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null`
 tar cvzfh $outdir/$PACKAGE.texi.tar.gz $srcfiles
-texi_tgz_size="`calcsize $outdir/$PACKAGE.texi.tar.gz`"
+texi_tgz_size=`calcsize $outdir/$PACKAGE.texi.tar.gz`
 
 if test -n "$docbook"; then
-  cmd="${MAKEINFO} -o - --docbook $srcfile > ${srcdir}/$PACKAGE-db.xml"
+  cmd="$SETLANG $MAKEINFO -o - --docbook \"$srcfile\" > ${srcdir}/$PACKAGE-db.xml"
   echo "Generating docbook XML... $(cmd)"
-  eval $cmd
-  docbook_xml_size="`calcsize $PACKAGE-db.xml`"
+  eval "$cmd"
+  docbook_xml_size=`calcsize $PACKAGE-db.xml`
   gzip -f -9 -c $PACKAGE-db.xml >$outdir/$PACKAGE-db.xml.gz
-  docbook_xml_gz_size="`calcsize $outdir/$PACKAGE-db.xml.gz`"
+  docbook_xml_gz_size=`calcsize $outdir/$PACKAGE-db.xml.gz`
   mv $PACKAGE-db.xml $outdir/
 
   cmd="${DOCBOOK2HTML} -o $split_html_db_dir ${outdir}/$PACKAGE-db.xml"
   echo "Generating docbook HTML... ($cmd)"
-  $cmd
+  eval "$cmd"
   split_html_db_dir=html_node_db
   (
     cd ${split_html_db_dir} || exit 1
     tar -czf ../$outdir/${PACKAGE}.html_node_db.tar.gz -- *.html
   )
-  html_node_db_tgz_size="`calcsize $outdir/${PACKAGE}.html_node_db.tar.gz`"
+  html_node_db_tgz_size=`calcsize $outdir/${PACKAGE}.html_node_db.tar.gz`
   rm -f $outdir/html_node_db/*.html
   mkdir -p $outdir/html_node_db
   mv ${split_html_db_dir}/*.html $outdir/html_node_db/
@@ -238,26 +283,32 @@ if test -n "$docbook"; then
 
   cmd="${DOCBOOK2TXT} ${outdir}/$PACKAGE-db.xml"
   echo "Generating docbook ASCII... ($cmd)"
-  $cmd
-  docbook_ascii_size="`calcsize $PACKAGE-db.txt`"
+  eval "$cmd"
+  docbook_ascii_size=`calcsize $PACKAGE-db.txt`
   mv $PACKAGE-db.txt $outdir/
 
   cmd="${DOCBOOK2PS} ${outdir}/$PACKAGE-db.xml"
   echo "Generating docbook PS... $(cmd)"
-  $cmd
+  eval "$cmd"
   gzip -f -9 -c $PACKAGE-db.ps >$outdir/$PACKAGE-db.ps.gz
-  docbook_ps_gz_size="`calcsize $outdir/$PACKAGE-db.ps.gz`"
+  docbook_ps_gz_size=`calcsize $outdir/$PACKAGE-db.ps.gz`
   mv $PACKAGE-db.ps $outdir/
 
   cmd="${DOCBOOK2PDF} ${outdir}/$PACKAGE-db.xml"
   echo "Generating docbook PDF... ($cmd)"
-  $cmd
-  docbook_pdf_size="`calcsize $PACKAGE-db.pdf`"
+  eval "$cmd"
+  docbook_pdf_size=`calcsize $PACKAGE-db.pdf`
   mv $PACKAGE-db.pdf $outdir/
 fi
 
 echo Writing index file...
-curdate="`date '+%B %d, %Y'`"
+if test -z "$use_texi2html"; then
+   CONDS="/%%IF  *HTML_SECTION%%/,/%%ENDIF  *HTML_SECTION%%/d;\
+          /%%IF  *HTML_CHAPTER%%/,/%%ENDIF  *HTML_CHAPTER%%/d"
+else
+   CONDS="/%%ENDIF.*%%/d;/%%IF  *HTML_SECTION%%/d;/%%IF  *HTML_CHAPTER%%/d"
+fi
+curdate=`$SETLANG date '+%B %d, %Y'`
 sed \
    -e "s!%%TITLE%%!$MANUAL_TITLE!g" \
    -e "s!%%DATE%%!$curdate!g" \
@@ -265,6 +316,8 @@ sed \
    -e "s!%%HTML_MONO_SIZE%%!$html_mono_size!g" \
    -e "s!%%HTML_MONO_GZ_SIZE%%!$html_mono_gz_size!g" \
    -e "s!%%HTML_NODE_TGZ_SIZE%%!$html_node_tgz_size!g" \
+   -e "s!%%HTML_SECTION_TGZ_SIZE%%!$html_section_tgz_size!g" \
+   -e "s!%%HTML_CHAPTER_TGZ_SIZE%%!$html_chapter_tgz_size!g" \
    -e "s!%%INFO_TGZ_SIZE%%!$info_tgz_size!g" \
    -e "s!%%DVI_GZ_SIZE%%!$dvi_gz_size!g" \
    -e "s!%%PDF_SIZE%%!$pdf_size!g" \
@@ -280,6 +333,14 @@ sed \
    -e "s!%%DOCBOOK_XML_GZ_SIZE%%!$docbook_xml_gz_size!g" \
    -e "s,%%SCRIPTURL%%,$scripturl,g" \
    -e "s!%%SCRIPTNAME%%!$prog!g" \
+   -e "$CONDS" \
 $GENDOCS_TEMPLATE_DIR/gendocs_template >$outdir/index.html
 
 echo "Done!  See $outdir/ subdirectory for new files."
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/Build/source/utils/texinfo/util/gendocs_template b/Build/source/utils/texinfo/util/gendocs_template
index 6fb2cf950ba..be93a637bc5 100755
--- a/Build/source/utils/texinfo/util/gendocs_template
+++ b/Build/source/utils/texinfo/util/gendocs_template
@@ -1,15 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- $Id: gendocs_template,v 1.6 2004/09/23 13:16:19 karl Exp $ -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
-<head>
+<!--#include virtual="/server/header.html" -->
 <title>%%TITLE%% - GNU Project - Free Software Foundation (FSF)</title>
-<meta http-equiv="content-type" content='text/html; charset=utf-8' />
-<link rel="stylesheet" type="text/css" href="/gnu.css" />
-<link rev="made" href="webmasters@gnu.org" />
-</head>
+<!--#include virtual="/server/banner.html" -->
+<h2>%%TITLE%%</h2>
 
 <!-- This document is in XML, and xhtml 1.0 -->
 <!-- Please make sure to properly nest your tags -->
@@ -17,84 +9,92 @@
 <!-- consistent with W3C xhtml 1.0 and CSS standards -->
 <!-- See validator.w3.org -->
 
-<body>
-
-<h3>%%TITLE%%</h3>
-
 <address>Free Software Foundation</address>
 <address>last updated %%DATE%%</address>
-<p>
-<a href="/graphics/gnu-head.jpg">
-	<img src="/graphics/gnu-head-sm.jpg"
-	alt=" [image of the head of a GNU] "
-	width="129" height="122" />
-</a>
-<a href="/philosophy/gif.html">(no gifs due to patent problems)</a>
-</p>
-<hr />
 
 <p>This manual (%%PACKAGE%%) is available in the following formats:</p>
 
 <ul>
-  <li><a href="%%PACKAGE%%.html">HTML 
-      (%%HTML_MONO_SIZE%%K characters)</a> - entirely on one web page.</li>
-  <li><a href="html_node/index.html">HTML</a> - with one web page per
-      node.</li>
-  <li><a href="%%PACKAGE%%.html.gz">HTML compressed
-      (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on 
-      one web page.</li>
-  <li><a href="%%PACKAGE%%.html_node.tar.gz">HTML compressed
-      (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file)</a> -
-      with one web page per node.</li>
-  <li><a href="%%PACKAGE%%.info.tar.gz">Info document
-      (%%INFO_TGZ_SIZE%%K characters gzipped tar file)</a>.</li>
-  <li><a href="%%PACKAGE%%.txt">ASCII text
-      (%%ASCII_SIZE%%K characters)</a>.</li>
-  <li><a href="%%PACKAGE%%.txt.gz">ASCII text compressed
-      (%%ASCII_GZ_SIZE%%K gzipped characters)</a>.</li>
-  <li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file
-      (%%DVI_GZ_SIZE%%K characters gzipped)</a>.</li>
-  <li><a href="%%PACKAGE%%.ps.gz">PostScript file
-      (%%PS_GZ_SIZE%%K characters gzipped)</a>.</li>
-  <li><a href="%%PACKAGE%%.pdf">PDF file
-      (%%PDF_SIZE%%K characters)</a>.</li>
-  <li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source
-      (%%TEXI_TGZ_SIZE%%K characters gzipped tar file)</a></li>
+<li><a href="%%PACKAGE%%.html">HTML 
+    (%%HTML_MONO_SIZE%%K bytes)</a> - entirely on one web page.</li>
+<li><a href="html_node/index.html">HTML</a> - with one web page per
+    node.</li>
+%%IF HTML_SECTION%%
+<li><a href="html_section/index.html">HTML</a> - with one web page per
+    section.</li>
+%%ENDIF HTML_SECTION%%
+%%IF HTML_CHAPTER%%
+<li><a href="html_chapter/index.html">HTML</a> - with one web page per
+    chapter.</li>
+%%ENDIF HTML_CHAPTER%%
+<li><a href="%%PACKAGE%%.html.gz">HTML compressed
+    (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on 
+    one web page.</li>
+<li><a href="%%PACKAGE%%.html_node.tar.gz">HTML compressed
+    (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file)</a> -
+    with one web page per node.</li>
+%%IF HTML_SECTION%%
+<li><a href="%%PACKAGE%%.html_section.tar.gz">HTML compressed
+    (%%HTML_SECTION_TGZ_SIZE%%K gzipped tar file)</a> -
+    with one web page per section.</li>
+%%ENDIF HTML_SECTION%%
+%%IF HTML_CHAPTER%%
+<li><a href="%%PACKAGE%%.html_chapter.tar.gz">HTML compressed
+    (%%HTML_CHAPTER_TGZ_SIZE%%K gzipped tar file)</a> -
+    with one web page per chapter.</li>
+%%ENDIF HTML_CHAPTER%%
+<li><a href="%%PACKAGE%%.info.tar.gz">Info document
+    (%%INFO_TGZ_SIZE%%K bytes gzipped tar file)</a>.</li>
+<li><a href="%%PACKAGE%%.txt">ASCII text
+    (%%ASCII_SIZE%%K bytes)</a>.</li>
+<li><a href="%%PACKAGE%%.txt.gz">ASCII text compressed
+    (%%ASCII_GZ_SIZE%%K bytes gzipped)</a>.</li>
+<li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file
+    (%%DVI_GZ_SIZE%%K bytes gzipped)</a>.</li>
+<li><a href="%%PACKAGE%%.ps.gz">PostScript file
+    (%%PS_GZ_SIZE%%K bytes gzipped)</a>.</li>
+<li><a href="%%PACKAGE%%.pdf">PDF file
+    (%%PDF_SIZE%%K bytes)</a>.</li>
+<li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source
+    (%%TEXI_TGZ_SIZE%%K bytes gzipped tar file).</a></li>
 </ul>
 
+<p>You can <a href="http://www.gnu.org/order/">buy printed copies of
+some manuals</a> (among other items) from the Free Software Foundation;
+this helps support FSF activities.</p>
+
 <p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%%
 script</a>.)</p>
 
-<div class="copyright">
-<p>
-Return to the <a href="/home.html">GNU Project home page</a>.
-</p>
+<!-- If needed, change the copyright block at the bottom. In general, -->
+<!-- all pages on the GNU web server should have the section about    -->
+<!-- verbatim copying.  Please do NOT remove this without talking     -->
+<!-- with the webmasters first. --> 
+<!-- Please make sure the copyright date is consistent with the document -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer-min.html" -->
+<div id="footer">
 
 <p>
 Please send FSF &amp; GNU inquiries to 
 <a href="mailto:gnu@gnu.org"><em>gnu@gnu.org</em></a>.
-There are also <a href="/home.html#ContactInfo">other ways to contact</a> 
+There are also <a href="/contact/">other ways to contact</a> 
 the FSF.
 <br />
-Please send broken links and other corrections (or suggestions) to
+Please send broken links and other corrections or suggestions to
 <a href="mailto:webmasters@gnu.org"><em>webmasters@gnu.org</em></a>.
 </p>
 
 <p>
-Copyright (C) 2004 Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111, USA
-<br />
-Verbatim copying and distribution of this entire article is
+Copyright &copy; 2007 Free Software Foundation, Inc.,
+</p>
+<address>51 Franklin Street, Fifth Floor, Boston, MA 02111, USA</address>
+<p>Verbatim copying and distribution of this entire article is
 permitted in any medium, provided this notice is preserved.
 </p>
 
-<p>
-Updated:
-<!-- timestamp start -->
-$Date: 2004/09/23 13:16:19 $ $Author: karl $
-<!-- timestamp end -->
-</p>
 </div>
-
+</div>
 </body>
 </html>
diff --git a/Build/source/utils/texinfo/util/latex2html.test b/Build/source/utils/texinfo/util/latex2html.test
new file mode 100755
index 00000000000..d52bf2f7084
--- /dev/null
+++ b/Build/source/utils/texinfo/util/latex2html.test
@@ -0,0 +1,79 @@
+#! /bin/sh
+# Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+#
+# This file is part of GNU Texinfo.
+#
+# GNU Texinfo is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# GNU Texinfo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+required='hevea'
+
+. ./defs || exit 1
+
+set -e
+
+# Force the creation of auxiliary files.
+# Force it to be big enough to trigger the info file splitting.
+{
+  echo "\tableofcontents"
+  for section in 1 2 3 4 5 6
+  do
+    echo "\section{$i}"
+    for subsection in 1 2 3 4 5 6
+    do
+      echo "\subsection{$i}"
+      echo "$latex_paragraph"
+    done
+  done
+} |
+create_input_tex
+
+
+# run_hevea_check FORMAT OPTIONS
+# ------------------------------
+run_hevea_check ()
+{
+  title "$@"
+
+  format="$1"
+  shift
+
+  # Testing the local build mode.
+  TEXI2DVI_pass --batch --$format "$@" input.tex
+
+  # Compute the expected output.
+  outfiles=input.$out
+  case $format in
+     info) outfiles="$outfiles input.info-1 input.info-2";;
+  esac
+
+  # Compute the aux files.
+  case $format:$@ in
+    *clean* ) auxfiles='';;
+     *tidy* ) auxfiles='input.t2d';;
+     html:*|text:* ) auxfiles='input.haux input.htoc';;
+      dvi:* ) auxfiles='input.aux input.log input.toc';;
+          * ) auxfiles='';;
+  esac
+  # There should only be the expected output and the source file.
+  assert_files input.tex $outfiles $auxfiles
+  rm -fr $outfiles $auxfiles
+}
+
+for opt in "" "--clean" "--tidy"
+do
+  for out in html info text
+    do
+    run_hevea_check $out $opt
+  done
+done
diff --git a/Build/source/utils/texinfo/util/local.test b/Build/source/utils/texinfo/util/local.test
new file mode 100755
index 00000000000..ff4aa7928ac
--- /dev/null
+++ b/Build/source/utils/texinfo/util/local.test
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2003, 2005, 2007, 2008  Free Software Foundation, Inc.
+#
+# This file is part of GNU Texinfo.
+#
+# GNU Texinfo is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# GNU Texinfo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure no "local" variable identifier is used twice, since
+# local is not actually portable.
+
+. ./defs || exit 1
+
+set -e
+
+# Make sure quotes are used to protect the value.  See the comment in
+# texi2dvi itself about local.
+if sed -e 's/^[	 ]*#.*//' $TEXI2DVI |
+    $EGREP "\blocal [a-zA-Z_0-9]*=[^\"']" |
+    $EGREP -v "\blocal [a-zA-Z_0-9]*=[a-zA-Z0-9]*$" |
+    grep .
+then
+  false
+else
+  true
+fi
+
+
+# Make sure each name is used only once.
+if sed -n -e 's/^#.*//' \
+          -e 's/local \([a-zA-Z_0-9]*\)/\1/gp' $TEXI2DVI |
+    sort |
+    uniq -c |
+    grep -v '^.*1 ' |
+    grep .
+then
+  false
+else
+  true
+fi
+
+
+# Make sure we don't use $().
+if $FGREP '$(' $TEXI2DVI
+then
+  false
+else
+  true
+fi
diff --git a/Build/source/utils/texinfo/util/outline.gawk b/Build/source/utils/texinfo/util/outline.gawk
index 329bb17529a..fa6726356e3 100644
--- a/Build/source/utils/texinfo/util/outline.gawk
+++ b/Build/source/utils/texinfo/util/outline.gawk
@@ -6,7 +6,7 @@
 # 
 # TEXI.OUTLINE is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # TEXI.OUTLINE is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # NOTE:
 #	This program uses gensub(), which is specific to gawk.
diff --git a/Build/source/utils/texinfo/util/pdftexi2dvi b/Build/source/utils/texinfo/util/pdftexi2dvi
new file mode 100755
index 00000000000..17708e76579
--- /dev/null
+++ b/Build/source/utils/texinfo/util/pdftexi2dvi
@@ -0,0 +1,19 @@
+#!/bin/sh
+# $Id: pdftexi2dvi,v 1.3 2007/07/05 15:22:26 karl Exp $
+# Written by Thomas Esser.  Public domain.
+# Execute texi2dvi --pdf.
+
+test -f /bin/ksh && test -z "$RUNNING_KSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
+  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
+unset RUNNING_KSH
+
+test -f /bin/bsh && test -z "$RUNNING_BSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
+  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
+unset RUNNING_BSH
+
+# hack around a bug in zsh:
+test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+
+texi2dvi --pdf ${1+"$@"}
diff --git a/Build/source/utils/texinfo/util/prepinfo.awk b/Build/source/utils/texinfo/util/prepinfo.awk
index 273c97f8460..18e668b298e 100644
--- a/Build/source/utils/texinfo/util/prepinfo.awk
+++ b/Build/source/utils/texinfo/util/prepinfo.awk
@@ -2,11 +2,11 @@
 
 # prepinfo.awk --- fix node lines and menus
 #
-# Copyright, 1998, Arnold Robbins, arnold@gnu.org
+# Copyright 1998 Arnold Robbins, arnold@gnu.org
 #
 # PREPINFO is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # PREPINFO is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 BEGIN	\
 {
diff --git a/Build/source/utils/texinfo/util/texi-docstring-magic.el b/Build/source/utils/texinfo/util/texi-docstring-magic.el
index 9cbca2b7591..ab66c911939 100644
--- a/Build/source/utils/texinfo/util/texi-docstring-magic.el
+++ b/Build/source/utils/texinfo/util/texi-docstring-magic.el
@@ -5,10 +5,10 @@
 ;; Copyright (C) 1998 David Aspinall
 ;; Maintainer:  David Aspinall <da@dcs.ed.ac.uk>
 ;;
-;; $Id: texi-docstring-magic.el,v 1.2 2004/04/11 17:56:47 karl Exp $
+;; $Id: texi-docstring-magic.el,v 1.3 2007/07/01 21:20:33 karl Exp $
 ;;
 ;; This package is distributed under the terms of the 
-;; GNU General Public License, Version 2.   
+;; GNU General Public License, Version 3.
 ;; You should have a copy of the GPL with your version of 
 ;; GNU Emacs or the Texinfo distribution.
 ;; 
diff --git a/Build/source/utils/texinfo/util/texi2dvi b/Build/source/utils/texinfo/util/texi2dvi
index 18f6f59322b..4607be1949e 100755
--- a/Build/source/utils/texinfo/util/texi2dvi
+++ b/Build/source/utils/texinfo/util/texi2dvi
@@ -1,14 +1,14 @@
 #! /bin/sh
-# texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
-# $Id: texi2dvi,v 1.42 2005/02/11 13:35:14 karl Exp $
+# texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
+# $Id: texi2dvi,v 1.122 2008/04/17 18:45:49 karl Exp $
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
-# 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, you can either send email to this
-# program's maintainer or write to: The Free Software Foundation,
-# Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Original author: Noah Friedman.
 #
@@ -31,48 +29,106 @@ test -f /bin/ksh && test -z "$RUNNING_KSH" \
   && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
 unset RUNNING_KSH
 
+# No failure shall remain unpunished.
+set -e
+
 # This string is expanded by rcs automatically when this file is checked out.
-rcs_revision='$Revision: 1.42 $'
+rcs_revision='$Revision: 1.122 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
-version="texi2dvi (GNU Texinfo 4.8) $rcs_version
+version="texi2dvi (GNU Texinfo 4.12) $rcs_version
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+"
 
-Copyright (C) 2005 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."
+build_mode=${TEXI2DVI_BUILD_MODE:-local}
+build_dir=${TEXI2DVI_BUILD_DIRECTORY:-.}
 
 usage="Usage: $program [OPTION]... FILE...
 
-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).
+is used to determine its language ((La)TeX or Texinfo).  To process
+(e)plain TeX files, set the environment variable LATEX=tex.
+
+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.
+  \`\\input{FILE}'     the actual file to compile
+  \`\\nonstopmode'     same as --batch
 
 Makeinfo is used to perform Texinfo macro expansion before running TeX
 when needed.
 
-Operation modes:
+General options:
   -b, --batch         no interaction
-  -c, --clean         remove all auxiliary files
   -D, --debug         turn on shell debugging (set -x)
   -h, --help          display this help and exit successfully
   -o, --output=OFILE  leave output in OFILE (implies --clean);
-                      Only one input FILE may be specified in this case
+			only one input FILE may be specified in this case
   -q, --quiet         no output unless errors (implies --batch)
   -s, --silent        same as --quiet
   -v, --version       display version information and exit successfully
   -V, --verbose       report on what is done
 
 TeX tuning:
-  -@                   use @input instead of \input; for preloaded Texinfo
-  -e, -E, --expand     force macro expansion using makeinfo
-  -I DIR               search DIR for Texinfo files
-  -l, --language=LANG  specify the LANG of FILE (LaTeX or Texinfo)
-  -p, --pdf            use pdftex or pdflatex for processing
-  -r, --recode         call recode before TeX to translate input characters
-  -t, --command=CMD    insert CMD in copy of input file
-   or --texinfo=CMD    multiple values accumulate
+  -@                         use @input instead of \input for preloaded Texinfo
+      --dvi                  output a DVI file [default]
+  -e, -E, --expand           force macro expansion using makeinfo
+  -I DIR                     search DIR for Texinfo files
+  -l, --language=LANG        specify the LANG of FILE (LaTeX or Texinfo)
+      --no-line-error        do not pass --file-line-error to TeX
+  -p, --pdf                  use pdftex or pdflatex for processing
+  -r, --recode               call recode before TeX to translate input
+      --recode-from=ENC      recode from ENC to the @documentencoding
+      --src-specials         pass --src-specials to TeX
+  -t, --command=CMD          insert CMD in copy of input file
+   or --texinfo=CMD          multiple values accumulate
+      --translate-file=FILE  use given charset translation file for TeX
+
+Build modes:
+  --build=MODE         specify the treatment of auxiliary files [$build_mode]
+      --tidy           same as --build=tidy
+  -c, --clean          same as --build=clean
+      --build-dir=DIR  specify where the tidy compilation is performed;
+			 implies --tidy;
+			 defaults to TEXI2DVI_BUILD_DIRECTORY [$build_dir]
+  --mostly-clean       remove the auxiliary files and directories
+			 but not the output
+
+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.
+
+Valid MODEs are:
+  \`local'      compile in the current directory, leaving all the auxiliary
+	       files around.  This is the traditional TeX use.
+  \`tidy'       compile in a local *.t2d directory, where the auxiliary files
+	       are left.  Output files are copied back to the original file.
+  \`clean'      same as \`tidy', but remove the auxiliary directory afterwards.
+	       Every compilation therefore requires the full cycle.
+
+Using the \`tidy' mode brings several advantages:
+  -   the current directory is not cluttered with plethora of temporary files.
+  -   clutter can be even reduced using --build-dir=dir: all the *.t2d
+      directories are stored there.
+  -   clutter can be reduced to zero using, e.g., --build-dir=/tmp/\$USER.t2d
+      or --build-dir=\$HOME/.t2d.
+  -   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.
+  -   if the compilation fails, the previous state of the output file
+      is preserved.
+  -   PDF and DVI compilation are kept in separate subdirectories
+      preventing any possibility of auxiliary file incompatibility.
+
+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 \\graphicspath): in that case use -I to specify the additional
+directories to consider.
 
 The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO,
 TEX (or PDFTEX), TEXINDEX, and THUMBPDF environment variables are used
@@ -86,30 +142,48 @@ Texinfo home page: http://www.gnu.org/software/texinfo/"
 # Initialize variables for option overriding and otherwise.
 # Don't use `unset' since old bourne shells don't have this command.
 # Instead, assign them an empty value.
-batch=false     # eval for batch mode
-clean=
-debug=
-escape='\'
+action=compile
+batch=false     # true for batch mode
+debug=false
+escape="\\"
 expand=         # t for expansion via makeinfo
-miincludes=     # makeinfo include path
-oformat=dvi
+includes=
+line_error=true # Pass --file-line-error to TeX.
+no_line_error=false  # absolutely do not pass --file-line-error to TeX
 oname=          # --output
-quiet=          # by default let the tools' message be displayed
+out_lang=dvi
+quiet=false     # by default let the tools' message be displayed
 recode=false
 set_language=
+src_specials=
 textra=         # Extra TeX commands to insert in the input file.
-textra_cmd=     # sed command to insert TEXTRA where appropriate
-tmpdir=${TMPDIR:-/tmp}/t2d$$  # avoid collisions on 8.3 filesystems.
-txincludes=     # TEXINPUTS extensions, with trailing colon
 txiprereq=19990129 # minimum texinfo.tex version with macro expansion
-verb=false      # echo for verbose mode
+verb=false      # true for verbose mode
+translate_file= # name of charset translation file
+recode_from=    # if not empty, recode from this encoding to @documentencoding
 
 orig_pwd=`pwd`
 
+# We have to initialize IFS to space tab newline since we save and
+# restore IFS and apparently POSIX allows stupid/broken behavior with
+# empty-but-set IFS.
+# http://lists.gnu.org/archive/html/automake-patches/2006-05/msg00008.html
+# We need space, tab and new line, in precisely that order.  And don't leave
+# trailing blanks.
+space=' '
+tab='	'
+newline='
+'
+IFS="$space$tab$newline"
+
+# In case someone pedantic insists on using grep -E.
+: ${EGREP=egrep}
+
 # Systems which define $COMSPEC or $ComSpec use semicolons to separate
-# directories in TEXINPUTS -- except for Cygwin, where COMSPEC might be
-# inherited, but : is used.
-if test -n "$COMSPEC$ComSpec" && uname | grep -iv cygwin >/dev/null; then
+# directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC
+# might be inherited, but : is used.
+if test -n "$COMSPEC$ComSpec" \
+   && uname | $EGREP -iv 'cygwin|mingw|djgpp' >/dev/null; then
   path_sep=";"
 else
   path_sep=":"
@@ -118,37 +192,129 @@ fi
 # Pacify verbose cds.
 CDPATH=${ZSH_VERSION+.}$path_sep
 
-# In case someone crazy insists on using grep -E.
-: ${EGREP=egrep}
+# If $TEX is set to a directory, don't use it.
+test -n "$TEX" && test -d "$TEX" && unset TEX
 
-# return true if program $1 is somewhere in PATH, else false.
+# 
+## --------------------- ##
+## Auxiliary functions.  ##
+## --------------------- ##
+
+# In case `local' is not supported by the shell, provide a function
+# that simulates it by simply performing the assignments.  This means
+# that we must not expect `local' to work, i.e., we must not (i) rely
+# on it during recursion, and (ii) have two local declarations of the
+# same variable.  (ii) is easy to check statically, and our test suite
+# does make sure there is never twice a static local declaration of a
+# variable.  (i) cannot be checked easily, so just be careful.
 #
-findprog ()
+# Note that since we might use a function simulating `local', we can
+# no longer rely on the fact that no IFS-splitting is performed.  So,
+# while
+#
+# foo=$bar
+#
+# is fine (no IFS-splitting), never write
+#
+# local foo=$bar
+#
+# but rather
+#
+# local foo="$bar"
+(
+  foo=bar
+  test_local () {
+    local foo=foo
+  }
+  test_local
+  test $foo = bar
+) || local () {
+  case $1 in
+    *=*) eval "$1";;
+  esac
+}
+
+
+# cd_orig
+# -------
+# Return to the original directory.
+cd_orig ()
 {
-  foundprog=false
+  # In case $orig_pwd is on a different drive (for DOS).
+  cd /
 
-  saveIFS=$IFS
+  # Return to the original directory so that
+  # - the next file is processed in correct conditions
+  # - the temporary file can be removed
+  cd "$orig_pwd" || exit 1
+}
+
+# func_dirname FILE
+# -----------------
+# Return the directory part of FILE.
+func_dirname ()
+{
+  dirname "$1" 2>/dev/null \
+  || { echo "$1" | sed 's!/[^/]*$!!;s!^$!.!'; }
+}
+
+
+# absolute NAME -> ABS-NAME
+# -------------------------
+# Return an absolute path to NAME.
+absolute ()
+{
+  case $1 in
+   [\\/]* | ?:[\\/]*)
+      # Absolute paths don't need to be expanded.
+      echo "$1"
+      ;;
+   *) local slashes
+      slashes=`echo "$1" | sed -n 's,.*[^/]\(/*\)$,\1,p'`
+      local rel
+      rel=$orig_pwd/`func_dirname "$1"`
+      if test -d "$rel"; then
+	(cd "$rel" 2>/dev/null &&
+	 local n
+	 n=`pwd`/`basename "$1"`"$slashes"
+	 echo "$n")
+      else
+	error 1 "not a directory: $rel"
+      fi
+      ;;
+  esac
+}
+
+
+# findprog PROG
+# -------------
+# Return true if PROG is somewhere in PATH, else false.
+findprog ()
+{
+  local saveIFS="$IFS"
   IFS=$path_sep  # break path components at the path separator
   for dir in $PATH; do
-    # use test -x rather than test -f for DJGPP, where test -x checks
-    # for .exe.  But test -x will also return true for directories, so
-    # explicitly ignore those.
-    if test -x "$dir/$1" && test ! -d "$dir/$1"; then
-      foundprog=true
-      break
-
-    # But on cygwin, test -x foo will not find foo.exe.  So also check
-    # for that.
-    elif test -x "$dir/$1.exe"; then
-      foundprog=true
-      break      
+    IFS=$saveIFS
+    # The basic test for an executable is `test -f $f && test -x $f'.
+    # (`test -x' is not enough, because it can also be true for directories.)
+    # We have to try this both for $1 and $1.exe.
+    #
+    # Note: On Cygwin and DJGPP, `test -x' also looks for .exe.  On Cygwin,
+    # also `test -f' has this enhancement, bot not on DJGPP.  (Both are
+    # design decisions, so there is little chance to make them consistent.)
+    # Thusly, it seems to be difficult to make use of these enhancements.
+    #
+    if  { test -f "$dir/$1"	&& test -x "$dir/$1"; } ||
+	{ test -f "$dir/$1.exe"	&& test -x "$dir/$1.exe"; }; then
+      return 0
     fi
   done
-  IFS=$saveIFS
-  $foundprog
+  return 1
 }
 
-# Report some information.
+# report LINE1 LINE2...
+# ---------------------
+# Report some information on stderr.
 report ()
 {
   for i in "$@"
@@ -157,30 +323,1083 @@ report ()
   done
 }
 
+# verbose WORD1 WORD2
+# -------------------
 # Report some verbose information.
 verbose ()
 {
-  $verb >&2 "$0: $@"
+  if $verb; then
+    echo >&2 "$0: $@"
+  fi
 }
 
-# Report an error and exit with failure.
-fatal ()
+# run COMMAND-LINE
+# ----------------
+# Run the COMMAND-LINE verbosely, and catching errors as failures.
+run ()
 {
-  s=$1
+  verbose "Running $@"
+  "$@" 2>&5 1>&2 ||
+     error 1 "$1 failed"
+}
+
+
+# error EXIT_STATUS LINE1 LINE2...
+# --------------------------------
+# Report an error and exit with failure if EXIT_STATUS is non null.
+error ()
+{
+  local s="$1"
   shift
   report "$@"
-  exit $s
+  if test "$s" != 0; then
+    exit $s
+  fi
+}
+
+# ensure_dir DIR1 DIR2...
+# -----------------------
+# Make sure the directories exist.
+ensure_dir ()
+{
+  for dir
+  do
+    test -d "$dir" \
+      || mkdir "$dir" \
+      || error 1 "cannot create directory: $dir"
+  done
+}
+
+
+## ---------------- ##
+## Handling lists.  ##
+## ---------------- ##
+
+
+# list_append LIST-NAME ELEM
+# --------------------------
+# Set LIST-NAME to its former contents, with ELEM appended.
+list_append ()
+{
+  local la_l="$1"
+  shift
+  eval set X \$$la_l "$@"
+  shift
+  eval $la_l=\""$@"\"
+}
+
+# list_prefix LIST-NAME SEP -> STRING
+# -----------------------------------
+# Return a string that is composed of the LIST-NAME with each item
+# preceded by SEP.
+list_prefix ()
+{
+  local lp_p="$2"
+  eval set X \$$1
+  shift
+  local lp_res
+  for i
+  do
+    lp_res="$lp_res \"$lp_p\" \"$i\""
+  done
+  echo "$lp_res"
 }
 
+# list_infix LIST-NAME SEP -> STRING
+# ----------------------------------
+# Same as list_prefix, but a separator.
+list_infix ()
+{
+  eval set X \$$1
+  shift
+  local la_IFS="$IFS"
+  IFS=$path_sep
+  echo "$*"
+  IFS=$la_IFS
+}
+
+# list_dir_to_abs LIST-NAME
+# -------------------------
+# Convert the list to using only absolute dir names.
+# Currently unused, but should replace absolute_filenames some day.
+list_dir_to_abs ()
+{
+  local ld_l="$1"
+  eval set X \$$ld_l
+  shift
+  local ld_res
+  for dir
+  do
+    dir=`absolute "$dir"`
+    test -d "$dir" || continue
+    ld_res="$ld_res \"$dir\""
+  done
+  set X $ld_res; shift
+  eval $ld_l=\"$@\"
+}
+
+
+## ------------------------------ ##
+## Language auxiliary functions.  ##
+## ------------------------------ ##
+
+# out_lang_tex
+# ------------
+# Return the tex output language (DVI or PDF) for $OUT_LANG.
+out_lang_tex ()
+{
+  case $out_lang in
+    dvi | ps | dvipdf ) echo dvi;;
+    pdf ) echo $out_lang;;
+    html | info | text ) echo $out_lang;;
+    *)    error 1 "$0: invalid out_lang: $1";;
+  esac
+}
+
+
+# out_lang_ext
+# ------------
+# Return the extension for $OUT_LANG.
+out_lang_ext ()
+{
+  case $out_lang in
+    dvipdf ) echo pdf;;
+    dvi | html | info | pdf | ps | text ) echo $out_lang;;
+    *)    error 1 "$0: invalid out_lang: $1";;
+  esac
+}
+
+
+## ------------------------- ##
+## TeX auxiliary functions.  ##
+## ------------------------- ##
+
 # Save TEXINPUTS so we can construct a new TEXINPUTS path for each file.
 # Likewise for bibtex and makeindex.
-tex_envvars="BIBINPUTS BSTINPUTS INDEXSTYLE TEXINPUTS"
+tex_envvars="BIBINPUTS BSTINPUTS DVIPSHEADERS INDEXSTYLE MFINPUTS MPINPUTS \
+TEXINPUTS TFMFONTS"
 for var in $tex_envvars; do
   eval ${var}_orig=\$$var
   export $var
 done
 
 
+# absolute_filenames TEX-PATH -> TEX-PATH
+# ---------------------------------------
+# Convert relative paths to absolute paths, so we can run in another
+# directory (e.g., in tidy build mode, or during the macro-support
+# detection).
+#
+# Empty path components are meaningful to tex.  We rewrite them
+# as `EMPTY' so they don't get lost when we split on $path_sep.
+# Hopefully no one will have an actual directory named EMPTY.
+absolute_filenames ()
+{
+  local replace_empty="-e 's/^$path_sep/EMPTY$path_sep/g' \
+		       -e 's/$path_sep\$/${path_sep}EMPTY/g' \
+		       -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
+  local res
+  res=`echo "$1" | eval sed $replace_empty`
+  save_IFS=$IFS
+  IFS=$path_sep
+  set x $res; shift
+  res=.
+  for dir
+  do
+    case $dir in
+      EMPTY)
+	res=$res$path_sep
+	;;
+      *)
+	if test -d $dir; then
+	  res=$res$path_sep`absolute "$dir"`
+	fi
+	;;
+    esac
+  done
+  echo "$res"
+}
+
+
+# output_base_name FILE
+# ---------------------
+# The name of FILE, possibly renamed to satisfy --output.
+output_base_name ()
+{
+  case $oname in
+    '') echo "$1";;
+     *) local out_noext
+	out_noext=`echo "$oname" | sed 's/\.[^.]*$//'`
+	local file_ext
+	file_ext=`echo "$1" | sed 's/^.*\.//'`
+	echo "$out_noext.$file_ext"
+      ;;
+  esac
+}
+
+
+# move_to_dest FILE...
+# --------------------
+# Move FILE to the place where the user expects it.  Truly move it, that
+# is, it must not remain in its build location unless that is also the
+# output location.  (Otherwise it might appear as an extra file in make
+# distcheck.)
+#
+# FILE can be the principal output (in which case -o directly applies), or
+# an auxiliary file with the same base name.
+move_to_dest ()
+{
+  local dest
+  local destfile
+  local destdir
+  local destbase
+  local sourcedir
+  local sourcebase
+
+  for file
+  do
+    case $tidy:$oname in
+      true:)  dest=$orig_pwd;;
+      false:) dest=;;
+      *:*)    dest=`output_base_name "$file"`;;
+    esac
+    if test ! -f "$file"; then
+      error 1 "no such file or directory: $file"
+    fi
+    if test -n "$dest"; then
+      # We need to know whether $dest is a directory.
+      if test -d "$dest"; then
+        destdir=$dest
+        destfile=$dest/$file
+      else
+        destdir="`dirname $dest`"
+        destfile=$dest
+      fi
+      # We want to compare the source location and the output location,
+      # and if they are different, do the move.  But if they are the
+      # same, we must preserve the source.  Since we can't assume
+      # stat(1) or test -ef is available, resort to comparing the
+      # directory names, canonicalized with pwd.  We can't use cmp -s
+      # since the output file might not actually change from run to run;
+      # e.g., TeX DVI output is timestamped to only the nearest minute.
+      destdir=`cd $destdir && pwd`
+      destbase=`basename $destfile`
+      #
+      sourcedir=`dirname $file`
+      sourcedir=`cd $sourcedir && pwd`
+      sourcebase=`basename $file`
+      #
+      if test "$sourcedir/$sourcebase" != "$destdir/$destbase"; then
+        verbose "Moving $file to $destfile"
+        rm -f "$destfile"
+        mv "$file" "$destfile"
+      fi
+    fi
+  done
+}
+
+
+## --------------------- ##
+## Managing xref files.  ##
+## --------------------- ##
+
+# aux_file_p FILE
+# ---------------
+# Return with success with FILE is an aux file.
+aux_file_p ()
+{
+  test -f "$1" || return 1
+  case $1 in
+    *.aux) return 0;;
+    *)     return 1;;
+  esac
+}
+
+# bibaux_file_p FILE
+# ------------------
+# Return with success with FILE is an aux file containing citation
+# requests.
+bibaux_file_p ()
+{
+  test -s "$1" || return 1
+  if (grep '^\\bibstyle[{]' "$1"   \
+      && grep '^\\bibdata[{]' "$1" \
+      ## The following line is suspicious: fails when there
+      ## are citations in sub aux files.  We need to be
+      ## smarter in this case.
+      ## && grep '^\\citation[{]' "$f"
+      ) >&6 2>&1;
+  then
+    return 0
+  fi
+  return 1
+}
+
+# index_file_p FILE
+# -----------------
+# Return with success with FILE is an index file.
+# When index.sty is used, there is a space before the brace.
+index_file_p ()
+{
+  test -f "$1" || return 1
+  case `sed '1q' "$1"` in
+    "\\entry{"*|"\\indexentry{"*|"\\indexentry {"*) return 0;;
+    *) return 1;;
+  esac
+}
+
+# xref_file_p FILE
+# ----------------
+# Return with success if FILE is an xref file (indexes, tables and lists).
+xref_file_p ()
+{
+  test -f "$1" || return 1
+  # If the file is not suitable to be an index or xref file, don't
+  # process it.  It's suitable if the first character is a
+  # backslash or right quote or at, as long as the first line isn't
+  # \input texinfo.
+  case `sed '1q' "$1"` in
+    "\\input texinfo"*) return 1;;
+    [\\''@]*)           return 0;;
+	   *)           return 1;;
+  esac
+}
+
+
+# generated_files_get FILENAME-NOEXT [PREDICATE-FILTER]
+# -----------------------------------------------------
+# Return the list of files generated by the TeX compilation of FILENAME-NOEXT.
+generated_files_get ()
+{
+  local filter=true
+  if test -n "$2"; then
+    filter=$2
+  fi
+
+  # Gather the files created by TeX.
+  (
+    if test -f "$1.log"; then
+      sed -n -e "s,^\\\\openout.* = \`\\(.*\\)'\\.,\\1,p" "$1.log"
+    fi
+    echo "$1.log"
+  ) |
+  # Depending on these files, infer outputs from other tools.
+  while read file; do
+    echo $file
+    case $in_lang in
+      texinfo)
+	# texindex: texinfo.cp -> texinfo.cps
+       if index_file_p $file; then
+	 echo ${file}s
+       fi
+       ;;
+      latex)
+       # bibtex: *.aux -> *.bbl and *.blg.
+	if aux_file_p $file; then
+	  echo $file | sed 's/^\(.*\)\.aux$/\1.bbl/'
+	 echo $file | sed 's/^\(.*\)\.aux$/\1.blg/'
+       fi
+       ;;
+    esac
+  done |
+  # Filter existing files matching the criterion.
+  # 
+  # With an input file name containing a space, this produces a
+  # "command not found" message (and filtering is ineffective).
+  # The situation with a newline is presumably even worse.
+  while read file; do
+    if $filter "$file"; then
+      echo $file
+    fi
+  done |
+  sort |
+  # Some files are opened several times, e.g., listings.sty's *.vrb.
+  uniq
+}
+
+
+# xref_files_save
+# ---------------
+# Save the xref files.
+xref_files_save ()
+{
+  # Save copies of auxiliary files for later comparison.
+  xref_files_orig=`generated_files_get "$in_noext" xref_file_p`
+  if test -n "$xref_files_orig"; then
+    verbose "Backing up xref files: $xref_files_orig"
+    # The following line improves `cp $xref_files_orig "$work_bak"'
+    # by preserving the directory parts.  Think of
+    # cp chap1/main.aux chap2/main.aux $work_bak.
+    tar cf - $xref_files_orig | (cd "$work_bak" && tar xf -)
+  fi
+}
+
+
+# xref_files_changed
+# ------------------
+# Whether the xref files were changed since the previous run.
+xref_files_changed ()
+{
+  # LaTeX (and the package changebar) report in the LOG file if it
+  # should be rerun.  This is needed for files included from
+  # subdirs, since texi2dvi does not try to compare xref files in
+  # subdirs.  Performing xref files test is still good since LaTeX
+  # does not report changes in xref files.
+  if grep "Rerun to get" "$in_noext.log" >&6 2>&1; then
+    return 0
+  fi
+
+  # If old and new lists don't at least have the same file list,
+  # then one file or another has definitely changed.
+  xref_files_new=`generated_files_get "$in_noext" xref_file_p`
+  verbose "Original xref files = $xref_files_orig"
+  verbose "New xref files      = $xref_files_new"
+  if test "x$xref_files_orig" != "x$xref_files_new"; then
+    return 0
+  fi
+
+  # Compare each file until we find a difference.
+  for this_file in $xref_files_new; do
+    verbose "Comparing xref file `echo $this_file | sed 's|\./||g'` ..."
+    # cmp -s returns nonzero exit status if files differ.
+    if cmp -s "$this_file" "$work_bak/$this_file"; then :; else
+      verbose "xref file `echo $this_file | sed 's|\./||g'` differed ..."
+      if $debug; then
+	diff -u "$work_bak/$this_file" "$this_file"
+      fi
+      return 0
+    fi
+  done
+
+  # No change.
+  return 1
+}
+
+
+
+## ----------------------- ##
+## Running the TeX suite.  ##
+## ----------------------- ##
+
+
+
+# run_tex ()
+# ----------
+# Run TeX as "$tex $in_input", taking care of errors and logs.
+run_tex ()
+{
+  case $in_lang:`out_lang_tex` in
+    latex:dvi)   tex=${LATEX:-latex};;
+    latex:pdf)   tex=${PDFLATEX:-pdflatex};;
+    texinfo:dvi)
+	# MetaPost also uses the TEX environment variable.  If the user
+	# has set TEX=latex for that reason, don't bomb out.
+	case $TEX in
+	  *latex) tex=tex;; # don't bother trying to find etex
+	       *) tex=$TEX
+	esac;;
+    texinfo:pdf) tex=$PDFTEX;;
+
+    *) error 1 "$0: $out_lang not supported for $in_lang";;
+  esac
+
+  # Beware of aux files in subdirectories that require the
+  # subdirectory to exist.
+  case $in_lang:$tidy in
+    latex:true)
+       sed -n 's|^[ ]*\\include{\(.*\)/.*}.*|\1|p' "$in_input" |
+       sort -u |
+       while read d
+       do
+	 ensure_dir "$work_build/$d"
+       done
+       ;;
+  esac
+
+  # Note that this will be used via an eval: quote properly.
+  local cmd="$tex"
+
+  # If possible, make TeX report error locations in GNU format.
+  if test "${tex_help:+set}" != set; then
+    # Go to a temporary directory to try --help, since old versions that
+    # don't accept --help will generate a texput.log.
+    tex_help_dir=$t2ddir/tex_help
+    ensure_dir "$tex_help_dir"
+    tex_help=`cd "$tex_help_dir" >&6 && $tex --help </dev/null 2>&1`
+  fi
+  if $no_line_error; then :; else
+    # The mk program and perhaps others want to parse TeX's
+    # original error messages.
+    case $line_error:$tex_help in
+      true:*file-line-error*) cmd="$cmd --file-line-error";;
+    esac
+  fi
+
+  # Tell TeX about TCX file, if specified.
+  test -n "$translate_file" && cmd="$cmd --translate-file=$translate_file"
+
+  # Tell TeX to make source specials (for backtracking from output to
+  # source, given a sufficiently smart editor), if specifed.
+  test -n "$src_specials" && cmd="$cmd $src_specials"
+
+  # Tell TeX to be batch if requested.
+  if $batch; then
+    # \batchmode does not show terminal output at all, so we don't
+    # want that.  And even in batch mode, TeX insists on having input
+    # from the user.  Close its stdin to make it impossible.
+    cmd="$cmd </dev/null '${escape}nonstopmode' '${escape}input'"
+  fi
+
+  # we'd like to handle arbitrary input file names, such as a~b.tex.
+  # This isn't a general way to do it :), though it does work, kind of.
+  # cmd="$cmd '${escape}catcode126=12 \input '"
+  
+  # TeX's \input does not (easily or reliably) support whitespace
+  # characters or other special characters in file names.  Our intensive
+  # use of absolute file names makes this worse: the enclosing directory
+  # names may include white spaces.  Improve the situation using a
+  # symbolic link to the filename in the current directory, in tidy mode
+  # only.  Do not alter in_input.
+  # 
+  # The filename is almost always tokenized using plain TeX conventions
+  # (the exception would be if the user made a texinfo.fmt file).  Not
+  # all the plain TeX special characters cause trouble, but there's no
+  # harm in making the link.
+  # 
+  case $tidy:`func_dirname "$in_input"` in
+    true:*["$space$tab$newline\"#\$%\\^_{}"]*)
+      _run_tex_file_name=`basename "$in_input"`
+      if test ! -f "$_run_tex_file_name"; then
+	verbose ln -s "$in_input"
+	rm -f "$_run_tex_file_name"
+	ln -s "$_run_tex_file_name"
+      fi
+      cmd="$cmd '$_run_tex_file_name'"
+      ;;
+
+    *)
+      cmd="$cmd '$in_input'"
+      ;;
+  esac
+
+  verbose "$0: Running $cmd ..."
+  if eval "$cmd" >&5; then
+    case $out_lang in
+      dvi | pdf ) move_to_dest "$in_noext.$out_lang";;
+    esac
+  else
+    error 1 "$tex exited with bad status, quitting."
+  fi
+}
+
+# run_bibtex ()
+# -------------
+# Run bibtex on current file.
+# - If its input (AUX) exists.
+# - If some citations are missing (LOG contains `Citation').
+#   or the LOG complains of a missing .bbl
+#
+# Don't try to be too smart:
+#
+# 1. Running bibtex only if the bbl file exists and is older than
+# the LaTeX file is wrong, since the document might include files
+# that have changed.
+#
+# 3. Because there can be several AUX (if there are \include's),
+# but a single LOG, looking for missing citations in LOG is
+# easier, though we take the risk to match false messages.
+run_bibtex ()
+{
+  case $in_lang in
+    latex)   bibtex=${BIBTEX:-bibtex};;
+    texinfo) return;;
+  esac
+
+  # "Citation undefined" is for LaTeX, "Undefined citation" for btxmac.tex.
+  # The no .aux && \bibdata test is also for btxmac, in case it was the
+  # first run of a bibtex-using document.  Otherwise, it's possible that
+  # bibtex would never be run.
+  if test -r "$in_noext.aux" \
+     && test -r "$in_noext.log" \
+     && (grep 'Warning:.*Citation.*undefined' "$in_noext.log" \
+	  || grep '.*Undefined citation' "$in_noext.log" \
+	  || grep 'No file .*\.bbl\.' "$in_noext.log") \
+	  || (grep 'No \.aux file' "$in_noext.log" \
+	      && grep '^\\bibdata' "$in_noext.aux") \
+	>&6 2>&1; \
+  then
+    for f in `generated_files_get "$in_noext" bibaux_file_p`
+    do
+      run $bibtex "$f"
+    done
+  fi
+}
+
+# run_index ()
+# ------------
+# Run texindex (or makeindex) on current index files.  If they already
+# exist, and after running TeX a first time the index files don't
+# change, then there's no reason to run TeX again.  But we won't know
+# that if the index files are out of date or nonexistent.
+run_index ()
+{
+  case $in_lang in
+    latex)   texindex=${MAKEINDEX:-makeindex};;
+    texinfo) texindex=${TEXINDEX:-texindex};;
+  esac
+  index_files=`generated_files_get $in_noext index_file_p`
+  if test -n "$texindex" && test -n "$index_files"; then
+    run $texindex $index_files
+  fi
+}
+
+
+# run_thumbpdf ()
+# ---------------
+run_thumbpdf ()
+{
+  if test `out_lang_tex` = pdf \
+     && test -r "$in_noext.log" \
+     && grep 'thumbpdf\.sty'  "$in_noext.log" >&6 2>&1; \
+  then
+    thumbpdf=${THUMBPDF:-thumbpdf}
+    verbose "Running $thumbpdf $in_noext ..."
+    if $thumbpdf "$in_noext" >&5; then
+      run_tex
+    else
+      report "$thumbpdf exited with bad status." \
+	     "Ignoring its output."
+    fi
+  fi
+}
+
+
+# run_dvipdf FILE.dvi
+# -------------------
+# Convert FILE.dvi to FILE.pdf.
+run_dvipdf ()
+{
+  # Find which dvi->pdf program is available.
+  if test -z "$dvipdf"; then
+    for i in "$DVIPDF" dvipdfmx dvipdfm dvipdf dvi2pdf dvitopdf;
+    do
+      if findprog $i; then
+	dvipdf=$i
+      fi
+    done
+  fi
+  # These tools have varying interfaces, some 'input output', others
+  # 'input -o output'.  They all seem to accept 'input' only,
+  # outputting using the expected file name.
+  run $dvipdf "$1"
+  if test ! -f `echo "$1" | sed -e 's/\.dvi$/.pdf/'`; then
+    error 1 "$0: cannot find output file"
+  fi
+}
+
+# run_tex_suite ()
+# ----------------
+# Run the TeX tools until a fix point is reached.
+run_tex_suite ()
+{
+  # Move to the working directory.
+  if $tidy; then
+    verbose "cd $work_build"
+    cd "$work_build" || exit 1
+  fi
+
+  # Count the number of cycles.
+  local cycle=0
+
+  while :; do
+    cycle=`expr $cycle + 1`
+    verbose "Cycle $cycle for $command_line_filename"
+
+    xref_files_save
+
+    # We run bibtex first, because I can see reasons for the indexes
+    # to change after bibtex is run, but I see no reason for the
+    # converse.
+    run_bibtex
+    run_index
+    run_core_conversion
+
+    xref_files_changed || break
+  done
+
+  # If we were using thumbpdf and producing PDF, then run thumbpdf
+  # and TeX one last time.
+  run_thumbpdf
+
+  # Install the result if we didn't already (i.e., if the output is
+  # dvipdf or ps).
+  case $out_lang in
+    dvipdf)
+      run_dvipdf "$in_noext.`out_lang_tex`"
+      move_to_dest "$in_noext.`out_lang_ext`"
+      ;;
+    ps)
+      dvips -o "$in_noext.`out_lang_ext`" "$in_noext.`out_lang_tex`"
+      move_to_dest "$in_noext.`out_lang_ext`"
+      ;;
+  esac
+
+  cd_orig
+}
+
+## -------------------------------- ##
+## TeX processing auxiliary tools.  ##
+## -------------------------------- ##
+
+
+# A sed script that preprocesses Texinfo sources in order to keep the
+# iftex sections only.  We want to remove non TeX sections, and comment
+# (with `@c texi2dvi') TeX sections so that makeinfo does not try to
+# parse them.  Nevertheless, while commenting TeX sections, don't
+# comment @macro/@end macro so that makeinfo does propagate them.
+# Unfortunately makeinfo --iftex --no-ifinfo doesn't work well enough
+# (yet), makeinfo can't parse the TeX commands, so work around with sed.
+#
+comment_iftex=\
+'/^@tex/,/^@end tex/{
+  s/^/@c texi2dvi/
+}
+/^@iftex/,/^@end iftex/{
+  s/^/@c texi2dvi/
+  /^@c texi2dvi@macro/,/^@c texi2dvi@end macro/{
+    s/^@c texi2dvi//
+  }
+}
+/^@ifnottex/,/^@end ifnottex/{
+  s/^/@c (texi2dvi)/
+}
+/^@ifinfo/,/^@end ifinfo/{
+  /^@node/p
+  /^@menu/,/^@end menu/p
+  t
+  s/^/@c (texi2dvi)/
+}
+s/^@ifnotinfo/@c texi2dvi@ifnotinfo/
+s/^@end ifnotinfo/@c texi2dvi@end ifnotinfo/'
+
+# Uncommenting is simple: Remove any leading `@c texi2dvi'.
+uncomment_iftex='s/^@c texi2dvi//'
+
+
+# run_makeinfo ()
+# ---------------
+# Expand macro commands in the original source file using Makeinfo.
+# Always use `end' footnote style, since the `separate' style
+# generates different output (arguably this is a bug in -E).  Discard
+# main info output, the user asked to run TeX, not makeinfo.
+run_makeinfo ()
+{
+  test $in_lang == texinfo ||
+    return 0
+
+  # Unless required by the user, makeinfo expansion is wanted only
+  # if texinfo.tex is too old.
+  if test "$expand" = t; then
+    makeinfo=${MAKEINFO:-makeinfo}
+  else
+    # Check if texinfo.tex performs macro expansion by looking for
+    # its version.  The version is a date of the form YEAR-MO-DA.
+    # We don't need to use [0-9] to match the digits since anyway
+    # the comparison with $txiprereq, a number, will fail with non
+    # digits.
+    # Run in a temporary directory to avoid leaving files.
+    version_test_dir=$t2ddir/version_test
+    ensure_dir "$version_test_dir"
+    (
+       cd "$version_test_dir"
+       echo '\input texinfo.tex @bye' >txiversion.tex
+       # Be sure that if tex wants to fail, it is not interactive:
+       # close stdin.
+       $TEX txiversion.tex </dev/null >txiversion.out 2>txiversion.err
+    )
+    if test $? != 0; then
+      cat "$version_test_dir/txiversion.out"
+      cat "$version_test_dir/txiversion.err" >&2
+      error 1 "texinfo.tex appears to be broken, quitting."
+    fi
+    eval `sed -n 's/^.*\[\(.*\)version \(....\)-\(..\)-\(..\).*$/txiformat=\1 txiversion="\2\3\4"/p' "$version_test_dir/txiversion.out"`
+    verbose "texinfo.tex preloaded as \`$txiformat', version is \`$txiversion' ..."
+    if test "$txiprereq" -le "$txiversion" >&6 2>&1; then
+      makeinfo=
+    else
+      makeinfo=${MAKEINFO:-makeinfo}
+    fi
+    # As long as we had to run TeX, offer the user this convenience:
+    if test "$txiformat" = Texinfo; then
+	escape=@
+    fi
+  fi
+
+  if test -n "$makeinfo"; then
+    # in_src: the file with macros expanded.
+    # Use the same basename to generate the same aux file names.
+    work_src=$workdir/src
+    ensure_dir "$work_src"
+    in_src=$work_src/$in_base
+    local miincludes
+    miincludes=`list_prefix includes -I`
+    verbose "Macro-expanding $command_line_filename to $in_src ..."
+    # eval $makeinfo because it might be defined as something complex
+    # (running missing) and then we end up with things like '"-I"',
+    # and "-I" (including the quotes) is not an option name.  This
+    # happens with gettext 0.14.5, at least.
+    sed "$comment_iftex" "$command_line_filename" \
+      | eval $makeinfo --footnote-style=end -I "$in_dir" $miincludes \
+	-o /dev/null --macro-expand=- \
+      | sed "$uncomment_iftex" >"$in_src"
+    # Continue only if everything succeeded.
+    if test $? -ne 0 \
+       || test ! -r "$in_src"; then
+      verbose "Expansion failed, ignored...";
+    else
+      in_input=$in_src
+    fi
+  fi
+}
+
+# insert_commands ()
+# ------------------
+# Used most commonly for @finalout, @smallbook, etc.
+insert_commands ()
+{
+  local textra_cmd
+  case $in_lang in
+    latex)   textra_cmd=1i;;
+    texinfo) textra_cmd='/^@setfilename/a';;
+    *)       error 1 "internal error, unknown language: $in_lang";;
+  esac
+
+  if test -n "$textra"; then
+    # _xtr.  The file with the user's extra commands.
+    work_xtr=$workdir/xtr
+    in_xtr=$work_xtr/$in_base
+    ensure_dir "$work_xtr"
+    verbose "Inserting extra commands: $textra"
+    sed "$textra_cmd\\
+$textra" "$in_input" >"$in_xtr"
+    in_input=$in_xtr
+  fi
+}
+
+# run_recode ()
+# -------------
+# If this is a Texinfo file with a specified input encoding, and
+# recode is available, then recode to plain 7 bit Texinfo.
+run_recode ()
+{
+  local from
+  local to
+
+  if test $in_lang = texinfo; then
+    pgm='s/^ *@documentencoding  *\([^ ][^ ]*\) *$/\1/
+	t found
+	d
+	:found
+	q'
+    encoding=`sed -e "$pgm" "$in_input"`
+    if $recode && test -n "$encoding" && findprog recode; then
+      if test -n "$recode_from"; then
+	from=$recode_from
+	to=$encoding
+      else
+	from=$encoding
+	to=$texinfo
+      fi
+      verbose "Recoding from $from to $to."
+      # _rcd.  The Texinfo file recoded in 7bit.
+      work_rcd=$workdir/recode
+      in_rcd=$work_rcd/$in_base
+      ensure_dir "$work_rcd"
+      if recode "$encoding..$to" <"$in_input" >"$in_rcd" \
+	 && test -s "$in_rcd"; then
+	in_input=$in_rcd
+      else
+	verbose "Recoding failed, using original input."
+      fi
+    fi
+  fi
+}
+
+# compute_language FILENAME
+# -------------------------
+# Return the short string describing the language in which FILENAME
+# is written: `texinfo' or `latex'.
+compute_language ()
+{
+  # If the user explicitly specified the language, use that.
+  # Otherwise, if the first line is \input texinfo, assume it's texinfo.
+  # Otherwise, guess from the file extension.
+  if test -n "$set_language"; then
+    echo $set_language
+  elif sed 1q "$1" | grep 'input texinfo' >&6; then
+    echo texinfo
+  else
+    # Get the type of the file (latex or texinfo) from the given language
+    # we just guessed, or from the file extension if not set yet.
+    case $1 in
+      *.ltx | *.tex | *.drv | *.dtx) echo latex;;
+      *)                             echo texinfo;;
+    esac
+  fi
+}
+
+
+# run_hevea (MODE)
+# ----------------
+# Convert to HTML/INFO/TEXT.
+#
+# Don't pass `-noiso' to hevea: it's useless in HTML since anyway the
+# charset is set to latin1, and troublesome in other modes since
+# accented characters loose their accents.
+#
+# Don't pass `-o DEST' to hevea because in that case it leaves all its
+# auxiliary files there too...  Too bad, because it means we will need
+# to handle images some day.
+run_hevea ()
+{
+  local hevea="${HEVEA:-hevea}"
+  local run_hevea="$hevea"
+
+  case $1 in
+    html) ;;
+    text|info) run_hevea="$run_hevea -$1";;
+    *) error 1 "run_hevea: invalid argument: $1";;
+  esac
+
+  # Compiling to the tmp directory enables to preserve a previous
+  # successful compilation.
+  run_hevea="$run_hevea -fix -O -o '$out_base'"
+  run_hevea="$run_hevea `list_prefix includes -I` -I '$orig_pwd' "
+  run_hevea="$run_hevea '$in_input'"
+
+  if $debug; then
+    run_hevea="$run_hevea -v -v"
+  fi
+
+  verbose "running $run_hevea"
+  if eval "$run_hevea" >&5; then
+    # hevea leaves trailing white spaces, this is annoying.
+    case $1 in text|info)
+      perl -pi -e 's/[ \t]+$//g' "$out_base"*;;
+    esac
+    case $1 in
+    html|text) move_to_dest "$out_base";;
+    info) # There can be foo.info-1, foo.info-2 etc.
+	       move_to_dest "$out_base"*;;
+    esac
+  else
+    error 1 "$hevea exited with bad status, quitting."
+  fi
+}
+
+
+# run_core_conversion ()
+# ----------------------
+# Run the TeX (or HeVeA).
+run_core_conversion ()
+{
+  case $in_lang:`out_lang_tex` in
+    *:dvi|*:pdf)
+	run_tex;;
+    latex:html|latex:text|latex:info)
+	run_hevea $out_lang;;
+    *)
+	error 1 "invalid input/output combination: $in_lang/$out_lang";;
+  esac
+}
+
+
+# compile ()
+# ----------
+# Run the full compilation chain, from pre-processing to installation
+# of the output at its expected location.
+compile ()
+{
+  # Source file might include additional sources.
+  # We want `.:$orig_pwd' before anything else.  (We'll add `.:' later
+  # after all other directories have been turned into absolute paths.)
+  # `.' goes first to ensure that any old .aux, .cps,
+  # etc. files in ${directory} don't get used in preference to fresher
+  # files in `.'.  Include orig_pwd in case we are in clean build mode, where
+  # we've cd'd to a temp directory.
+  txincludes=`list_infix includes $path_sep`
+  common="$orig_pwd$path_sep$in_dir$path_sep$txincludes$path_sep"
+  for var in $tex_envvars; do
+    eval val="\$common\$${var}_orig"
+    # Convert relative paths to absolute paths, so we can run in another
+    # directory (e.g., in clean build mode, or during the macro-support
+    # detection).
+    val=`absolute_filenames "$val"`
+    eval $var="\"$val\""
+    export $var
+    eval verbose \"$var=\'\$${var}\'\"
+  done
+
+  # --expand
+  run_makeinfo
+
+  # --command, --texinfo
+  insert_commands
+
+  # --recode
+  run_recode
+
+  # Run until a fix point is reached.
+  run_tex_suite
+}
+
+
+# remove FILES
+# ------------
+remove ()
+{
+  verbose "Removing" "$@"
+  rm -rf "$@"
+}
+
+
+# mostly_clean
+# ------------
+# Remove auxiliary files and directories.  Changes the current directory.
+mostly_clean ()
+{
+  cd_orig
+  set X "$t2ddir"
+  shift
+  $tidy || {
+    local log="$work_build/$in_noext.log"
+    set X ${1+"$@"} "$log" `generated_files_get "$work_build/$in_noext"`
+    shift
+  }
+  remove ${1+"$@"}
+}
+
+
+# cleanup ()
+# ----------
+# Remove what should be removed according to options.
+# Called at the end of each compilation cycle, and at the end of
+# the script.  Changes the current directory.
+cleanup ()
+{
+  case $build_mode in
+    local) cd_orig; remove "$t2ddir";;
+    clean) mostly_clean;;
+    tidy)  ;;
+  esac
+}
+
+
+
+## ---------------------- ##
+## Command line parsing.  ##
+## ---------------------- ##
+
 # Push a token among the arguments that will be used to notice when we
 # ended options/arguments parsing.
 # Use "set dummy ...; shift" rather than 'set - ..." because on
@@ -209,41 +1428,53 @@ while test x"$1" != x"$arg_sep"; do
   case "$1" in
     -@ ) escape=@;;
     # Silently and without documentation accept -b and --b[atch] as synonyms.
-    -b | --b*) batch=true;;
-    -c | --c*) clean=t;;
-    -D | --d*) debug=t;;
-    -e | -E | --e*) expand=t;;
-    -h | --h*) echo "$usage"; exit 0;;
+    -b | --batch) batch=true;;
+	 --build)      shift; build_mode=$1;;
+	 --build-dir)  shift; build_dir=$1; build_mode=tidy;;
+    -c | --clean) build_mode=clean;;
+    -D | --debug) debug=true;;
+	 --dvi)   out_lang=dvi;;
+	 --dvipdf)   out_lang=dvipdf;;
+    -e | -E | --expand) expand=t;;
+    -h | --help) echo "$usage"; exit 0;;
+	 --html) out_lang=html;;
     -I | --I*)
       shift
-      miincludes="$miincludes -I $1"
-      txincludes="$txincludes$1$path_sep"
+      # Use absolute dir names in the includes.
+      val=`absolute "$1"`
+      list_append includes "$val"
       ;;
-    -l | --l*) shift; set_language=$1;;
-    -o | --o*)
+    --info) out_lang=info;;
+    -l | --lang | --language) shift; set_language=$1;;
+    --mostly-clean) action=mostly-clean;;
+    --no-line-error) no_line_error=true;;
+    -o | --out  | --output)
       shift
-      clean=t
-      case "$1" in
-        /* | ?:/*) oname=$1;;
-                *) oname="$orig_pwd/$1";;
-      esac;;
-    -p | --p*) oformat=pdf;;
-    -q | -s | --q* | --s*) quiet=t; batch=true;;
-    -r | --r*) recode=true;;
-    -t | --tex* | --com* ) shift; textra="$textra\\
+      # Make it absolute, just in case we also have --clean, or whatever.
+      oname=`absolute "$1"`;;
+    -p | --pdf) out_lang=pdf;;
+	 --ps)  out_lang=ps;;
+    -q | -s | --quiet | --silent) quiet=true; batch=true;;
+    -r | --recode) recode=true;;
+    --recode-from) shift; recode=true; recode_from="$1";;
+    --src-specials) src_specials=--src-specials;;
+    -t | --texinfo | --command ) shift; textra="$textra\\
 "`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
+    --text) out_lang=text;;
+    --translate-file ) shift; translate_file="$1";;
+    --tidy) build_mode=tidy;;
     -v | --vers*) echo "$version"; exit 0;;
-    -V | --verb*) verb=echo;;
+    -V | --verb*) verb=true;;
     --) # What remains are not options.
       shift
       while test x"$1" != x"$arg_sep"; do
-        set dummy ${1+"$@"} "$1"; shift
-        shift
+	set dummy ${1+"$@"} "$1"; shift
+	shift
       done
       break;;
     -*)
-      fatal 1 "Unknown or ambiguous option \`$1'." \
-              "Try \`--help' for more information."
+      error 1 "Unknown or ambiguous option \`$1'." \
+	      "Try \`--help' for more information."
       ;;
     *) set dummy ${1+"$@"} "$1"; shift;;
    esac
@@ -252,15 +1483,24 @@ done
 # Pop the token
 shift
 
+# $tidy:  compile in a t2d directory.
+# $clean: remove all the aux files.
+case $build_mode in
+  local) clean=false; tidy=false;;
+  tidy)  clean=false; tidy=true;;
+  clean) clean=true;  tidy=true;;
+      *) error 1 "invalid build mode: $build_mode";;
+esac
+
 # Interpret remaining command line args as filenames.
 case $# in
  0)
-  fatal 2 "Missing file arguments." "Try \`--help' for more information."
+  error 2 "Missing file arguments." "Try \`--help' for more information."
   ;;
  1) ;;
  *)
   if test -n "$oname"; then
-    fatal 2 "Can't use option \`--output' with more than one argument."
+    error 2 "Can't use option \`--output' with more than one argument."
   fi
   ;;
 esac
@@ -298,151 +1538,6 @@ if test -z "$PDFTEX"; then
 fi
 
 
-# Prepare the temporary directory.  Remove it at exit, unless debugging.
-if test -z "$debug"; then
-  trap "cd / && rm -rf $tmpdir" 0 1 2 15
-fi
-
-# Create the temporary directory with strict rights
-(umask 077 && mkdir $tmpdir) || exit 1
-
-# Prepare the tools we might need.  This may be extra work in some
-# cases, but improves the readability of the script.
-utildir=$tmpdir/utils
-mkdir $utildir || exit 1
-
-# A sed script that preprocesses Texinfo sources in order to keep the
-# iftex sections only.  We want to remove non TeX sections, and comment
-# (with `@c texi2dvi') TeX sections so that makeinfo does not try to
-# parse them.  Nevertheless, while commenting TeX sections, don't
-# comment @macro/@end macro so that makeinfo does propagate them.
-# Unfortunately makeinfo --iftex --no-ifinfo doesn't work well enough
-# (yet), makeinfo can't parse the TeX commands, so work around with sed.
-#
-comment_iftex_sed=$utildir/comment.sed
-cat <<EOF >$comment_iftex_sed
-/^@tex/,/^@end tex/{
-  s/^/@c texi2dvi/
-}
-/^@iftex/,/^@end iftex/{
-  s/^/@c texi2dvi/
-  /^@c texi2dvi@macro/,/^@c texi2dvi@end macro/{
-    s/^@c texi2dvi//
-  }
-}
-/^@ifnottex/,/^@end ifnottex/{
-  s/^/@c (texi2dvi)/
-}
-/^@ifinfo/,/^@end ifinfo/{
-  /^@node/p
-  /^@menu/,/^@end menu/p
-  t
-  s/^/@c (texi2dvi)/
-}
-s/^@ifnotinfo/@c texi2dvi@ifnotinfo/
-s/^@end ifnotinfo/@c texi2dvi@end ifnotinfo/
-EOF
-# Uncommenting is simple: Remove any leading `@c texi2dvi'.
-uncomment_iftex_sed=$utildir/uncomment.sed
-cat <<EOF >$uncomment_iftex_sed
-s/^@c texi2dvi//
-EOF
-
-# Compute the list of xref files.
-# Takes the filename (without extension) of which we look for xref
-# files as argument.  The index files must be reported last.
-get_xref_files ()
-{
-  # Get list of xref files (indexes, tables and lists).
-  # Find all files having root filename with a two-letter extension,
-  # saves the ones that are really Texinfo-related files.  .?o? catches
-  # many files: .toc, .log, LaTeX tables and lists, FiXme's .lox, maybe more.
-  for this_file in "$1".?o? "$1".aux "$1".?? "$1".idx; do
-    # If file is empty, skip it.
-    test -s "$this_file" || continue
-    # If the file is not suitable to be an index or xref file, don't
-    # process it.  It's suitable if the first character is a
-    # backslash or right quote or at, as long as the first line isn't
-    # \input texinfo.
-    first_character=`sed -n '1s/^\(.\).*$/\1/p;q' $this_file`
-    if (test "x$first_character" = "x\\" \
-        && sed 1q $this_file | grep -v '^\\input *texinfo' >/dev/null) \
-       || test "x$first_character" = "x'" \
-       || test "x$first_character" = "x@"; then
-      xref_files="$xref_files ./$this_file"
-    fi
-  done
-  echo "$xref_files"
-}
-
-# Convert relative paths to absolute paths, so we can run in another
-# directory (e.g., in --clean mode, or during the macro-support detection.)
-#
-# Empty path components are meaningful to tex.  We rewrite them
-# as `EMPTY' so they don't get lost when we split on $path_sep.
-# Hopefully no one will have an actual directory named EMPTY.
-absolute_filenames ()
-{
-  replace_empty="-e 's/^$path_sep/EMPTY$path_sep/g' \
-                 -e 's/$path_sep\$/${path_sep}EMPTY/g' \
-                 -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
-  _res=`echo "$1" | eval sed $replace_empty`
-  save_IFS=$IFS
-  IFS=$path_sep
-  set x $_res; shift
-  _res=.
-  for dir
-  do
-    case $dir in
-      EMPTY)
-        _res=$_res$path_sep
-        ;;
-      [\\/]* | ?:[\\/]*)        # Absolute paths don't need to be expanded.
-        _res=$_res$path_sep$dir
-        ;;
-      *)
-        abs=`cd "$dir" && pwd` && _res=$_res$path_sep$abs
-        ;;
-    esac
-  done
-  echo "$_res"
-}
-
-
-# run_tex ()
-# ----------
-# Run TeX as "$tex $tex_args $filename_input", taking care of errors
-# and logs.
-run_tex ()
-{
-  # Note that this will be used via an eval: quote properly.
-  cmd=$tex
-
-  # If possible, make TeX report error locations in GNU format.
-  tex_args=
-  case $tex_help in
-    *file-line-error*) cmd="$cmd --file-line-error";;
-  esac
-
-  # Tell TeX to be batch if requested.
-  if $batch; then
-    # \batchmode does not show terminal output at all, so we don't
-    # want that.  And even in batch mode, TeX insists on having input
-    # from the user.  Close its stdin to make it impossible.
-    cmd="$cmd </dev/null '${escape}nonstopmode' '${escape}input'"
-  fi
-
-  cmd="$cmd '$filename_input'"
-
-  verbose "Running $cmd ..."
-  if eval "$cmd" >&5; then :; else
-    test "$clean" = t \
-        && cp "$filename_noext.log" "$orig_pwd"
-    fatal 1 "$tex exited with bad status, quitting." \
-            "see $filename_noext.log for errors."
-  fi
-}
-
 # File descriptor usage:
 # 0 standard input
 # 1 standard output (--verbose messages)
@@ -452,15 +1547,24 @@ run_tex ()
 # 5 tools output (turned off by --quiet)
 # 6 tracing/debugging (set -x output, etc.)
 
-# Tools' output.  If quiet, discard, else redirect to the message flow.
-if test "$quiet" = t; then
+
+# Main tools' output (TeX, etc.) that TeX users are used to seeing.
+#
+# If quiet, discard, else redirect to the message flow.
+if $quiet; then
   exec 5>/dev/null
 else
   exec 5>&1
 fi
 
-# Enable tracing
-if test "$debug" = t; then
+
+# Enable tracing, and auxiliary tools output.
+#
+# Should be used where you'd typically use /dev/null to throw output
+# away.  But sometimes it is convenient to see that output (e.g., from
+# a grep) to aid debugging.  Especially debugging at distance, via the
+# user.
+if $debug; then
   exec 6>&1
   set -x
 else
@@ -468,10 +1572,38 @@ else
 fi
 
 # 
-# TeXify files.
 
-for command_line_filename in ${1+"$@"}; do
-  verbose "Processing $command_line_filename ..."
+# input_file_name_decode
+# ----------------------
+# Decode COMMAND_LINE_FILENAME, and compute:
+# - COMMAND_LINE_FILENAME clean of TeX commands
+# - IN_DIR
+#   The directory to the input file, possibly absolute if needed.
+# - IN_DIR_ABS
+#   The absolute directory of the input file.
+# - IN_BASE
+#   The input file base name (no directory part).
+# - IN_NOEXT
+#   The input file name without extensions (nor directory part).
+# - IN_INPUT
+#   Defaults to COMMAND_LINE_FILENAME, but might change if the
+#   input is preprocessed (recode etc.).  With directory, possibly absolute.
+input_file_name_decode ()
+{
+  # See if we are run from within AUC-Tex, in which case we are
+  # passed `\input{FOO.tex}' or even `\nonstopmode\input{FOO.tex}'.
+  case $command_line_filename in
+    *\\nonstopmode*)
+      batch=true;;
+  esac
+  case $command_line_filename in
+    *\\input{*}*)
+      # Let AUC-TeX error parser deal with line numbers.
+      line_error=false
+      command_line_filename=`\
+	expr X"$command_line_filename" : X'.*input{\([^}]*\)}'`
+      ;;
+  esac
 
   # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
   # prepend `./' in order to avoid that the tools take it as an option.
@@ -482,354 +1614,102 @@ for command_line_filename in ${1+"$@"}; do
   # though the user may be able to reenter a valid filename at the tex
   # prompt (assuming they're attending the terminal), this script won't
   # be able to find the right xref files and so forth.
-  if test ! -r "$command_line_filename"; then
-    report "Could not read $command_line_filename, skipping."
-    continue
+  test -r "$command_line_filename" ||
+    error 1 "cannot read $command_line_filename, skipping."
+
+  # Get the name of the current directory.
+  in_dir=`func_dirname "$command_line_filename"`
+  in_dir_abs=`absolute "$in_dir"`
+  # In a clean build, we `cd', so get an absolute file name.
+  if $tidy; then
+    in_dir=$in_dir_abs
   fi
 
-  # Get the name of the current directory.  We want the full path
-  # because in clean mode we are in tmp, in which case a relative
-  # path has no meaning.
-  filename_dir=`echo $command_line_filename | sed 's!/[^/]*$!!;s!^$!.!'`
-  filename_dir=`cd "$filename_dir" >/dev/null && pwd`
-
   # Strip directory part but leave extension.
-  filename_ext=`basename "$command_line_filename"`
+  in_base=`basename "$command_line_filename"`
   # Strip extension.
-  filename_noext=`echo "$filename_ext" | sed 's/\.[^.]*$//'`
-  ext=`echo "$filename_ext" | sed 's/^.*\.//'`
-
-  # _src.  Use same basename since we want to generate aux files with
-  # the same basename as the manual.  If --expand, then output the
-  # macro-expanded file to here, else copy the original file.
-  tmpdir_src=$tmpdir/src
-  filename_src=$tmpdir_src/$filename_noext.$ext
-
-  # _xtr.  The file with the user's extra commands.
-  tmpdir_xtr=$tmpdir/xtr
-  filename_xtr=$tmpdir_xtr/$filename_noext.$ext
-
-  # _rcd.  The Texinfo file recoded in 7bit.
-  tmpdir_rcd=$tmpdir/rcd
-  filename_rcd=$tmpdir_rcd/$filename_noext.$ext
-
-  # _bak.  Copies of the previous xref files (another round is run if
-  # they differ from the new one).
-  tmpdir_bak=$tmpdir/bak
-
-  # Make all those directories and give up if we can't succeed.
-  mkdir $tmpdir_src $tmpdir_xtr $tmpdir_rcd $tmpdir_bak || exit 1
+  in_noext=`echo "$in_base" | sed 's/\.[^.]*$//'`
 
-  # Source file might include additional sources.
-  # We want `.:$orig_pwd' before anything else.  (We'll add `.:' later
-  # after all other directories have been turned into absolute paths.)
-  # `.' goes first to ensure that any old .aux, .cps,
-  # etc. files in ${directory} don't get used in preference to fresher
-  # files in `.'.  Include orig_pwd in case we are in clean mode, where
-  # we've cd'd to a temp directory.
-  common="$orig_pwd$path_sep$filename_dir$path_sep$txincludes"
-  for var in $tex_envvars; do
-    eval ${var}="\$common\$${var}_orig"
-    export $var
-  done
+  # The normalized file name to compile.  Must always point to the
+  # file to actually compile (in case of recoding, macro-expansion etc.).
+  in_input=$in_dir/$in_base
 
-  # Convert relative paths to absolute paths, so we can run in another
-  # directory (e.g., in --clean mode, or during the macro-support detection.)
-  TEXINPUTS=`absolute_filenames "$TEXINPUTS"`
-  verbose "TEXINPUTS: $TEXINPUTS"
-  BIBINPUTS=`absolute_filenames "$BIBINPUTS"`
-  verbose "BIBINPUTS: $BIBINPUTS"
-  BSTINPUTS=`absolute_filenames "$BSTINPUTS"`
-  verbose "BSTINPUTS: $BSTINPUTS"
-  INDEXSTYLE=`absolute_filenames "$INDEXSTYLE"`
-  verbose "INDEXSTYLE: $INDEXSTYLE"
 
-  # If the user explicitly specified the language, use that.
-  # Otherwise, if the first line is \input texinfo, assume it's texinfo.
-  # Otherwise, guess from the file extension.
-  if test -n "$set_language"; then
-    language=$set_language
-  elif sed 1q "$command_line_filename" | grep 'input texinfo' >&6; then
-    language=texinfo
+  # Compute the output file name.
+  if test x"$oname" != x; then
+    out_name=$oname
   else
-    language=
-  fi
-
-  # Get the type of the file (latex or texinfo) from the given language
-  # we just guessed, or from the file extension if not set yet.
-  case ${language:-$filename_ext} in
-    [lL]a[tT]e[xX] | *.ltx | *.tex)
-      # Assume a LaTeX file.  LaTeX needs bibtex and uses latex for
-      # compilation.  No makeinfo.
-      language=latex
-      bibtex=${BIBTEX:-bibtex}
-      makeinfo= # no point in running makeinfo on latex source.
-      texindex=${MAKEINDEX:-makeindex}
-      textra_cmd=1i
-      if test $oformat = dvi; then
-        tex=${LATEX:-latex}
-      else
-        tex=${PDFLATEX:-pdflatex}
-      fi
-      thumbpdf=${THUMBPDF:-thumbpdf}
-      ;;
-
-    *)
-      # Assume a Texinfo file.  Texinfo files need makeinfo, texindex and tex.
-      language=texinfo
-      bibtex=
-      texindex=${TEXINDEX:-texindex}
-      textra_cmd='/^@setfilename/a'
-      if test $oformat = dvi; then
-        # MetaPost also uses the TEX environment variable.  If the user
-        # has set TEX=latex for that reason, don't bomb out.
-        if echo $TEX | grep 'latex$' >/dev/null; then
-          tex=tex  # don't bother trying to find etex
-        else
-          tex=$TEX
-        fi
-      else
-        tex=$PDFTEX
-      fi
-      # Unless required by the user, makeinfo expansion is wanted only
-      # if texinfo.tex is too old.
-      if test "$expand" = t; then
-        makeinfo=${MAKEINFO:-makeinfo}
-      else
-        # Check if texinfo.tex performs macro expansion by looking for
-        # its version.  The version is a date of the form YEAR-MO-DA.
-        # We don't need to use [0-9] to match the digits since anyway
-        # the comparison with $txiprereq, a number, will fail with non
-        # digits.
-        # Run in the tmpdir to avoid leaving files.
-	(
-           cd $tmpdir
-	   echo '\input texinfo.tex @bye' >txiversion.tex
-	   # Be sure that if tex wants to fail, it is not interactive:
-	   # close stdin.
-           $tex txiversion.tex </dev/null
-	) >$tmpdir/txiversion.out 2>$tmpdir/txiversion.err
-	if test $? != 0; then
-	  cat $tmpdir/txiversion.out
-	  cat $tmpdir/txiversion.err >&2
-	  fatal 1 "texinfo.tex appears to be broken, quitting."
-        fi
-	eval `sed -n 's/^.*\[\(.*\)version \(....\)-\(..\)-\(..\).*$/txiformat=\1 txiversion="\2\3\4"/p' $tmpdir/txiversion.out`
-        verbose "texinfo.tex preloaded as \`$txiformat', version is \`$txiversion' ..."
-        if test "$txiprereq" -le "$txiversion" >/dev/null 2>&1; then
-          makeinfo=
-        else
-          makeinfo=${MAKEINFO:-makeinfo}
-        fi
-        # As long as we had to run TeX, offer the user this convenience:
-        test "$txiformat" = Texinfo && escape=@
-      fi
-      thumbpdf=${THUMBPDF:-thumbpdf}
-      ;;
-  esac
-
-  # Go to $tmpdir to try --help, since old versions that don't accept
-  # --help will generate a texput.log.
-  tex_help=`cd $tmpdir >/dev/null && $tex --help </dev/null 2>&1`
-
-  # Expand macro commands in the original source file using Makeinfo.
-  # Always use `end' footnote style, since the `separate' style
-  #   generates different output (arguably this is a bug in -E).
-  # Discard main info output, the user asked to run TeX, not makeinfo.
-  if test -n "$makeinfo"; then
-    verbose "Macro-expanding $command_line_filename to $filename_src ..."
-    sed -f $comment_iftex_sed "$command_line_filename" \
-      | $makeinfo --footnote-style=end -I "$filename_dir" $miincludes \
-        -o /dev/null --macro-expand=- \
-      | sed -f $uncomment_iftex_sed >"$filename_src"
-    filename_input=$filename_src
+    out_name=$in_noext.`out_lang_ext`
   fi
+  out_dir=`func_dirname "$out_name"`
+  out_dir_abs=`absolute "$out_dir"`
+  out_base=`basename "$out_name"`
+  out_noext=`echo "$out_base" | sed 's/\.[^.]*$//'`
+}
 
-  # If makeinfo failed (or was not even run), use the original file as input.
-  if test $? -ne 0 \
-     || test ! -r "$filename_src"; then
-    verbose "Reverting to $command_line_filename ..."
-    filename_input=$filename_dir/$filename_ext
-  fi
 
-  # Used most commonly for @finalout, @smallbook, etc.
-  if test -n "$textra"; then
-    verbose "Inserting extra commands: $textra"
-    sed "$textra_cmd\\
-$textra" "$filename_input" >"$filename_xtr"
-    filename_input=$filename_xtr
-  fi
+## -------------- ##
+## TeXify files.  ##
+## -------------- ##
 
-  # If this is a Texinfo file with a specified input encoding, and
-  # recode is available, then recode to plain 7 bit Texinfo.
-  if test $language = texinfo; then
-    pgm='s/^ *@documentencoding  *\([^ ][^ ]*\) *$/\1/
-	t found
-	d
-	:found
-	q'
-    encoding=`sed -e "$pgm" "$filename_input"`
-    if $recode && test -n "$encoding" && findprog recode; then
-      verbose "Recoding from $encoding to Texinfo."
-      if recode "$encoding"..texinfo <"$filename_input" >"$filename_rcd" \
-         && test -s "$filename_rcd"; then
-        filename_input=$filename_rcd
-      else
-        verbose "Recoding failed, using original input."
-      fi
-    fi
-  fi
+for command_line_filename
+do
+  verbose "Processing $command_line_filename ..."
 
-  # If clean mode was specified, then move to the temporary directory.
-  if test "$clean" = t; then
-    verbose "cd $tmpdir_src"
-    cd "$tmpdir_src" || exit 1
+  input_file_name_decode
+
+  # `texinfo' or `latex'?
+  in_lang=`compute_language "$command_line_filename"`
+
+  # An auxiliary directory used for all the auxiliary tasks involved
+  # in compiling this document.
+  case $build_dir in
+      '' | . ) t2ddir=$out_noext.t2d ;;
+      *) # Avoid collisions between multiple occurrences of the same
+	 # file.  The sed expression is fragile if the cwd has
+	 # active characters.
+	 t2ddir=$build_dir/`echo "$out_dir_abs/$out_noext.t2d" |
+	     sed "s,^$orig_pwd/,," |
+	     sed 's,/,!,g'`
+  esac
+  # Remove it at exit if clean mode.
+  trap "cleanup" 0 1 2 15
+
+  ensure_dir "$build_dir" "$t2ddir"
+
+  # We will change directory, better work with an absolute path...
+  t2ddir=`absolute "$t2ddir"`
+  # Sometimes there are incompatibilities between auxiliary files for
+  # DVI and PDF.  The contents can also change whether we work on PDF
+  # and/or DVI.  So keep separate spaces for each.
+  workdir=$t2ddir/`out_lang_tex`
+  ensure_dir "$workdir"
+
+  # _build.  In a tidy build, where the auxiliary files are output.
+  if $tidy; then
+    work_build=$workdir/build
+  else
+    work_build=.
   fi
 
-  while :; do # will break out of loop below
-    orig_xref_files=`get_xref_files "$filename_noext"`
-
-    # Save copies of originals for later comparison.
-    if test -n "$orig_xref_files"; then
-      verbose "Backing up xref files: `echo $orig_xref_files | sed 's|\./||g'`"
-      cp $orig_xref_files $tmpdir_bak
-    fi
-
-    # Run bibtex on current file.
-    # - If its input (AUX) exists.
-    # - If AUX contains both `\bibdata' and `\bibstyle'.
-    # - If some citations are missing (LOG contains `Citation').
-    #   or the LOG complains of a missing .bbl
-    #
-    # We run bibtex first, because I can see reasons for the indexes
-    # to change after bibtex is run, but I see no reason for the
-    # converse.
-    #
-    # Don't try to be too smart.  Running bibtex only if the bbl file
-    # exists and is older than the LaTeX file is wrong, since the
-    # document might include files that have changed.  Because there
-    # can be several AUX (if there are \include's), but a single LOG,
-    # looking for missing citations in LOG is easier, though we take
-    # the risk to match false messages.
-    if test -n "$bibtex" \
-       && test -r "$filename_noext.aux" \
-       && test -r "$filename_noext.log" \
-       && (grep '^\\bibdata[{]'  "$filename_noext.aux" \
-           && grep '^\\bibstyle[{]' "$filename_noext.aux" \
-           && (grep 'Warning:.*Citation.*undefined' "$filename_noext.log" \
-               || grep 'No file .*\.bbl\.' "$filename_noext.log")) \
-          >&6 2>&1; \
-    then
-      verbose "Running $bibtex $filename_noext ..."
-      $bibtex "$filename_noext" >&5 ||
-        fatal 1 "$bibtex exited with bad status, quitting."
-    fi
-
-    # What we'll run texindex on -- exclude non-index files.
-    # Since we know index files are last, it is correct to remove everything
-    # before .aux and .?o?.  But don't really do <anything>o<anything>
-    # -- don't match whitespace as <anything>.
-    # Otherwise, if orig_xref_files contains something like
-    #   foo.xo foo.whatever
-    # the space after the o will get matched.
-    index_files=`echo "$orig_xref_files" \
-                 | sed "s!.*\.aux!!g;
-                        s!./$filename_noext\.[^ ]o[^ ]!!g;
-                        s/^[ ]*//;s/[ ]*$//"`
-    # Run texindex (or makeindex) on current index files.  If they
-    # already exist, and after running TeX a first time the index
-    # files don't change, then there's no reason to run TeX again.
-    # But we won't know that if the index files are out of date or
-    # nonexistent.
-    if test -n "$texindex" && test -n "$index_files"; then
-      verbose "Running $texindex $index_files ..."
-      $texindex $index_files 2>&5 1>&2 ||
-         fatal 1 "$texindex exited with bad status, quitting."
-    fi
-
-    # Finally, run TeX.
-    run_tex
-
-    # Decide if looping again is needed.
-    finished=t
-
-    # LaTeX (and the package changebar) report in the LOG file if it
-    # should be rerun.  This is needed for files included from
-    # subdirs, since texi2dvi does not try to compare xref files in
-    # subdirs.  Performing xref files test is still good since LaTeX
-    # does not report changes in xref files.
-    if grep "Rerun to get" "$filename_noext.log" >&6 2>&1; then
-      finished=
-    fi
-
-    # Check if xref files changed.
-    new_xref_files=`get_xref_files "$filename_noext"`
-    verbose "Original xref files = `echo $orig_xref_files | sed 's|\./||g'`"
-    verbose "New xref files      = `echo $new_xref_files | sed 's|\./||g'`"
-
-    # If old and new lists don't at least have the same file list,
-    # then one file or another has definitely changed.
-    test "x$orig_xref_files" != "x$new_xref_files" && finished=
-
-    # File list is the same.  We must compare each file until we find
-    # a difference.
-    if test -n "$finished"; then
-      for this_file in $new_xref_files; do
-        verbose "Comparing xref file `echo $this_file | sed 's|\./||g'` ..."
-        # cmp -s returns nonzero exit status if files differ.
-        if cmp -s "$this_file" "$tmpdir_bak/$this_file"; then :; else
-          # We only need to keep comparing until we find one that
-          # differs, because we'll have to run texindex & tex again no
-          # matter how many more there might be.
-          finished=
-          verbose "xref file `echo $this_file | sed 's|\./||g'` differed ..."
-          test "$debug" = t && diff -c "$tmpdir_bak/$this_file" "$this_file"
-          break
-        fi
-      done
-    fi
-
-    # If finished, exit the loop, else rerun the loop.
-    test -n "$finished" && break
-  done # while :;
-
-  # If we were using thumbpdf and producing PDF, then run thumbpdf
-  # and TeX one last time.
-  if test $oformat = pdf \
-     && test -r "$filename_noext.log" \
-     && grep 'thumbpdf\.sty'  "$filename_noext.log" >&6 2>&1; \
-  then
-    verbose "Running $thumbpdf $filename_noext ..."
-    $thumbpdf "$filename_noext" >&5 ||
-      fatal 1 "$thumbpdf exited with bad status, quitting."
-    run_tex
-  fi
+  # _bak.  Copies of the previous auxiliary files (another round is
+  # run if they differ from the new ones).
+  work_bak=$workdir/bak
 
+  # Make those directories.
+  ensure_dir "$work_build" "$work_bak"
 
-  # If we were in clean mode, compilation was in a tmp directory.
-  # Copy the DVI (or PDF) file into the directory where the compilation
-  # has been done.  (The temp dir is about to get removed anyway.)
-  # We also return to the original directory so that
-  # - the next file is processed in correct conditions
-  # - the temporary file can be removed
-  if test -n "$clean"; then
-    if test -n "$oname"; then
-       dest=$oname
-    else
-       dest=$orig_pwd
-    fi
-    verbose "Copying $oformat file from `pwd` to $dest"
-    cp -p "./$filename_noext.$oformat" "$dest"
-    cd / # in case $orig_pwd is on a different drive (for DOS)
-    cd $orig_pwd || exit 1
-  fi
+  case $action in
+    compile)
+      # Compile the document.
+      compile
+      cleanup
+      ;;
 
-  # Remove temporary files.
-  if test "x$debug" = "x"; then
-    verbose "Removing $tmpdir_src $tmpdir_xtr $tmpdir_bak ..."
-    cd /
-    rm -rf $tmpdir_src $tmpdir_xtr $tmpdir_bak
-  fi
+    mostly-clean)
+      mostly_clean
+      ;;
+  esac
 done
 
 verbose "done."
diff --git a/Build/source/utils/texinfo/util/texi2dvi.test b/Build/source/utils/texinfo/util/texi2dvi.test
new file mode 100755
index 00000000000..9d2d99a1118
--- /dev/null
+++ b/Build/source/utils/texinfo/util/texi2dvi.test
@@ -0,0 +1,79 @@
+#! /bin/sh
+# Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+#
+# This file is part of GNU Texinfo.
+#
+# GNU Texinfo is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# GNU Texinfo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+required='tex'
+
+. ./defs || exit 1
+
+set -e
+
+# one_run ARGS -- FILES
+# ---------------------
+# Run texi2dvi with ARGS, expect the FILES to be left.  Remove them.
+one_run ()
+{
+  # Testing the local build mode.
+  create_input_texi </dev/null
+  TEXI2DVI_pass $(optionset_get 1 "$@") input.texi
+  # There should only be the expected FILES and the input file.
+  assert_and_remove_files $(optionset_get 2 "$@") input.texi
+}
+
+one_run --batch \
+   -- \
+   input.aux input.cp input.dvi input.fn input.ky input.log \
+   input.pg input.tp input.vr
+
+
+one_run --batch -o output.dvi \
+   -- \
+   input.aux input.cp input.fn input.ky input.log \
+   input.pg input.tp input.vr output.dvi
+
+
+# Testing the clean build mode.
+for mode in --clean --build=clean
+do
+  # There should only be the DVI and the TEXI file.
+  one_run $mode --batch -- input.dvi
+
+  # There should only be the DVI and the TEXI file.
+  one_run $mode --batch -o output.dvi -- output.dvi
+done
+
+
+# Testing the tidy build mode.
+one_run --build=tidy --batch -o output.dvi \
+   -- \
+   output.dvi output.t2d
+
+
+# mostly-clean should remove auxiliary files, but not the expected
+# output.
+touch output.dvi
+one_run --build=tidy --batch -o output.dvi --mostly-clean \
+   -- \
+   output.dvi
+
+
+# There should only be the DVI and the TEXI file.
+create_input_texi </dev/null
+cp input.texi input2.texi
+one_run --clean --batch input.texi input2.texi \
+   -- \
+   input2.dvi input2.texi input.dvi
diff --git a/Build/source/utils/texinfo/util/texi2pdf b/Build/source/utils/texinfo/util/texi2pdf
index 492128325db..a030a74ed9f 100755
--- a/Build/source/utils/texinfo/util/texi2pdf
+++ b/Build/source/utils/texinfo/util/texi2pdf
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $Id: texi2pdf,v 1.1 2004/07/11 01:02:35 karl Exp $
+# $Id: texi2pdf,v 1.2 2005/01/28 01:52:04 karl Exp $
 # Written by Thomas Esser.  Public domain.
 # Execute texi2dvi --pdf.
 
-test -f /bin/sh5 && test -z "$RUNNING_SH5" \
+test -f /bin/ksh && test -z "$RUNNING_KSH" \
   && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
-  && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
-unset RUNNING_SH5
+  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
+unset RUNNING_KSH
 
 test -f /bin/bsh && test -z "$RUNNING_BSH" \
   && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
diff --git a/Build/source/utils/texinfo/util/texindex.c b/Build/source/utils/texinfo/util/texindex.c
index 569f877be0d..431f27e8f1d 100644
--- a/Build/source/utils/texinfo/util/texindex.c
+++ b/Build/source/utils/texinfo/util/texindex.c
@@ -1,13 +1,13 @@
 /* texindex -- sort TeX index dribble output into an actual index.
-   $Id: texindex.c,v 1.11 2004/04/11 17:56:47 karl Exp $
+   $Id: texindex.c,v 1.24 2008/02/22 19:18:25 karl Exp $
 
    Copyright (C) 1987, 1991, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,13 +15,12 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include <getopt.h>
 
-static char *program_name = "texindex";
+char *program_name = "texindex";
 
 #if defined (emacs)
 #  include "../src/config.h"
@@ -37,16 +36,12 @@ static char *program_name = "texindex";
 #define memset(ptr, ignore, count) bzero (ptr, count)
 #endif
 
-char *mktemp (char *);
-
 #if !defined (SEEK_SET)
 #  define SEEK_SET 0
 #  define SEEK_CUR 1
 #  define SEEK_END 2
 #endif /* !SEEK_SET */
 
-struct linebuffer;
-
 /* When sorting in core, this structure describes one line
    and the position and length of its first keyfield.  */
 struct lineinfo
@@ -96,16 +91,6 @@ char **linearray;
 /* The allocated length of `linearray'. */
 long nlines;
 
-/* Directory to use for temporary files.  On Unix, it ends with a slash.  */
-char *tempdir;
-
-/* Number of last temporary file.  */
-int tempcount;
-
-/* Number of last temporary file already deleted.
-   Temporary files are deleted by `flush_tempfiles' in order of creation.  */
-int last_deleted_tempcount;
-
 /* During in-core sort, this points to the base of the data block
    which contains all the lines of data.  */
 char *text_base;
@@ -117,15 +102,9 @@ int need_initials;
    determine whether we need initials in the sorted form.  */
 char first_initial;
 
-/* Additional command switches .*/
-
-/* Nonzero means do not delete tempfiles -- for debugging. */
-int keep_tempfiles;
-
 /* Forward declarations of functions in this file. */
 void decode_command (int argc, char **argv);
 void sort_in_core (char *infile, int total, char *outfile);
-void sort_offline (char *infile, off_t total, char *outfile);
 char **parsefile (char *filename, char **nextline, char *data, long int size);
 char *find_field (struct keyfield *keyfield, char *str, long int *lengthptr);
 char *find_pos (char *str, int words, int chars, int ignore_blanks);
@@ -137,26 +116,17 @@ int compare_field (struct keyfield *keyfield, char *start1,
                    long int length1, long int pos1, char *start2,
                    long int length2, long int pos2);
 int compare_full (const void *, const void *);
-long readline (struct linebuffer *linebuffer, FILE *stream);
-int merge_files (char **infiles, int nfiles, char *outfile);
-int merge_direct (char **infiles, int nfiles, char *outfile);
 void pfatal_with_name (const char *name);
 void fatal (const char *format, const char *arg);
 void error (const char *format, const char *arg);
 void *xmalloc (), *xrealloc ();
-char *concat (char *s1, char *s2);
-void flush_tempfiles (int to_count);
+static char *concat3 (const char *, const char *, const char *);
 
-#define MAX_IN_CORE_SORT 500000
-
 int
-main (int argc, char **argv)
+main (int argc, char *argv[])
 {
   int i;
 
-  tempcount = 0;
-  last_deleted_tempcount = 0;
-
 #ifdef HAVE_SETLOCALE
   /* Set locale via LC_ALL.  */
   setlocale (LC_ALL, "");
@@ -220,19 +190,20 @@ main (int argc, char **argv)
 
       outfile = outfiles[i];
       if (!outfile)
-        outfile = concat (infiles[i], "s");
+        outfile = concat3 (infiles[i], "s", "");
 
       need_initials = 0;
       first_initial = '\0';
 
-      if (ptr < MAX_IN_CORE_SORT)
-        /* Sort a small amount of data. */
-        sort_in_core (infiles[i], (int)ptr, outfile);
-      else
-        sort_offline (infiles[i], ptr, outfile);
+      if (ptr != (int)ptr)
+	{
+	  fprintf (stderr, "%s: %s: file too large\n", program_name,
+		   infiles[i]);
+	  xexit (1);
+	}
+      sort_in_core (infiles[i], (int)ptr, outfile);
     }
 
-  flush_tempfiles (tempcount);
   xexit (0);
   return 0; /* Avoid bogus warnings.  */
 }
@@ -250,10 +221,6 @@ typedef struct
 TEXINDEX_OPTION texindex_options[] = {
   { "--help", "-h", (int *)NULL, 0, (char *)NULL,
       N_("display this help and exit") },
-  { "--keep", "-k", &keep_tempfiles, 1, (char *)NULL,
-      N_("keep temporary files around after processing") },
-  { "--no-keep", 0, &keep_tempfiles, 0, (char *)NULL,
-      N_("do not keep temporary files around after processing (default)") },
   { "--output", "-o", (int *)NULL, 0, "FILE",
       N_("send output to FILE") },
   { "--version", (char *)NULL, (int *)NULL, 0, (char *)NULL,
@@ -308,20 +275,6 @@ decode_command (int argc, char **argv)
   char **ip;
   char **op;
 
-  /* Store default values into parameter variables. */
-
-  tempdir = getenv ("TMPDIR");
-  if (tempdir == NULL)
-    tempdir = getenv ("TEMP");
-  if (tempdir == NULL)
-    tempdir = getenv ("TMP");
-  if (tempdir == NULL)
-    tempdir = DEFAULT_TMPDIR;
-  else
-    tempdir = concat (tempdir, "/");
-
-  keep_tempfiles = 0;
-
   /* Allocate ARGC input files, which must be enough.  */
 
   infiles = (char **) xmalloc (argc * sizeof (char *));
@@ -339,16 +292,17 @@ decode_command (int argc, char **argv)
             {
               printf ("texindex (GNU %s) %s\n", PACKAGE, VERSION);
               puts ("");
-              puts ("Copyright (C) 2004 Free Software Foundation, Inc.");
-              printf (_("There is NO warranty.  You may redistribute this software\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.\n"));
+              printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
+This is free software: you are free to change and redistribute it.\n\
+There is NO WARRANTY, to the extent permitted by law.\n"),
+	      "2008");
               xexit (0);
             }
           else if ((strcmp (arg, "--keep") == 0) ||
                    (strcmp (arg, "-k") == 0))
             {
-              keep_tempfiles = 1;
+	      /* Ignore, for backward compatibility */
             }
           else if ((strcmp (arg, "--help") == 0) ||
                    (strcmp (arg, "-h") == 0))
@@ -384,41 +338,6 @@ For more information about these matters, see the files named COPYING.\n"));
     usage (1);
 }
 
-/* Return a name for temporary file COUNT. */
-
-static char *
-maketempname (int count)
-{
-  static char *tempbase = NULL;
-  char tempsuffix[10];
-
-  if (!tempbase)
-    {
-      int fd;
-      tempbase = concat (tempdir, "txidxXXXXXX");
-
-      fd = mkstemp (tempbase);
-      if (fd == -1)
-        pfatal_with_name (tempbase);
-    }
-
-  sprintf (tempsuffix, ".%d", count);
-  return concat (tempbase, tempsuffix);
-}
-
-
-/* Delete all temporary files up to TO_COUNT. */
-
-void
-flush_tempfiles (int to_count)
-{
-  if (keep_tempfiles)
-    return;
-  while (last_deleted_tempcount < to_count)
-    unlink (maketempname (++last_deleted_tempcount));
-}
-
-
 /* Compare LINE1 and LINE2 according to the specified set of keyfields. */
 
 int
@@ -801,150 +720,6 @@ compare_field (struct keyfield *keyfield, char *start1, long int length1,
     }
 }
 
-/* A `struct linebuffer' is a structure which holds a line of text.
-   `readline' reads a line from a stream into a linebuffer
-   and works regardless of the length of the line.  */
-
-struct linebuffer
-{
-  long size;
-  char *buffer;
-};
-
-/* Initialize LINEBUFFER for use. */
-
-void
-initbuffer (struct linebuffer *linebuffer)
-{
-  linebuffer->size = 200;
-  linebuffer->buffer = (char *) xmalloc (200);
-}
-
-/* Read a line of text from STREAM into LINEBUFFER.
-   Return the length of the line.  */
-
-long
-readline (struct linebuffer *linebuffer, FILE *stream)
-{
-  char *buffer = linebuffer->buffer;
-  char *p = linebuffer->buffer;
-  char *end = p + linebuffer->size;
-
-  while (1)
-    {
-      int c = getc (stream);
-      if (p == end)
-        {
-          buffer = (char *) xrealloc (buffer, linebuffer->size *= 2);
-          p += buffer - linebuffer->buffer;
-          end += buffer - linebuffer->buffer;
-          linebuffer->buffer = buffer;
-        }
-      if (c < 0 || c == '\n')
-        {
-          *p = 0;
-          break;
-        }
-      *p++ = c;
-    }
-
-  return p - buffer;
-}
-
-/* Sort an input file too big to sort in core.  */
-
-void
-sort_offline (char *infile, off_t total, char *outfile)
-{
-  /* More than enough. */
-  int ntemps = 2 * (total + MAX_IN_CORE_SORT - 1) / MAX_IN_CORE_SORT;
-  char **tempfiles = (char **) xmalloc (ntemps * sizeof (char *));
-  FILE *istream = fopen (infile, "r");
-  int i;
-  struct linebuffer lb;
-  long linelength;
-  int failure = 0;
-
-  initbuffer (&lb);
-
-  /* Read in one line of input data.  */
-
-  linelength = readline (&lb, istream);
-
-  if (lb.buffer[0] != '\\' && lb.buffer[0] != '@')
-    {
-      error (_("%s: not a texinfo index file"), infile);
-      return;
-    }
-
-  /* Split up the input into `ntemps' temporary files, or maybe fewer,
-     and put the new files' names into `tempfiles' */
-
-  for (i = 0; i < ntemps; i++)
-    {
-      char *outname = maketempname (++tempcount);
-      FILE *ostream = fopen (outname, "w");
-      long tempsize = 0;
-
-      if (!ostream)
-        pfatal_with_name (outname);
-      tempfiles[i] = outname;
-
-      /* Copy lines into this temp file as long as it does not make file
-         "too big" or until there are no more lines.  */
-
-      while (tempsize + linelength + 1 <= MAX_IN_CORE_SORT)
-        {
-          tempsize += linelength + 1;
-          fputs (lb.buffer, ostream);
-          putc ('\n', ostream);
-
-          /* Read another line of input data.  */
-
-          linelength = readline (&lb, istream);
-          if (!linelength && feof (istream))
-            break;
-
-          if (lb.buffer[0] != '\\' && lb.buffer[0] != '@')
-            {
-              error (_("%s: not a texinfo index file"), infile);
-              failure = 1;
-              goto fail;
-            }
-        }
-      fclose (ostream);
-      if (feof (istream))
-        break;
-    }
-
-  free (lb.buffer);
-
-fail:
-  /* Record number of temp files we actually needed.  */
-
-  ntemps = i;
-
-  /* Sort each tempfile into another tempfile.
-    Delete the first set of tempfiles and put the names of the second
-    into `tempfiles'. */
-
-  for (i = 0; i < ntemps; i++)
-    {
-      char *newtemp = maketempname (++tempcount);
-      sort_in_core (tempfiles[i], MAX_IN_CORE_SORT, newtemp);
-      if (!keep_tempfiles)
-        unlink (tempfiles[i]);
-      tempfiles[i] = newtemp;
-    }
-
-  if (failure)
-    return;
-
-  /* Merge the tempfiles together and indexify. */
-
-  merge_files (tempfiles, ntemps, outfile);
-}
-
 /* Sort INFILE, whose size is TOTAL,
    assuming that is small enough to be done in-core,
    then indexify it and send the output to OUTFILE (or to stdout).  */
@@ -1348,8 +1123,7 @@ writelines (char **linearray, int nlines, FILE *ostream)
 
   for (next_line = linearray; next_line != stop_line; next_line++)
     {
-      /* If -u was specified, output the line only if distinct from
-         previous one.  */
+      /* Output the line only if distinct from previous one.  */
       if (next_line == linearray
       /* Compare previous line with this one, using only the
          explicitly specd keyfields. */
@@ -1369,215 +1143,6 @@ writelines (char **linearray, int nlines, FILE *ostream)
   finish_index (ostream);
 }
 
-/* Assume (and optionally verify) that each input file is sorted;
-   merge them and output the result.
-   Returns nonzero if any input file fails to be sorted.
-
-   This is the high-level interface that can handle an unlimited
-   number of files.  */
-
-#define MAX_DIRECT_MERGE 10
-
-int
-merge_files (char **infiles, int nfiles, char *outfile)
-{
-  char **tempfiles;
-  int ntemps;
-  int i;
-  int value = 0;
-  int start_tempcount = tempcount;
-
-  if (nfiles <= MAX_DIRECT_MERGE)
-    return merge_direct (infiles, nfiles, outfile);
-
-  /* Merge groups of MAX_DIRECT_MERGE input files at a time,
-     making a temporary file to hold each group's result.  */
-
-  ntemps = (nfiles + MAX_DIRECT_MERGE - 1) / MAX_DIRECT_MERGE;
-  tempfiles = (char **) xmalloc (ntemps * sizeof (char *));
-  for (i = 0; i < ntemps; i++)
-    {
-      int nf = MAX_DIRECT_MERGE;
-      if (i + 1 == ntemps)
-        nf = nfiles - i * MAX_DIRECT_MERGE;
-      tempfiles[i] = maketempname (++tempcount);
-      value |= merge_direct (&infiles[i * MAX_DIRECT_MERGE], nf, tempfiles[i]);
-    }
-
-  /* All temporary files that existed before are no longer needed
-     since their contents have been merged into our new tempfiles.
-     So delete them.  */
-  flush_tempfiles (start_tempcount);
-
-  /* Now merge the temporary files we created.  */
-
-  merge_files (tempfiles, ntemps, outfile);
-
-  free (tempfiles);
-
-  return value;
-}
-
-/* Assume (and optionally verify) that each input file is sorted;
-   merge them and output the result.
-   Returns nonzero if any input file fails to be sorted.
-
-   This version of merging will not work if the number of
-   input files gets too high.  Higher level functions
-   use it only with a bounded number of input files.  */
-
-int
-merge_direct (char **infiles, int nfiles, char *outfile)
-{
-  struct linebuffer *lb1, *lb2;
-  struct linebuffer **thisline, **prevline;
-  FILE **streams;
-  int i;
-  int nleft;
-  int lossage = 0;
-  int *file_lossage;
-  struct linebuffer *prev_out = 0;
-  FILE *ostream = stdout;
-
-  if (outfile)
-    {
-      ostream = fopen (outfile, "w");
-    }
-  if (!ostream)
-    pfatal_with_name (outfile);
-
-  init_index ();
-
-  if (nfiles == 0)
-    {
-      if (outfile)
-        fclose (ostream);
-      return 0;
-    }
-
-  /* For each file, make two line buffers.  Also, for each file, there
-     is an element of `thisline' which points at any time to one of the
-     file's two buffers, and an element of `prevline' which points to
-     the other buffer.  `thisline' is supposed to point to the next
-     available line from the file, while `prevline' holds the last file
-     line used, which is remembered so that we can verify that the file
-     is properly sorted. */
-
-  /* lb1 and lb2 contain one buffer each per file. */
-  lb1 = (struct linebuffer *) xmalloc (nfiles * sizeof (struct linebuffer));
-  lb2 = (struct linebuffer *) xmalloc (nfiles * sizeof (struct linebuffer));
-
-  /* thisline[i] points to the linebuffer holding the next available
-     line in file i, or is zero if there are no lines left in that file.  */
-  thisline = (struct linebuffer **)
-    xmalloc (nfiles * sizeof (struct linebuffer *));
-  /* prevline[i] points to the linebuffer holding the last used line
-     from file i.  This is just for verifying that file i is properly
-     sorted.  */
-  prevline = (struct linebuffer **)
-    xmalloc (nfiles * sizeof (struct linebuffer *));
-  /* streams[i] holds the input stream for file i.  */
-  streams = (FILE **) xmalloc (nfiles * sizeof (FILE *));
-  /* file_lossage[i] is nonzero if we already know file i is not
-     properly sorted.  */
-  file_lossage = (int *) xmalloc (nfiles * sizeof (int));
-
-  /* Allocate and initialize all that storage. */
-
-  for (i = 0; i < nfiles; i++)
-    {
-      initbuffer (&lb1[i]);
-      initbuffer (&lb2[i]);
-      thisline[i] = &lb1[i];
-      prevline[i] = &lb2[i];
-      file_lossage[i] = 0;
-      streams[i] = fopen (infiles[i], "r");
-      if (!streams[i])
-        pfatal_with_name (infiles[i]);
-
-      readline (thisline[i], streams[i]);
-    }
-
-  /* Keep count of number of files not at eof. */
-  nleft = nfiles;
-
-  while (nleft)
-    {
-      struct linebuffer *best = 0;
-      struct linebuffer *exch;
-      int bestfile = -1;
-      int i;
-
-      /* Look at the next avail line of each file; choose the least one.  */
-
-      for (i = 0; i < nfiles; i++)
-        {
-          if (thisline[i] &&
-              (!best ||
-               0 < compare_general (best->buffer, thisline[i]->buffer,
-                                 (long) bestfile, (long) i, num_keyfields)))
-            {
-              best = thisline[i];
-              bestfile = i;
-            }
-        }
-
-      /* Output that line, unless it matches the previous one and we
-         don't want duplicates. */
-
-      if (!(prev_out &&
-            !compare_general (prev_out->buffer,
-                              best->buffer, 0L, 1L, num_keyfields - 1)))
-        indexify (best->buffer, ostream);
-      prev_out = best;
-
-      /* Now make the line the previous of its file, and fetch a new
-         line from that file.  */
-
-      exch = prevline[bestfile];
-      prevline[bestfile] = thisline[bestfile];
-      thisline[bestfile] = exch;
-
-      while (1)
-        {
-          /* If the file has no more, mark it empty. */
-
-          if (feof (streams[bestfile]))
-            {
-              thisline[bestfile] = 0;
-              /* Update the number of files still not empty. */
-              nleft--;
-              break;
-            }
-          readline (thisline[bestfile], streams[bestfile]);
-          if (thisline[bestfile]->buffer[0] || !feof (streams[bestfile]))
-            break;
-        }
-    }
-
-  finish_index (ostream);
-
-  /* Free all storage and close all input streams. */
-
-  for (i = 0; i < nfiles; i++)
-    {
-      fclose (streams[i]);
-      free (lb1[i].buffer);
-      free (lb2[i].buffer);
-    }
-  free (file_lossage);
-  free (lb1);
-  free (lb2);
-  free (thisline);
-  free (prevline);
-  free (streams);
-
-  if (outfile)
-    fclose (ostream);
-
-  return lossage;
-}
-
 /* Print error message and exit.  */
 
 void
@@ -1612,17 +1177,18 @@ pfatal_with_name (const char *name)
 }
 
 
-/* Return a newly-allocated string concatenating S1 and S2.  */
+/* Return a newly-allocated string concatenating S1, S2, and S3.  */
 
-char *
-concat (char *s1, char *s2)
+static char *
+concat3 (const char *s1, const char *s2, const char *s3)
 {
-  int len1 = strlen (s1), len2 = strlen (s2);
-  char *result = (char *) xmalloc (len1 + len2 + 1);
+  int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
+  char *result = (char *) xmalloc (len1 + len2 + len3 + 1);
 
   strcpy (result, s1);
   strcpy (result + len1, s2);
-  *(result + len1 + len2) = 0;
+  strcpy (result + len1 + len2, s3);
+  *(result + len1 + len2 + len3) = 0;
 
   return result;
 }
diff --git a/Build/source/utils/texinfo/util/texinfo.dtd b/Build/source/utils/texinfo/util/texinfo.dtd
index 617992a59f6..d07fdf6ee6b 100644
--- a/Build/source/utils/texinfo/util/texinfo.dtd
+++ b/Build/source/utils/texinfo/util/texinfo.dtd
@@ -1,20 +1,22 @@
-<!-- $Id: texinfo.dtd,v 1.4 2004/12/19 15:08:55 karl Exp $
-   Document Type Definition for Texinfo.
+<!-- $Id: texinfo.dtd,v 1.13 2008/01/31 18:33:27 karl Exp $
+   Document Type Definition for Texinfo XML output (the '-'-xml option).
 
-   Author: Philippe Martin (feloy@free.fr)
-   Contributors:
-           Karl Eichwalder (keichwa@gmx.net)
-           Alper Ersoy (dirt@gtk.org)
-
-   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+  Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
+   Author: Philippe Martin
+   Contributors:
+           Karl Eichwalder
+           Alper Ersoy
+           Karl Berry
+           Torsten Bronger
 -->
 
-<!-- ENTITIES -->
+<!-- * ENTITIES * -->
 
 <!-- Meta-information -->
 <!ENTITY % metainformation "setfilename | settitle | dircategory
@@ -34,27 +36,23 @@
 <!ENTITY % titlepage_cmds "author | booktitle | booksubtitle">
 
 <!-- block -->
-<!-- ***** -->
 <!ENTITY % block "menu | para | quotation | example | smallexample | lisp
                   | smalllisp | cartouche | copying
                   | format | smallformat | display
                   | smalldisplay | itemize | enumerate | sp | center | group
-                  | table | multitable | definition">
+                  | table | multitable | definition | float | image">
 
 <!-- API definitions -->
-<!-- *************** -->
 <!ENTITY % definition.cmds "defcategory | deffunction | defvariable | defparam
                             | defdelimiter | deftype | defparamtype | defdatatype
                             | defclass | defclassvar | defoperation">
 
 <!-- Headings -->
-<!-- ******** -->
 <!ENTITY % headings "majorheading | chapheading | heading | subheading
                      | subsubheading">
 
 
 <!-- Sectioning -->
-<!-- ********** -->
 <!ENTITY % section.level1 "top | chapter | unnumbered | appendix">
 
 <!ENTITY % section.level2 "section | unnumberedsec | appendixsec">
@@ -75,6 +73,7 @@
                                    | verbatim | titlepage | %toc;
                                    | %lang; | %variables;
                                    | %headings;
+                                   | listoffloats
                                    | printindex)*">
 
 <!ENTITY % section.level2.content "(%block;
@@ -95,37 +94,37 @@
                                     | %lang; | %variables;
                                     | %headings;)*">
 
+<!-- Options (many missing) -->
+<!ENTITY % onoff "on|off">
+<!ENTITY % option.cmds "frenchspacing">
 
 <!-- Inline -->
-<!-- ****** -->
 <!ENTITY % Inline.emphasize "strong | emph">
-<!ENTITY % Inline.fonts "b | i | r | sansserif | slanted | titlefont | tt">
+<!ENTITY % Inline.fonts "b | i | r | sansserif | slanted | titlefont | tt
+                         | sc">
 <!ENTITY % Inline.footnote "footnote">
-<!ENTITY % Inline.markup "code | command | env | file | option | samp
+<!ENTITY % Inline.markup "code | command | env | file | option | samp | verb
                           | dfn | cite | key | kbd | var | acronym | url"> 
-<!ENTITY % Inline.math "math">
+<!ENTITY % Inline.math "math | dmn">
 <!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref">
-<!ENTITY % Inline.smallcaps "sc">
+<!ENTITY % Inline.misc "click | clicksequence | logo | punct">
 
 <!ENTITY % Inline.phrase
-           "%Inline.emphasize; | %Inline.smallcaps; | %Inline.fonts;
-            | %Inline.markup; | %Inline.math; | %Inline.reference;
-            | %Inline.footnote; ">
+           "%Inline.emphasize;  | %Inline.misc; | %Inline.fonts;
+            | %Inline.markup;   | %Inline.math; | %Inline.reference;
+            | %Inline.footnote; | %option.cmds; ">
 
 
-<!-- ************ -->
 <!-- * ELEMENTS * -->
-<!-- ************ -->
 
 <!-- TOP Level Element -->
-<!-- ***************** -->
-<!ELEMENT texinfo ((%metainformation; | titlepage | node | %block; | %toc;
+<!ELEMENT texinfo ((%metainformation; | titlepage | node | synindex | %block; | %toc;
                     | %variables; | %lang;)* )>
 <!ATTLIST texinfo xml:lang (%languagecodes;) 'en'>
 
 <!-- meta-information -->
 <!ELEMENT setfilename (#PCDATA)>
-<!ELEMENT settitle    (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT settitle    (#PCDATA | %Inline.phrase;)*>
 <!ELEMENT dircategory (#PCDATA)>
 
 <!ELEMENT setvalue    (#PCDATA | %Inline.phrase;)*>
@@ -150,18 +149,16 @@
 <!ELEMENT booksubtitle (#PCDATA | %Inline.phrase;)*>
 
 <!-- NODES -->
-<!-- ***** -->
 <!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?,
-                (%section.all; | %block; | %toc; | %lang; | image)*) >
+                (%section.all; | %block; | %toc; | %lang;)*) >
 
 <!ELEMENT nodename (#PCDATA)>
 <!ELEMENT nodenext (#PCDATA)>
 <!ELEMENT nodeprev (#PCDATA)>
 <!ELEMENT nodeup   (#PCDATA)>
 
-<!-- SECTIONING -->
-<!-- ********** -->
 
+<!-- SECTIONING -->
 <!ELEMENT top           (title?, (%section.level1.content;))>
 
 <!ELEMENT chapter       (title?, (%section.level1.content;))>
@@ -180,18 +177,18 @@
 <!ELEMENT appendixsubsubsec (title?, (%section.level4.content;))>
 
 <!-- Headings and titles -->
-<!ELEMENT majorheading  (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT chapheading   (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT heading       (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT subheading    (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT subsubheading (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT title         (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT majorheading  (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT chapheading   (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT heading       (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT subheading    (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT subsubheading (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT title         (#PCDATA | %Inline.phrase;)*>
 
 <!-- Negative Indentation in Blocks -->
 <!ELEMENT exdent       (#PCDATA | %Inline.phrase;)*>
 
+
 <!-- BLOCK Elements -->
-<!-- ************** -->
 
 <!ELEMENT quotation    (%block; | %Inline.phrase; | exdent)*>
 <!ELEMENT documentdescription (#PCDATA | %block; | %Inline.phrase;)*>
@@ -229,7 +226,7 @@
 <!ELEMENT verbatim     (#PCDATA)>
 <!ATTLIST verbatim     xml:space (preserve) #FIXED 'preserve'>
 
-<!ELEMENT para         (#PCDATA | %Inline.phrase; | footnote | %lang;)*>
+<!ELEMENT para         (#PCDATA | %Inline.phrase; | %lang;)*>
 <!ATTLIST para
           role CDATA #IMPLIED>
 
@@ -238,27 +235,28 @@
 <!ELEMENT menuentry (menunode?, menutitle?, menucomment?)>
 <!ELEMENT menunode (#PCDATA)>
 <!ELEMENT menutitle (#PCDATA)>
-<!ELEMENT menucomment (#PCDATA | para)*>
+<!ELEMENT menucomment (#PCDATA | %Inline.phrase;)*>
 
 <!-- Floating displays -->
-<!ELEMENT float (floattype, floatpos, (%block;)*, caption?)>
+<!ELEMENT float (floattype, floatpos, (%block;)*,
+                ((caption, shortcaption?) | (shortcaption, caption))?)>
 <!ATTLIST float
           name CDATA #IMPLIED>
 <!ELEMENT floattype (#PCDATA)>
 <!ELEMENT floatpos (#PCDATA)>
 <!ELEMENT caption (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT shortcaption (#PCDATA | %Inline.phrase;)*>
 <!ELEMENT listoffloats EMPTY>
 <!ATTLIST listoffloats
           type CDATA #IMPLIED>
 
 <!-- Lists -->
 <!ELEMENT itemize (itemfunction, (item | itemize | enumerate | indexterm)*)>
-<!ELEMENT enumerate (enumarg?, (item | itemize | enumerate)*)>
+<!ELEMENT enumerate (item | itemize | enumerate | indexterm)*>
 <!ATTLIST enumerate
           first CDATA #IMPLIED>
 
 <!ELEMENT item (%block;)*>
-<!ELEMENT enumarg (#PCDATA)>
 
 <!ELEMENT itemfunction (#PCDATA | %Inline.phrase;)*>
 
@@ -275,26 +273,29 @@
 <!ELEMENT entry (#PCDATA | %Inline.phrase;)*>
 
 <!-- API definitions -->
-<!ELEMENT definition (definitionterm | definitionitem)+>
+<!ELEMENT definition (definitionterm | definitionitem | indexterm)+>
 <!ELEMENT definitionterm (%definition.cmds; | indexterm)+>
 <!ELEMENT definitionitem (%block;)*>
 
-<!ELEMENT defcategory  (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT deffunction  (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT defvariable  (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT defparam     (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT defdelimiter (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT deftype      (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT defparamtype (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT defdatatype  (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT defclass     (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT defclassvar  (#PCDATA | %Inline.phrase; | footnote)*>
-<!ELEMENT defoperation (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT defcategory  (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT deffunction  (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT defvariable  (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT defparam     (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT defdelimiter (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT deftype      (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT defparamtype (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT defdatatype  (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT defclass     (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT defclassvar  (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT defoperation (#PCDATA | %Inline.phrase;)*>
 
 <!-- INLINE Elements -->
-<!-- *************** -->
 
-<!-- Emphasize -->
+<!-- options -->
+<!ELEMENT frenchspacing (#PCDATA)> <!-- must be on or off -->
+<!ATTLIST frenchspacing val (%onoff;) 'off'>
+
+<!-- emphasize -->
 <!ELEMENT strong (#PCDATA | %Inline.phrase;)*>
 <!ELEMENT emph   (#PCDATA | %Inline.phrase;)*>
 
@@ -302,12 +303,13 @@
 <!ELEMENT sc (#PCDATA | %Inline.phrase;)*>
 
 <!-- fonts -->
-<!ELEMENT i  (#PCDATA | %Inline.phrase;)*>
 <!ELEMENT b  (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT tt (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT i  (#PCDATA | %Inline.phrase;)*>
 <!ELEMENT r  (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT notfixedwidth (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT sansserif   (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT slanted     (#PCDATA | %Inline.phrase;)*>
 <!ELEMENT titlefont   (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT tt (#PCDATA | %Inline.phrase;)*>
 
 <!-- markup -->
 <!ELEMENT code    (#PCDATA | %Inline.phrase;)*>
@@ -333,6 +335,7 @@
 
 <!-- math -->
 <!ELEMENT math    (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT dmn     (#PCDATA | %Inline.phrase;)*>
 
 <!-- reference -->
 <!ELEMENT anchor EMPTY>
@@ -352,6 +355,11 @@
 <!ELEMENT inforefrefname  (#PCDATA | %Inline.phrase;)*>
 <!ELEMENT inforefinfoname (#PCDATA | %Inline.phrase;)*>
 
+<!ELEMENT synindex  EMPTY>
+<!ATTLIST synindex
+          code      (yes|no) 'no'
+          from      NMTOKEN #REQUIRED
+          to        NMTOKEN #REQUIRED>
 <!ELEMENT indexterm (#PCDATA | %Inline.phrase;)*>
 <!ATTLIST indexterm
           index CDATA #IMPLIED>
@@ -368,10 +376,14 @@
 <!ELEMENT footnote (para)>
 
 
-<!ELEMENT neos      EMPTY>
+<!ELEMENT punct     (#PCDATA)>
+<!ATTLIST punct
+          end-of-sentence (yes|no) #IMPLIED>
+<!ELEMENT logo      (#PCDATA)>
+<!ELEMENT linebreak EMPTY>
 
-<!ENTITY tex        "TeX">        <!-- Should become an element. -->
-<!ENTITY latex      "LaTeX">      <!-- Should become an element. -->
+<!ENTITY tex        "<logo>TeX</logo>">
+<!ENTITY latex      "<logo>LaTeX</logo>">
 <!ENTITY ellipsis   "&#x2026;">
 <!ENTITY lt         "&#x3c;">
 <!ENTITY gt         "&#x3e;">
@@ -381,21 +393,29 @@
 <!ENTITY euro       "&#x20ac;">
 <!ENTITY pounds     "&#xa3;">
 <!ENTITY minus      "&#x2212;">
-<!ENTITY linebreak  "&#xa;">      <!-- Should become an element. -->
+<!ENTITY linebreak  "<linebreak/>">
 <!ENTITY space      " ">          <!-- Should become an element. -->
-<!ENTITY dots       "&#x2026;<neos/>">
-<!ENTITY enddots    "&#x2026;">
+<!ENTITY dots       "<punct end-of-sentence='no'>&#x2026;</punct>">
+<!ENTITY enddots    "<punct end-of-sentence='yes'>&#x2026;</punct>">
 <!ENTITY amp        "&#x26;">
+<!ENTITY lsquo      "&#x2018;">
+<!ENTITY rsquo      "&#x2019;">
+<!ENTITY sbquo      "&#x201a;">
 <!ENTITY ldquo      "&#x201c;">
 <!ENTITY rdquo      "&#x201d;">
+<!ENTITY bdquo      "&#x201e;">
+<!ENTITY laquo      "&#xab;">
+<!ENTITY raquo      "&#xbb;">
+<!ENTITY lsaquo     "&#x2039;">
+<!ENTITY rsaquo     "&#x203a;">
 <!ENTITY mdash      "&#x2014;">
 <!ENTITY ndash      "&#x2013;">
-<!ENTITY period     ".<neos/>">
-<!ENTITY eosperiod  ".">
-<!ENTITY quest      "?<neos/>">
-<!ENTITY eosquest   "?">
-<!ENTITY excl       "!<neos/>">
-<!ENTITY eosexcl    "!">
+<!ENTITY period     "<punct end-of-sentence='no'>.</punct>">
+<!ENTITY eosperiod  "<punct end-of-sentence='yes'>.</punct>">
+<!ENTITY quest      "<punct end-of-sentence='no'>?</punct>">
+<!ENTITY eosquest   "<punct end-of-sentence='yes'>?</punct>">
+<!ENTITY excl       "<punct end-of-sentence='no'>!</punct>">
+<!ENTITY eosexcl    "<punct end-of-sentence='yes'>!</punct>">
 
 <!ENTITY auml "&#xe4;">
 <!ENTITY ouml "&#xf6;">
@@ -472,6 +492,9 @@
 <!ENTITY aring "&#xe5;">
 <!ENTITY szlig "&#xdf;">
 
+<!ENTITY rarr "&#x2192;">
+<!ENTITY rArr "&#x21d2;">
+
 <!ENTITY macr "&#xaf;">
 
 
diff --git a/Build/source/utils/texinfo/util/txitextest b/Build/source/utils/texinfo/util/txitextest
index 4542bc23641..4a85b0134ef 100755
--- a/Build/source/utils/texinfo/util/txitextest
+++ b/Build/source/utils/texinfo/util/txitextest
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: txitextest,v 1.5 2004/04/11 17:56:47 karl Exp $
+# $Id: txitextest,v 1.8 2006/08/14 13:18:20 karl Exp $
 # Test texinfo.tex changes by running various manuals through with an
 # old version, saving the .ps result from dvips, doing the same with a
 # new version, and comparing.  Idea from Stepan Kasal.
@@ -7,15 +7,15 @@
 # Another option is to run the manuals all the way through using
 # texi2dvi, which tests in another way.
 
-tsrc=/u/texinfo/src
+tsrc=`dirname $0`/..
 PATH=$tsrc/util:$PATH
 
 tdoc=$tsrc/doc
 default_manuals="$tdoc/texinfo.txi $tdoc/info.texi $tdoc/info-stnd.texi"
 
-olddir=$HOME/gnu/src/gnulib/config
+olddir=$tsrc/../gnulib/config
 newdir=$tdoc
-tempdir=/u/texinfo/@tests/testdir
+tempdir=$tsrc/@tests/test
 full=false
 manuals=
 
@@ -48,7 +48,7 @@ for manual in $manuals; do
   test $mandir = . && mandir=$initial_dir
   manual_base=`basename "$manual" | sed 's/\.[^.]*$//'`
   
-  rm -f $manual_base.* texinfo.tex
+  rm -rf $manual_base.* texinfo.tex
   ln -s $newdir/texinfo.tex texinfo.tex
 
   if $full; then
@@ -66,7 +66,7 @@ for manual in $manuals; do
     mv $manual_base.ps new.$manual_base.ps
 
     echo "$0: testing $manual_base... (old)"
-    rm -f $manual_base.* texinfo.tex
+    rm -rf $manual_base.* texinfo.tex
     ln -s $olddir/texinfo.tex texinfo.tex
     run_tex
     dvips $manual_base -o || exit 1